Commit f82e9679 authored by Hardiansyah's avatar Hardiansyah

Merge branch 'ENV-PROD' into 'ENV-DEV'

# Conflicts:
#   src/container/OutlookPA/CorporateAnnualTargetOLPA.js
parents 13923bd8 74a9e68f
...@@ -356,7 +356,7 @@ export default class LOV extends Component { ...@@ -356,7 +356,7 @@ export default class LOV extends Component {
isi.map((i, index) => { isi.map((i, index) => {
if (i.length > 0) { if (i.length > 0) {
let tgl = String(i[6]).split('-') let tgl = String(i[6]).split('-')
console.log(tgl); // console.log(tgl);
payload.push({ payload.push({
"item_report_id": i[1], "item_report_id": i[1],
"company_name": this.props.company.company_name, "company_name": this.props.company.company_name,
......
...@@ -952,7 +952,8 @@ export default class ListOfCreditFacilities extends Component { ...@@ -952,7 +952,8 @@ export default class ListOfCreditFacilities extends Component {
error = true error = true
this.setState({ emptyData: true}) this.setState({ emptyData: true})
} }
if (i[7] == null || i[7] == ""){
if ((i[7]?.value == 'Government bonds' && i[8] == '') || (i[7]?.value == 'Stocks' && i[8] == '') || (i[7]?.value == 'Mutual funds' && i[8] == '') || (i[7]?.value == 'Investment in associate' && i[8] == '') || (i[7]?.value == 'Investment in joint venture' && i[8] == '') || (i[7]?.value == 'Investment in subsidiary' && i[8] == '') || (i[7]?.value == 'Corporate bonds' && i[8] == '') || (i[7]?.value == 'Others' && i[8] == '')) {
error = true error = true
}else { }else {
if ((i[7].value == 'Government bonds' && i[8] == '') || (i[7].value == 'Stocks' && i[8] == '') || (i[7].value == 'Mutual funds' && i[8] == '') || (i[7].value == 'Investment in associate' && i[8] == '') || (i[7].value == 'Investment in joint venture' && i[8] == '') || (i[7].value == 'Investment in subsidiary' && i[8] == '') || (i[7].value == 'Corporate bonds' && i[8] == '') || (i[7].value == 'Others' && i[8] == '')) { if ((i[7].value == 'Government bonds' && i[8] == '') || (i[7].value == 'Stocks' && i[8] == '') || (i[7].value == 'Mutual funds' && i[8] == '') || (i[7].value == 'Investment in associate' && i[8] == '') || (i[7].value == 'Investment in joint venture' && i[8] == '') || (i[7].value == 'Investment in subsidiary' && i[8] == '') || (i[7].value == 'Corporate bonds' && i[8] == '') || (i[7].value == 'Others' && i[8] == '')) {
......
...@@ -3318,7 +3318,7 @@ export default class BalanceSheetRO extends Component { ...@@ -3318,7 +3318,7 @@ export default class BalanceSheetRO extends Component {
</div> </div>
{this.state.visibleUpload && ( {this.state.visibleUpload && (
<div className="test app-popup-show"> <div className="test app-popup-show">
<div className="popup-content background-white border-radius" style={{ borderRadius: 8 }}> <div className="popup-content background-white border-radius" style={{ borderRadius: 8, width: 679 }}>
<div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}> <div className="popup-panel grid grid-2x main-color" style={{ height: 64, borderTopRightRadius: 8, borderTopLeftRadius: 8 }}>
<div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}> <div className="col-1" style={{ maxWidth: "inherit", display: 'flex', alignItems: 'center' }}>
<div className="popup-title"> <div className="popup-title">
......
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment