Merge branch 'dev-riri' into 'ENV-DEV'

interest lov

See merge request !2230

src/container/MonthlyReport/LOCFMR.js

@@ -1512,10 +1512,10 @@ export default class LOCF extends Component {
                                                 style={{ color: this.props.get_for == 'view' ? "black" : "#5198ea", fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, height: 34, backgroundColor: (tableMeta.rowData[11] == '0.00' || tableMeta.rowData[11] == '') && this.props.get_for == 'edit' ? '#ffac99' : 'transparent' }}
                                                 type="text"
                                                 placeholder=""
-                                                value={this.props.get_for == 'view' ? fixNumber(Number(value), 2) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 2) : Number(value) == 0 ? "0.0" : Number(value)}
+                                                value={this.props.get_for == 'view' ? fixNumber(Number(value), 2) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 2) : Number(value) == 0 ? "0.00" : Number(value)}
                                                 disabled={this.props.get_for == 'view'}
                                                 // disabled={this.props.isApprover ? true : ((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)}
-                                                decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
+                                                decimalScale={this.props.defaultCurrency.id == 1 ? 2 : 16}
                                                 onBlur={(event) => {
                                                     // updateValue(event.target.value)
                                                     handleChange(event.target.value, tableMeta, tableMeta.columnIndex)

src/container/MonthlyReport/LOVMR.js

@@ -232,7 +232,7 @@ export default class LOV extends Component {
                             item.lov.remarks === null || item.lov.remarks === "" ? "" : item.lov.remarks,
                             item.lov.placement_date == null || item.lov.placement_date == "" ? null : (item.lov.placement_date !== "null" ? String(tgl[2]).length > 2 ? tgl[2] + '-' + tgl[1] + '-' + tgl[0] : String(item.lov.placement_date) : null),
                             item.lov.tenor === null || item.lov.tenor === "" ? "" : item.lov.tenor,
-                            item.lov.expected_return === null || item.lov.expected_return === "" ? "0.0" : item.lov.expected_return,
+                            item.lov.expected_return === null || item.lov.expected_return === "" ? "0.00" : item.lov.expected_return,
                             item.lov.currency === null ? null : item.lov.currency === "" ? null : { value: item.lov.currency },
                             item.lov.investment_amount_ori === null ? "0.0" : item.lov.investment_amount_ori === "" ? "0.0" : item.lov.investment_amount_ori,
                             item.lov.investment_amount_cur === null ? "0.0" : item.lov.investment_amount_cur === "" ? "0.0" : item.lov.investment_amount_cur,
@@ -1392,10 +1392,10 @@ export default class LOV extends Component {
                                                 style={{ color: this.props.get_for == 'view' ? "black" : "#5198ea", fontSize: 12, textAlign: 'center', paddingBottom: 18, borderColor: 'transparent', margin: 0, width: 96, height: 30, backgroundColor: (tableMeta.rowData[11] == '0.00' || tableMeta.rowData[11] == '') && this.props.get_for == 'edit' ? '#ffac99' : 'transparent' }}
                                                 type="text"
                                                 placeholder=""
-                                                value={this.props.get_for == 'view' ? fixNumber(Number(value), 2) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 2) : Number(value) == 0 ? "0.0" : Number(value)}
+                                                value={this.props.get_for == 'view' ? fixNumber(Number(value), 2) : this.props.defaultCurrency.id == 1 ? fixNumber(Number(value), 2) : Number(value) == 0 ? "0.00" : Number(value)}
                                                 disabled={this.props.get_for == 'view'}
                                                 // disabled={this.props.isApprover ? true : ((this.props.lastStatus == 'SUBMIT' || this.props.lastStatus == 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? false : true)}
-                                                decimalScale={this.props.defaultCurrency.id == 1 ? 1 : 16}
+                                                decimalScale={this.props.defaultCurrency.id == 1 ? 2 : 16}
                                                 onBlur={(event) => {
                                                     // updateValue(event.target.value)
                                                     handleChange(event.target.value, tableMeta, tableMeta.columnIndex)