@stssocialst-stp/fe-payroll 0.1.8 → 0.2.0

package/dist/index.js

@@ -753,10 +753,10 @@ var BISTP_SUMMARY_PROJECTION = function BISTP_SUMMARY_PROJECTION() {
   return ['bistpSummary { total reconciled rejected pending skippedNib sendFailed }'];
 };
 var PAYROLL_PROJECTION = function PAYROLL_PROJECTION(modulesManager) {
-  return ['id', 'name', 'paymentMethod', 'paymentPlan { code, id, name, benefitPlanType { code, id, name } }', 'benefitPlanNameCode', "paymentPoint { ".concat(PAYMENT_POINT_PROJECTION(modulesManager).join(' '), " }"), 'paymentCycle { code, startDate, endDate }', 'jsonExt', 'status', 'dateValidFrom', 'dateValidTo', 'isDeleted'].concat(_toConsumableArray__default["default"](BISTP_SUMMARY_PROJECTION()));
+  return ['id', 'name', 'paymentMethod', 'paymentPlan { code, id, name, benefitPlanType }', 'benefitPlanNameCode', "paymentPoint { ".concat(PAYMENT_POINT_PROJECTION(modulesManager).join(' '), " }"), 'paymentCycle { code, startDate, endDate }', 'jsonExt', 'status', 'dateValidFrom', 'dateValidTo', 'isDeleted'].concat(_toConsumableArray__default["default"](BISTP_SUMMARY_PROJECTION()));
 };
 var PAYROLL_SEARCHER_PROJECTION = function PAYROLL_SEARCHER_PROJECTION(modulesManager) {
-  return ['id', 'name', 'paymentMethod', 'paymentPlan { code, id, name, benefitPlanType { code, id, name } }', 'benefitPlanNameCode', "paymentPoint { ".concat(PAYMENT_POINT_PROJECTION(modulesManager).join(' '), " }"), 'paymentCycle { code, startDate, endDate }', 'jsonExt', 'status', 'dateValidFrom', 'dateValidTo', 'isDeleted'].concat(_toConsumableArray__default["default"](BISTP_SUMMARY_PROJECTION()));
+  return ['id', 'name', 'paymentMethod', 'paymentPlan { code, id, name, benefitPlanType }', 'benefitPlanNameCode', "paymentPoint { ".concat(PAYMENT_POINT_PROJECTION(modulesManager).join(' '), " }"), 'paymentCycle { code, startDate, endDate }', 'jsonExt', 'status', 'dateValidFrom', 'dateValidTo', 'isDeleted'].concat(_toConsumableArray__default["default"](BISTP_SUMMARY_PROJECTION()));
 };
 var CSV_RECONCILIATION_PROJECTION = function CSV_RECONCILIATION_PROJECTION() {
   return ['fileName', 'status', 'error', 'jsonExt'];
@@ -1911,9 +1911,7 @@ var PayrollHeadPanel = /*#__PURE__*/function (_FormPanel) {
   }, {
     key: "render",
     value: function render() {
-      var _this2 = this,
-        _payroll$paymentPlan$,
-        _payroll$paymentPlan;
+      var _this2 = this;
       var _this$props = this.props,
         edited = _this$props.edited,
         classes = _this$props.classes,
@@ -2006,7 +2004,7 @@ var PayrollHeadPanel = /*#__PURE__*/function (_FormPanel) {
         container: true,
         className: classes.item
       }, /*#__PURE__*/React__default["default"].createElement(AdvancedFiltersDialog$1, {
-        object: (_payroll$paymentPlan$ = payroll === null || payroll === void 0 || (_payroll$paymentPlan = payroll.paymentPlan) === null || _payroll$paymentPlan === void 0 ? void 0 : _payroll$paymentPlan.benefitPlanType) !== null && _payroll$paymentPlan$ !== void 0 ? _payroll$paymentPlan$ : null,
+        object: null,
         objectToSave: payroll,
         moduleName: "social_protection",
         objectType: "BenefitPlan",
@@ -5837,6 +5835,7 @@ function PaymentPendingPayrollPaymentDialog(_ref) {
   var classes = _ref.classes,
     payroll = _ref.payroll,
     fetchPayroll = _ref.fetchPayroll,
+    closePayroll = _ref.closePayroll,
     payrollDetail = _ref.payrollDetail;
   var modulesManager = feCore.useModulesManager();
   var _useState = React.useState((_payrollDetail$id = payrollDetail === null || payrollDetail === void 0 ? void 0 : payrollDetail.id) !== null && _payrollDetail$id !== void 0 ? _payrollDetail$id : null),
@@ -5904,6 +5903,10 @@ function PaymentPendingPayrollPaymentDialog(_ref) {
       setTotalReconciledBillAmount(reconciledAmount);
     }
   }, [isOpen, payroll]);
+  var closePayrollCallback = function closePayrollCallback() {
+    closePayroll(payrollDetail, formatMessageWithValues('payroll.mutation.closeLabel', mutationLabel(payrollDetail)));
+    handleClose();
+  };
   var downloadPayrollData = function downloadPayrollData(payrollUuid, payrollName) {
     downloadPayroll(payrollUuid, payrollName);
   };
@@ -6009,7 +6012,15 @@ function PaymentPendingPayrollPaymentDialog(_ref) {
       margin: '0 16px',
       marginBottom: '15px'
     }
-  }, formatMessage('payroll.summary.download'))), /*#__PURE__*/React__default["default"].createElement("div", {
+  }, formatMessage('payroll.summary.download')), /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
+    onClick: closePayrollCallback,
+    variant: "contained",
+    color: "primary",
+    style: {
+      margin: '0 16px',
+      marginBottom: '15px'
+    }
+  }, formatMessage('payroll.summary.approveAndClose'))), /*#__PURE__*/React__default["default"].createElement("div", {
     style: {
       "float": 'right',
       paddingRight: '16px'
@@ -6032,7 +6043,8 @@ var mapStateToProps$1 = function mapStateToProps(state) {
 };
 var mapDispatchToProps$1 = function mapDispatchToProps(dispatch) {
   return redux.bindActionCreators({
-    fetchPayroll: fetchPayroll
+    fetchPayroll: fetchPayroll,
+    closePayroll: closePayroll
   }, dispatch);
 };
 var PayrollPendingPayrollSummary = reactRedux.connect(mapStateToProps$1, mapDispatchToProps$1)(PaymentPendingPayrollPaymentDialog);