Merge branch 'master' of http://103.44.149.204/d.arizona/tia-dev into faisal

src/api/index.js

@@ -286,6 +286,7 @@ const create = (type = "") => {
   const uploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/import_monthly_report', body)
   const uploadMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/import_monthly_report', body)
   const uploadMonthlyReportCAT = (body) => api.post('transaction/monthly_report/cat/import_monthly_report', body)
+  const validateSubmitReportBS = (body) => api.post('transaction/monthly_report_bs/validate_save', body)
   const validateSubmitReportMR = (body) => api.post('transaction/monthly_report/validate_save', body)
   const validateSubmitReportMRTP = (body) => api.post('transaction/monthly_report_tp/validate_save', body)
   
@@ -518,7 +519,8 @@ const create = (type = "") => {
     uploadMonthlyReportCAT,
     getHierarkiMontlyReportCF,
     validateSubmitReportMR,
-    validateSubmitReportMRTP
+    validateSubmitReportMRTP,
+    validateSubmitReportBS
   }
 }
 

src/container/MonthlyReport/TaxPlanningMR.js

@@ -49,6 +49,7 @@ export default class TaxPlanningMR extends Component {
             editable: false,
             judulColumn: null,
             updateBy: '-',
+            notesUpdate: '-',
             buttonDraft: true,
             handleTekTekTek: 0,
             saveDraft: true,
@@ -92,10 +93,12 @@ export default class TaxPlanningMR extends Component {
             "months": this.props.month.month_id
         }
         api.create().getLastestUpdateMR(payload).then(response => {
+            console.log(response)
             if (response.data) {
                 if (response.data.status === "success") {
                     this.setState({
-                        updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update
+                        updateBy: response.data.data.latest_update === null ? '-' : response.data.data.latest_update,
+                        notesUpdate: response.data.data.notes_update === null ? '-' : response.data.data.notes_update
                     })
                 }
             }
@@ -1525,6 +1528,7 @@ export default class TaxPlanningMR extends Component {
                                     {/* )} */}
                                 </div>
                                 <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20, marginLeft: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
+                                <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 5, marginLeft: 20 }}>Notes : {this.state.notesUpdate}</Typography>
                             </div>
                             <div className="grid grid-2x" style={{ marginTop: 20 }}>
                                 <div className="col-1">