Merge branch 'deni-dev(pc)' into 'master'

Deni dev(pc)

See merge request !384

src/api/index.js

@@ -200,6 +200,7 @@ const create = (type = "") => {
   const getMonthTransaction = () => api.get('transaction/get_default_month')
   const countingFormula = (body) => api.post('transaction/counting_formula', body)
   const submitMasterBudget = (body) => api.post('transaction/master_budget/submit_master_budget', body)
+  const checkIsSubmit = (body) => api.post('transaction/master_budget/is_can_submit', body)
 
   const getIdDeleteFromExcel = (body) => api.post('transaction/master_budget/delete_from_excel', body)
   const getOpetratingIndID = (body) => api.post('transaction/get_operating_indicator_id', body)
@@ -208,7 +209,8 @@ const create = (type = "") => {
   const createOpetaingInd = (body) => api.post('transaction/operating_indicator/create_submission_report', body)
   const checkUploadOperatingInd = (body) => api.post('transaction/operating_indicator/check_import', body)
   const uploadOperatingInd = (body) => api.post('transaction/operating_indicator/import_operating_indicator', body)
-  const getDashboard = (body) => api.get('transaction/master_budget/get_dashboard')
+  const getDashboard = (body) => api.get('transaction/get_dashboard')
+  const historyApproval = (body) => api.post('transaction/master_budget/history_approval', body)
 
   //Template
   const downloadTemplate = (fileName, fileType) => api.get(`attachment/download_file?fileName=${fileName}&&fileType=${fileType}`)
@@ -356,8 +358,10 @@ const create = (type = "") => {
     getLastestUpdateMB,
     countingFormula,
     submitMasterBudget,
+    checkIsSubmit,
     getIdDeleteFromExcel,
-    getDashboard
+    getDashboard,
+    historyApproval
   }
 }
 

src/container/BudgetTahunan/BalanceSheet.js

@@ -612,7 +612,8 @@ export default class BalanceSheet extends Component {
                         <div style={{ textAlign: 'right' }}>
                             {tableMeta.rowData[0] === 4 ?
                                 null
-                                :
+                                : tableMeta.rowData[0] === 1 ?
+                                null : 
                                 <div style={{ flex: 1 }}>
                                     <FormControlLabel
                                         style={{ margin: 0 }}

src/container/Profile.js

@@ -181,7 +181,7 @@ export default class Profile extends Component {
 
     getPerusahaan() {
         api.create().getPerusahaanHierarki().then((response) => {
-            // console.log(response);
+            console.log(response);
             if (response.data) {
                 if (response.ok) {
                     if (response.data.status === 'success') {