@stssocialst-stp/fe-payroll 0.2.2 → 0.2.4

package/dist/index.es.js

@@ -355,19 +355,19 @@ function reducer() {
       return _objectSpread$6(_objectSpread$6({}, state), {}, {
         fetchingBenefitConsumptions: false,
         fetchedBenefitConsumptions: true,
-        benefitConsumptions: (_parseData5 = parseData(action.payload.data.benefitConsumption)) === null || _parseData5 === void 0 ? void 0 : _parseData5.map(function (benefitConsumption) {
+        benefitConsumptions: (_parseData5 = parseData(action.payload.data.benefitConsumptionByPayroll)) === null || _parseData5 === void 0 ? void 0 : _parseData5.map(function (benefitConsumption) {
           return _objectSpread$6(_objectSpread$6({}, benefitConsumption), {}, {
             id: decodeId(benefitConsumption.id)
           });
         }),
-        benefitConsumptionsPageInfo: pageInfo(action.payload.data.benefitConsumption),
-        benefitConsumptionsTotalCount: (_action$payload$data$5 = (_action$payload$data$6 = action.payload.data.benefitConsumption) === null || _action$payload$data$6 === void 0 ? void 0 : _action$payload$data$6.totalCount) !== null && _action$payload$data$5 !== void 0 ? _action$payload$data$5 : 0,
+        benefitConsumptionsPageInfo: pageInfo(action.payload.data.benefitConsumptionByPayroll),
+        benefitConsumptionsTotalCount: (_action$payload$data$5 = (_action$payload$data$6 = action.payload.data.benefitConsumptionByPayroll) === null || _action$payload$data$6 === void 0 ? void 0 : _action$payload$data$6.totalCount) !== null && _action$payload$data$5 !== void 0 ? _action$payload$data$5 : 0,
         errorBenefitConsumptions: formatGraphQLError(action.payload)
       });
     case ERROR(ACTION_TYPE.GET_BENEFIT_CONSUMPTION):
       return _objectSpread$6(_objectSpread$6({}, state), {}, {
         fetchingBenefitConsumptions: false,
-        errorPayroll: formatServerError(action.payload)
+        errorBenefitConsumptions: formatServerError(action.payload)
       });
     case CLEAR(ACTION_TYPE.GET_BENEFIT_CONSUMPTION):
       return _objectSpread$6(_objectSpread$6({}, state), {}, {
@@ -3049,6 +3049,16 @@ function PaymentApproveForPaymentDialog(_ref) {
       marginBottom: '15px'
     }
   }, formatMessage('payroll.summary.approveAndClose')), /*#__PURE__*/React.createElement(Button, {
+    onClick: function onClick() {
+      return makePaymentForPayrollCallback();
+    },
+    variant: "contained",
+    color: "primary",
+    style: {
+      margin: '0 16px',
+      marginBottom: '15px'
+    }
+  }, payrollDetail.paymentMethod === PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT ? formatMessage('payroll.bistp.submitPayment') : formatMessage('payroll.summary.makePayment')), /*#__PURE__*/React.createElement(Button, {
     onClick: function onClick() {
       return downloadPayrollData(payrollDetail.id, payrollDetail.name);
     },
@@ -3073,16 +3083,7 @@ function PaymentApproveForPaymentDialog(_ref) {
       "float": 'right',
       paddingRight: '16px'
     }
-  }, (payrollDetail.paymentMethod === PAYMENT_METHOD.STRATEGY_ONLINE_PAYMENT || payrollDetail.paymentMethod === PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT) && /*#__PURE__*/React.createElement(Button, {
-    onClick: function onClick() {
-      return makePaymentForPayrollCallback();
-    },
-    variant: "contained",
-    color: "primary",
-    style: {
-      margin: '0 16px'
-    }
-  }, payrollDetail.paymentMethod === PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT ? formatMessage('payroll.bistp.submitPayment') : formatMessage('payroll.summary.makePayment')), /*#__PURE__*/React.createElement(Button, {
+  }, /*#__PURE__*/React.createElement(Button, {
     onClick: handleClose,
     variant: "outlined",
     autoFocus: true,