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

src/api/index.js

@@ -260,8 +260,8 @@ const create = (type = "") => {
   const createRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/create_rolling_outlook', body)
   const checkImportRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/check_import', body)
   const importRollingOutlookPL = (body) => api.post('transaction/profit_loss/rolling_outlook/import_rolling_outlook', body)
-  const getRollingOutlookTP = (body) => api.post('transaction/rolling_outlook/tax_planning/get_report_hierarki', body)
-  const createRollingOutlookTP = (body) => api.post('transaction/rolling_outlook/tax_planning/store_ro_tax_planning', body)
+  const getRollingOutlookTP = (body) => api.post('transaction/tax_planning/rolling_outlook/get_report_hierarki', body)
+  const createRollingOutlookTP = (body) => api.post('transaction/tax_planning/rolling_outlook/create_rolling_outlook', body)
   const getRollingOutlookCAT = (body) => api.post('transaction/cat/rolling_outlook/get_report_hierarki', body)
   const createRollingOutlookCAT = (body) => api.post('transaction/cat/rolling_outlook/create_rolling_outlook', body)
   const checkImportRollingOutlookCAT = (body) => api.post('transaction/cat/rolling_outlook/check_import', body)
@@ -274,6 +274,7 @@ const create = (type = "") => {
   const checkUploadRollingOutlookOI = (body) => api.post('transaction/operating_indicator/rolling_outlook/check_import', body)
   const uploadRollingOutlookOI = (body) => api.post('transaction/operating_indicator/rolling_outlook/import_rolling_outlook', body)
   const submitRollingOutlook = (body) => api.post('transaction/rolling_outlook/submit_rolling_outlook', body)
+  const getRollingOutlookCompanySubmitted = (body) => api.post('transaction/rolling_outlook/get_company_submitted', body)
 
   //REPORT NEW
   const getAllReportBS = (body) => api.post('/transaction/db_balance_sheet/get_report_hierarki', body)
@@ -762,7 +763,8 @@ const create = (type = "") => {
     getLastestUpdateROOI,
     checkUploadRollingOutlookOI,
     uploadRollingOutlookOI,
-    submitRollingOutlook
+    submitRollingOutlook,
+    getRollingOutlookCompanySubmitted
   }
 }
 

src/container/MonthlyReport.js

@@ -492,7 +492,7 @@ export default class MonthlyReport extends Component {
             "months": this.state.month.month_id,
             "status": selectedStatus
         }
-        this.setState({ isApprovedMB: true })
+        // this.setState({ isApprovedMB: true })
         api.create().getCompanySubmittedMonthly(body).then(response => {
             console.log(response);
             if (response.data) {

src/container/RollingOutlook/TaxPlanningRO.js

@@ -3776,7 +3776,8 @@ export default class TaxPlanning extends Component {
                             <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
                                 <span>{"Trial Balance (Commercial) MTD"}</span>
                             </div>
-                            &&
+                            : null }
+                            {this.props.quarter == 'q1' || this.props.quarter == 'q2' ?
                             <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
                                 <span>{"Fiscal Correction Positive /(Negative)"}</span>
                             </div> 
@@ -3937,7 +3938,8 @@ export default class TaxPlanning extends Component {
                                         }
                                     </div>
                                 </div>
-                                &&
+                                : null }
+                                {this.props.quarter == 'q1' || this.props.quarter == 'q2' ?
                                 <div className="col-2">
                                     <div style={{ textAlign: 'right' }}>
                                         {
@@ -4226,7 +4228,8 @@ export default class TaxPlanning extends Component {
                             <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
                                 <span>{"Trial Balance (Commercial) MTD"}</span>
                             </div>
-                            &&
+                            : null }
+                            {this.props.quarter == 'q1' || this.props.quarter == 'q2' ?
                             <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5 }}>
                                 <span>{"Fiscal Correction Positive /(Negative)"}</span>
                             </div> 
@@ -4387,7 +4390,8 @@ export default class TaxPlanning extends Component {
                                         }
                                     </div>
                                 </div>
-                                &&
+                                : null }
+                                {this.props.quarter == 'q1' || this.props.quarter == 'q2' ?
                                 <div className="col-2">
                                     <div style={{ textAlign: 'right' }}>
                                         {
@@ -6154,7 +6158,7 @@ export default class TaxPlanning extends Component {
             name: `${this.props.periode}`,
             options: {
                 customHeadRender: (columnMeta) => (
-                    <div  style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 200, borderRight: "1px solid rgb(255, 255, 255)" }} >
+                    <div  style={{ ...style2, top: 0, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 200, borderRight: "1px solid rgb(255, 255, 255)" }} >
                         {/* <TableCell style={{ ...style2, top: 0, zIndex: 99, backgroundColor: '#1c71b8', width: 96 }}>
                             <Typography style={{ color: 'white', fontSize: 12, fontWeight: 'bold', textAlign: 'center' }}>{columnMeta.name}</Typography>
                         </TableCell> */}