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

src/api/index.js

@@ -275,9 +275,11 @@ const create = (type = "") => {
   const checkUploadMonthlyReportTP = (body) => api.post('transaction/monthly_report_tp/check_import', body)
   const checkUploadMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/check_import', body)
   const checkUploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/check_import', body)
+  const checkUploadMonthlyReportOI = (body) => api.post('transaction/monthly_report_oi/check_import', body)
   const uploadMonthlyReportBS = (body) => api.post('transaction/monthly_report_bs/import_monthly_report', body)
   const uploadMonthlyReportFAM = (body) => api.post('transaction/monthly_report/fam/import_monthly_report', body)
   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)
   
   // MonthlyPL
   const getHierarkiMontlyReportPL = (body) => api.post('transaction/monthly_report_pl/get_report_hierarki', body)
@@ -492,12 +494,14 @@ const create = (type = "") => {
     getHierarkiMontlyReportCAT,
     checkUploadMonthlyReportTP,
     checkUploadMonthlyReportFAM,
+    checkUploadMonthlyReportOI,
     uploadMonthlyReportPL,
     getMonthlyReport,
     checkUploadMonthlyReportBS,
     uploadMonthlyReportBS,
     uploadMonthlyReportFAM,
     uploadMonthlyReportTP,
+    uploadMonthlyReportOI,
     getHierarkiMontlyReportCF
   }
 }

src/container/BudgetTahunan.js

@@ -67,7 +67,9 @@ export default class BudgetTahunan extends Component {
             minDateRevision: new Date(),
             maxDateRevision: new Date(),
             btnApprove: false,
-            isAdmin: false
+            isAdmin: false,
+            btncreate: false,
+            loadview: false
         }
         this.myRef = React.createRef()
         this.fileHandler = this.fileHandler.bind(this);
@@ -181,6 +183,34 @@ export default class BudgetTahunan extends Component {
         })
     }
 
+    getPermission() {
+        let payload = {
+            menu: "master budget & cat"
+        }
+        api.create().getPermission(payload).then(response => {
+            console.log(response)
+            if (response.data) {
+                if (response.data.status === "success") {
+                    this.setState({
+                        btncreate: response.data.data.create,
+                        loadview: response.data.data.view
+                    })
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        if (response.data.message.includes("Someone Logged In")) {
+                            setTimeout(() => {
+                                localStorage.removeItem(Constant.TOKEN)
+                                window.location.reload();
+                            }, 1000);
+                        }
+                    })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+            }
+        })
+    }
+
     getCompanySubmitted() {
         let body = {
             "periode": this.state.periode.periode
@@ -1518,6 +1548,8 @@ export default class BudgetTahunan extends Component {
                             isApprover={this.state.isApprover}
                             lastStatus={this.state.lastStatus}
                             prevRevision={this.state.isSubmit ? this.state.prevRevision : true}
+                            btncreate={this.state.btncreate}
+                            loadview={this.state.loadview}
                         />
                     )
                 }

src/container/MonthlyReport.js

@@ -54,12 +54,43 @@ export default class MonthlyReport extends Component {
             alert: false,
             tipeAlert: '',
             messageAlert: '',
+            btncreate: false,
+            loadview: false
         }
         this.fileHandler = this.fileHandler.bind(this);
     }
 
+    getPermission() {
+        let payload = {
+            menu: "monthly report"
+        }
+        api.create().getPermission(payload).then(response => {
+            console.log(response)
+            if (response.data) {
+                if (response.data.status === "success") {
+                    this.setState({
+                        btncreate: response.data.data.create,
+                        loadview: response.data.data.view
+                    })
+                } else {
+                    this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
+                        if (response.data.message.includes("Someone Logged In")) {
+                            setTimeout(() => {
+                                localStorage.removeItem(Constant.TOKEN)
+                                window.location.reload();
+                            }, 1000);
+                        }
+                    })
+                }
+            } else {
+                this.setState({ alert: true, messageAlert: response.problem, tipeAlert: 'error' })
+            }
+        })
+    }
+
     componentDidMount() {
         this.getChecApprover()
+        this.getPermission()
         this.setState({ loading: true })
         // this.getCompanyActive()
     }
@@ -70,13 +101,13 @@ export default class MonthlyReport extends Component {
             if (response.data) {
                 if (response.data.status === "success") {
                     // console.log(response);
-                    if (response.data.data.is_approver === true) {
-                        this.setState({ isApprover: true, checkApprover: true }, () =>
-                            this.getPeriode())
-                    } else {
+                    // if (response.data.data.is_approver === true) {
+                    //     this.setState({ isApprover: true, checkApprover: true }, () =>
+                    //         this.getPeriode())
+                    // } else {
                         this.setState({ isApprover: false, checkApprover: false }, () =>
                             this.getCompanyActive())
-                    }
+                    // }
                 } else {
                     this.setState({ alert: true, messageAlert: response.data.message, tipeAlert: 'warning' }, () => {
                         if (response.data.message.includes("Someone Logged In")) {
@@ -1108,6 +1139,8 @@ export default class MonthlyReport extends Component {
                         month={this.state.month}
                         saveToMonthlyReport={this.saveToMonthlyReport.bind(this)}
                         onClickClose={() => this.setState({ visibleTP: false, visibleMonthlyReport: true })}
+                        btncreate={this.state.btncreate}
+                        loadview={this.state.loadview}
                     // getReport={this.getCompanyActive.bind(this)}
                     />
                 )}

src/container/MonthlyReport/ProfitLossMR.js

@@ -742,15 +742,15 @@ export default class ProfitLossMR extends Component {
                             {/* <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> */}
-                            <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 43, fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
+                            <div style={{ borderBottom: "1px #fff solid", backgroundColor: '#1c71b8', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 40, fontSize: 12, fontWeight: 'bold', padding: 5 }}>{columnMeta.name}</div>
                             <div className="grid grid-3x" style={{ ...style2, color: '#fff', fontSize: 12, fontWeight: 'bold', position: "sticky" }}>
-                                <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
+                                <div className="column-1" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
                                     <span>{"Master Budget (MB)"}</span>
                                 </div>
-                                <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0' }}>
+                                <div className="column-2" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, borderRight: "1px #fff solid", backgroundColor: '#07a7d0', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
                                     <span>{"Rolling Budget (RB)"}</span>
                                 </div>
-                                <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#37b5e6', height: '100%' }}>
+                                <div className="column-3" style={{ placeSelf: 'center', textAlign: 'center', padding: 5, backgroundColor: '#37b5e6', justifyContent: 'center', display: 'flex', alignItems: 'center', height: 45 }}>
                                     <span>{"Actual"}</span>
                                 </div>
                             </div>
@@ -1716,6 +1716,7 @@ export default class ProfitLossMR extends Component {
                                     </MuiThemeProvider>
                                 )}
                             </div>
+                            <Typography style={{ fontSize: '11px', color: '#4b4b4b', marginTop: 20 }}>Last Updated by : {this.state.updateBy}</Typography>
                             {/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
                                 (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */}
                             <div className="grid grid-2x" style={{ marginTop: 20 }}>

src/container/MonthlyReport/TaxPlanningMR.js

@@ -62,6 +62,7 @@ export default class TaxPlanningMR extends Component {
         this.getSettingControl()
         // this.getItemHierarki()
         // this.getLatestUpdate()
+        console.log(this.props.loadview)
     }
 
     getSettingControl() {
@@ -1112,7 +1113,7 @@ export default class TaxPlanningMR extends Component {
                 }
             }
         }, {
-            name: `Trial Balance (Fiscal) Actual MTD`,
+            name: `Trial Balance (Fiscal) Actual YTD`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
@@ -1243,7 +1244,7 @@ export default class TaxPlanningMR extends Component {
                 }
             }
         }, {
-            name: `Trial Balance (Fiscal) MB MTD`,
+            name: `Trial Balance (Fiscal) MB YTD`,
             options: {
                 customHeadRender: (columnMeta) => (
                     <th style={{ ...style2, backgroundColor: '#1c71b8', color: '#fff', fontSize: 13, fontWeight: 1, width: 150, borderRight: "1px solid rgb(255, 255, 255)" }} >
@@ -1455,6 +1456,7 @@ export default class TaxPlanningMR extends Component {
                                             : */}
                                             <div style={{ justifyContent: 'flex-end', display: 'flex', flexFlow: 'wrap' }}>
                                                 {/* {((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && ( */}
+                                                {this.props.btncreate === true && 
                                                     <div>
                                                         <a data-tip={'Download Template'} data-for="template">
                                                             <button
@@ -1471,8 +1473,10 @@ export default class TaxPlanningMR extends Component {
                                                         </a>
                                                         <ReactTooltip border={true} id="template" place="bottom" type="light" effect="solid" />
                                                     </div>
+                                                }
                                                 {/* )} */}
                                                 {/* {((this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted')) && ( */}
+                                                {this.props.btncreate === true &&
                                                     <div>
                                                         <a data-tip={'Upload'} data-for="upload">
                                                             <button
@@ -1491,7 +1495,10 @@ export default class TaxPlanningMR extends Component {
                                                         </a>
                                                         <ReactTooltip border={true} id="upload" place="bottom" type="light" effect="solid" />
                                                     </div>
+                                                }
                                                 {/* )} */}
+                                                {(this.props.loadview === true || this.props.btncreate === true) && (
+                                                    <div>
                                                         <a data-tip={'Download'} data-for="download">
                                                             <button
                                                                 style={{
@@ -1513,6 +1520,8 @@ export default class TaxPlanningMR extends Component {
                                                         </a>
                                                         <ReactTooltip border={true} id="download" place="bottom" type="light" effect="solid" />
                                                     </div>
+                                                )}
+                                            </div>
                                         {/* } */}
                                     </div>
                                 </div>
@@ -1553,6 +1562,7 @@ export default class TaxPlanningMR extends Component {
                                 </div>
                                 {/* {this.props.isApprover === true || this.state.dataTable.length == 0 ? null :
                                     (this.props.lastStatus === 'SUBMIT' || this.props.lastStatus === 'REVISION') && this.props.prevRevision === false && (this.props.status === 'revision' || this.props.status === 'not-yet' || this.props.status === 'draft' || this.props.status === 'submitted') ? */}
+                                {this.props.btncreate === true &&
                                 <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
                                     <button
                                         className="button"
@@ -1630,6 +1640,7 @@ export default class TaxPlanningMR extends Component {
                                         </div>
                                     </button>
                                 </div>
+                                }
                                 {/* : null } */}
                             </div>
                         </Paper>