Merge branch 'rifka' into 'master'

rename

See merge request !702

src/container/BudgetTahunan/BalanceSheet.js

@@ -3701,7 +3701,7 @@ export default class BalanceSheet extends Component {
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
                                 onUpload={() => {
-                                    this.state.judul === "MASTER BUDGET - BALANCE SHEET" ?
+                                    String(this.state.judul).includes("MASTER BUDGET - BALANCE SHEET") ?
                                         this.checkUpload() :
                                         this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
                                 }}

src/container/BudgetTahunan/CorporateAnnualTarget.js

@@ -3526,7 +3526,7 @@ export default class CorporateAnnualTarget extends Component {
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
                                 onUpload={() => {
-                                    this.state.judul === "MASTER BUDGET - CAT" ?
+                                    String(this.state.judul).includes("MASTER BUDGET - CAT") ?
                                         this.checkUpload() :
                                         this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
                                 }}

src/container/BudgetTahunan/FixedAssetsMovement.js

@@ -2850,7 +2850,7 @@ export default class FixedAssetsMovement extends Component {
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
                                 onUpload={() => {
-                                    this.state.judul === "MASTER BUDGET - FIXED ASSETS MOVEMENT" ?
+                                    String(this.state.judul).includes("MASTER BUDGET - FIXED ASSETS MOVEMENT") ?
                                         this.checkUpload() :
                                         this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
                                 }}

src/container/BudgetTahunan/ProfitLoss.js

@@ -3038,7 +3038,7 @@ export default class ProfitLoss extends Component {
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
                                 onUpload={() => {
-                                    this.state.judul === "MASTER BUDGET - PROFIT LOSS" ?
+                                    String(this.state.judul).includes("MASTER BUDGET - PROFIT LOSS") ?
                                         this.checkUpload() :
                                         this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
                                 }}

src/container/BudgetTahunan/TaxPlanning.js

@@ -9156,7 +9156,7 @@ export default class TaxPlanning extends Component {
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
                                 onUpload={() => {
-                                    this.state.judul === "MASTER BUDGET - TAX PLANNING" ?
+                                    String(this.state.judul).includes("MASTER BUDGET - TAX PLANNING") ?
                                         this.checkUpload() :
                                         this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
                                 }}

src/container/MonthlyReport/TaxPlanningMR.js

@@ -94,8 +94,8 @@ export default class TaxPlanningMR extends Component {
             "months": this.props.month.month_id
         }
         api.create().getHierarkiMontlyReportTP(payload).then(response => {
-            // console.log(response);
-            // console.log(payload);
+            console.log(response);
+            console.log(payload);
             let dataTable = []
             if (response.data) {
                 if (response.data.status == 'success') {
@@ -495,7 +495,8 @@ export default class TaxPlanningMR extends Component {
     async downloadAllData() {
         let urls = `https://tia.eksad.com/tia-reporting-dev/public/transaction/monthly_report_tp/export_monthly_report?monthly_report_id=${this.props.monthlyReportId}&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
         let url = `https://tia.eksad.com/tia-reporting-dev/public/transaction/monthly_report_tp/export_monthly_report?monthly_report_id=&&report_id=${this.props.report_id}&&company_id=${this.props.company.company_id}&&year=${this.props.periode}&&revision=${this.props.revision}&&months=${this.props.month.month_id}`
-        // console.log(url);
+        console.log(urls);
+        console.log(url);
         let res = await fetch(
             this.props.monthlyReportId == null ? url : urls
         )
@@ -1525,7 +1526,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') ? */}
-                                <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%', marginTop: 20 }}>
+                                <div className="col-2" style={{ display: 'flex', justifyContent: 'flex-end', maxWidth: '100%' }}>
                                     <button
                                         className="button"
                                         type="button"
@@ -1750,7 +1751,7 @@ export default class TaxPlanningMR extends Component {
                                     this.setState({ uploadStatus: 'idle', percentage: '0' })
                                 }}
                                 onUpload={() => {
-                                    this.state.judul === "TAX PLANNING - MONTHLY REPORT" ?
+                                    String(this.state.judul).includes("TAX PLANNING - MONTHLY REPORT") ?
                                         this.checkUpload() :
                                         this.setState({ alert: true, messageAlert: "Invalid Template", tipeAlert: 'warning' })
                                 }}