Merge branch 'rifka' into 'master'

taxplan form

See merge request !382

src/container/BudgetTahunan/TaxPlanning.js

@@ -121,7 +121,8 @@ export default class TaxPlanning extends Component {
                             {tbc : item.tax_planning.december.tbc, fcp: item.tax_planning.december.fcp, tbf: item.tax_planning.december.tbf},
                             item.tax_planning.total_current_year,
                             {tbc : item.tax_planning.total_next_year.tbc, fcp: item.tax_planning.total_next_year.fcp, tbf: item.tax_planning.total_next_year.tbf},
-                            {tbc : item.tax_planning.total_more_year.tbc, fcp: item.tax_planning.total_more_year.fcp, tbf: item.tax_planning.total_more_year.tbf}
+                            {tbc : item.tax_planning.total_more_year.tbc, fcp: item.tax_planning.total_more_year.fcp, tbf: item.tax_planning.total_more_year.tbf},
+                            item.order
                         ])
                     }
                     if (item.children !== null) {
@@ -158,7 +159,8 @@ export default class TaxPlanning extends Component {
                         {tbc : item.tax_planning.december.tbc, fcp: item.tax_planning.december.fcp, tbf: item.tax_planning.december.tbf},
                         item.tax_planning.total_current_year,
                         {tbc : item.tax_planning.total_next_year.tbc, fcp: item.tax_planning.total_next_year.fcp, tbf: item.tax_planning.total_next_year.tbf},
-                        {tbc : item.tax_planning.total_more_year.tbc, fcp: item.tax_planning.total_more_year.fcp, tbf: item.tax_planning.total_more_year.tbf}
+                        {tbc : item.tax_planning.total_more_year.tbc, fcp: item.tax_planning.total_more_year.fcp, tbf: item.tax_planning.total_more_year.tbf},
+                        item.order
                     ])
                     if (item.children !== null) {
                         if (item.children.length > 0) {
@@ -800,7 +802,7 @@ export default class TaxPlanning extends Component {
                                 let reg = /^\d+$/
                                 splitOperator.map((item) => {
                                     if (reg.test(item) === true) {
-                                        let i = dataTable2.findIndex((val) => val[23] == item)
+                                        let i = dataTable2.findIndex((val) => val[24] == item)
                                         if (i > 0) {
                                             rilFormula = rilFormula.replace(item, dataTable2[i][tableMeta.columnIndex] === "" ? "0" : dataTable2[i][tableMeta.columnIndex])
                                         }
@@ -846,7 +848,7 @@ export default class TaxPlanning extends Component {
                 let arrayFormula = kondisi.match(/[a-zA-Z]+|[0-9]+|[-!$%^&*()_+|~=`{}\[\]:";'<>?,.\/]+(?:\.[0-9]+@|)/g)
                 let arrayJumlah = []
                 arrayFormula.map((item, indexs) => {
-                    let index = dataTable2.findIndex((val) => val[23] == item)
+                    let index = dataTable2.findIndex((val) => val[24] == item)
                     if (index > 0) {
                         arrayJumlah.push(dataTable2[index][tableMeta.columnIndex])
                     } else {

src/container/DocumentManagement/EditManagementDoc.js

@@ -282,9 +282,11 @@ export default class EditManagementDoc extends Component {
             const formData = new FormData();
             if (this.state.file == this.state.filePath){
                 formData.append("updated", 0);
-            }
+                formData.append("file", null);
+            } else {
                 formData.append("updated", 1);
                 formData.append("file", this.state.file);
+            }
             formData.append("companyId", this.state.getPerusahaan.company_id);
             formData.append("settingId", this.state.getDocument.document_category_id);
             formData.append("documentMonth", this.state.monthId.month_id);
@@ -295,7 +297,12 @@ export default class EditManagementDoc extends Component {
             this.setState({ formData }, () => {
                 this.props.updateDocument(this.state.formData)
             })
-            console.log(JSON.stringify(formData))
+            var object = {};
+            formData.forEach(function(value, key){
+                object[key] = value;
+            });
+            var json = JSON.stringify(object);
+            console.log(json)
         }
     }