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

src/api/index.js

@@ -203,6 +203,7 @@ const create = (type = "") => {
   const checkIsSubmit = (body) => api.post('transaction/master_budget/is_can_submit', body)
   const checkApprover = () => api.get('transaction/master_budget/is_approver')
   const approvalSubmission = (body) => api.post('transaction/master_budget/approval_submission', body)
+  const getCompanySubmitted = (body) => api.post('transaction/get_company_submitted', body)
 
   const getIdDeleteFromExcel = (body) => api.post('transaction/master_budget/delete_from_excel', body)
   const getOpetratingIndID = (body) => api.post('transaction/get_operating_indicator_id', body)
@@ -365,7 +366,8 @@ const create = (type = "") => {
     getDashboard,
     historyApproval,
     checkApprover,
-    approvalSubmission
+    approvalSubmission,
+    getCompanySubmitted
   }
 }
 

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -396,7 +396,7 @@ export default class FixedAssetsMovement extends Component {
         let url =  `https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?submission_id=${this.props.submissionID}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
         console.log(url);
         let res = await fetch(
-            `https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?submission_id=${this.props.submissionID}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
+            `https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?submission_id=&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
         )
         res = await res.blob()
         this.setState({ loading: false })

src/container/BudgetTahunan/ProfitLoss.js

@@ -408,9 +408,10 @@ export default class ProfitLoss extends Component {
 
     async downloadAllData() {
         let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?submission_id=${this.props.submissionID}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
+        let sub_null = `https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?submission_id=&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
         console.log(url);
         let res = await fetch(
-            `https://tia.eksad.com/tia-reporting-dev/public/transaction/master_budget/export_master_budget?submission_id=${this.props.submissionID}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}`
+            this.props.submissionID == null ? sub_null : url
         )
         res = await res.blob()
         this.setState({ loading: false })
@@ -504,7 +505,6 @@ export default class ProfitLoss extends Component {
                 dataTable2[tableMeta.rowIndex][20] = R.equals(value, NaN) ? "0.0" : value
                 return R.equals(value, NaN) ? "0.0" : value
             } else if (indexParent !== -1 && String(dataTable2[indexParent][5]).toLocaleUpperCase() == "GROSS PROFIT MARGIN (% OF REVENUE)") {
-                // console.log("oke")
                 return handleFormula(0, tableMeta, 0)
             }
             else {
@@ -1901,15 +1901,15 @@ export default class ProfitLoss extends Component {
                                             // null
                                             :
                                             tableMeta.rowData[0] === 5 ?
-                                                // <NumberFormat
-                                                //     thousandSeparator={true}
-                                                //     style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
-                                                //     type="text"
-                                                //     placeholder=""
-                                                //     disabled={true}
-                                                //     value={handleFormula(value, tableMeta)}
-                                                // />
-                                                null
+                                                <NumberFormat
+                                                    thousandSeparator={true}
+                                                    style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                    type="text"
+                                                    placeholder=""
+                                                    disabled={true}
+                                                    value={Number(handleFormula(value, tableMeta, 13)).toFixed(1)}ue={handleFormula(value, tableMeta)}
+                                                />
+                                                // null
                                                 :
                                                 tableMeta.rowData[0] === 1 ?
                                                     // value === "" ?
@@ -1991,15 +1991,15 @@ export default class ProfitLoss extends Component {
                                             // null
                                             :
                                             tableMeta.rowData[0] === 5 ?
-                                                // <NumberFormat
-                                                //     thousandSeparator={true}
-                                                //     style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
-                                                //     type="text"
-                                                //     placeholder=""
-                                                //     disabled={true}
-                                                //     value={handleFormula(value, tableMeta)}
-                                                // />
-                                                null
+                                                <NumberFormat
+                                                    thousandSeparator={true}
+                                                    style={{ fontSize: 12, textAlign: 'right', borderColor: 'transparent', margin: 0, width: 96, backgroundColor: 'transparent' }}
+                                                    type="text"
+                                                    placeholder=""
+                                                    disabled={true}
+                                                    value={Number(handleFormula(value, tableMeta, 14)).toFixed(1)}ue={handleFormula(value, tableMeta)}
+                                                />
+                                                // null
                                                 :
                                                 tableMeta.rowData[0] === 1 ?
                                                     // value === "" ?