@stssocialst-stp/fe-payroll 0.3.7 → 0.3.8

package/dist/index.es.js

@@ -23,12 +23,12 @@ import _debounce from 'lodash/debounce';
 import Button from '@material-ui/core/Button';
 import _ from 'lodash';
 import _extends from '@babel/runtime/helpers/extends';
-import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
-import _regeneratorRuntime from '@babel/runtime/regenerator';
 import Dialog from '@material-ui/core/Dialog';
 import DialogActions from '@material-ui/core/DialogActions';
 import DialogContent from '@material-ui/core/DialogContent';
 import DialogTitle from '@material-ui/core/DialogTitle';
+import _asyncToGenerator from '@babel/runtime/helpers/asyncToGenerator';
+import _regeneratorRuntime from '@babel/runtime/regenerator';
 import Typography$1 from '@material-ui/core/Typography';
 import { useReactToPrint } from 'react-to-print';
 import PrintIcon from '@material-ui/icons/Print';
@@ -152,6 +152,7 @@ var ACTION_TYPE = {
   CLOSE_PAYROLL: 'PAYROLL_MUTATION_CLOSE_PAYROLL',
   REJECT_PAYROLL: 'PAYROLL_MUTATION_REJECT_PAYROLL',
   MAKE_PAYMENT_PAYROLL: 'PAYROLL_MUTATION_MAKE_PAYMENT_PAYROLL',
+  UPDATE_PAYROLL_PAYMENT_DATE: 'PAYROLL_MUTATION_UPDATE_PAYROLL_PAYMENT_DATE',
   GET_PAYROLL_PAYMENT_FILES: 'GET_PAYROLL_PAYMENT_FILES',
   BENEFITS_SUMMARY: 'PAYROLL_BENEFITS_SUMMARY',
   GET_BISTP_SUMMARY: 'PAYROLL_BISTP_SUMMARY',
@@ -168,7 +169,8 @@ var MUTATION_SERVICE = {
     DELETE: 'deletePayroll',
     CLOSE: 'closePayroll',
     REJECT: 'rejectPayroll',
-    MAKE_PAYMENT: 'makePaymentForPayroll'
+    MAKE_PAYMENT: 'makePaymentForPayroll',
+    UPDATE_PAYMENT_DATE: 'updatePayrollPaymentDate'
   },
   BENEFIT_CONSUMPTION: {
     DELETE: 'deleteBenefitConsumption'
@@ -338,7 +340,8 @@ function reducer() {
           return _objectSpread$6(_objectSpread$6({}, payroll), {}, {
             id: decodeId(payroll.id),
             dateValidTo: payroll !== null && payroll !== void 0 && payroll.dateValidTo ? payroll === null || payroll === void 0 ? void 0 : payroll.dateValidTo.split('T')[0] : null,
-            dateValidFrom: payroll !== null && payroll !== void 0 && payroll.dateValidFrom ? payroll === null || payroll === void 0 ? void 0 : payroll.dateValidFrom.split('T')[0] : null
+            dateValidFrom: payroll !== null && payroll !== void 0 && payroll.dateValidFrom ? payroll === null || payroll === void 0 ? void 0 : payroll.dateValidFrom.split('T')[0] : null,
+            paymentDate: payroll !== null && payroll !== void 0 && payroll.paymentDate ? payroll === null || payroll === void 0 ? void 0 : payroll.paymentDate.split('T')[0] : null
           });
         })) === null || _parseData4 === void 0 ? void 0 : _parseData4[0],
         errorPayroll: formatGraphQLError(action.payload)
@@ -553,6 +556,8 @@ function reducer() {
       return dispatchMutationResp(state, MUTATION_SERVICE.PAYMENT_POINT.UPDATE, action);
     case SUCCESS(ACTION_TYPE.CREATE_PAYROLL):
       return dispatchMutationResp(state, MUTATION_SERVICE.PAYROLL.CREATE, action);
+    case SUCCESS(ACTION_TYPE.UPDATE_PAYROLL_PAYMENT_DATE):
+      return dispatchMutationResp(state, MUTATION_SERVICE.PAYROLL.UPDATE_PAYMENT_DATE, action);
     case SUCCESS(ACTION_TYPE.DELETE_PAYROLL):
       return dispatchMutationResp(state, MUTATION_SERVICE.PAYROLL.DELETE, action);
     case SUCCESS(ACTION_TYPE.DELETE_BENEFIT_CONSUMPTION):
@@ -644,6 +649,14 @@ var messages_en = {
 	"payroll.payroll.payrollStatusPicker.REJECTED": "REJECTED",
 	"payroll.payroll.payrollStatusPicker.RECONCILED": "RECONCILED",
 	"payroll.paymentMethod": "Payment Method",
+	"payroll.paymentDate": "Payment Date",
+	"payroll.paymentDateFrom": "Payment Date From",
+	"payroll.paymentDateTo": "Payment Date To",
+	"payroll.paymentDate.update": "Update Payment Date",
+	"payroll.paymentDate.mutation.updateLabel": "Update payment date {id}",
+	"payroll.validation.payroll.payment_date_required": "Payment date is required for BISTP payments.",
+	"payroll.validation.payroll.payment_date_in_past": "Payment date cannot be in the past.",
+	"payroll.validation.payroll.payment_date_locked": "Payment date can no longer be changed (payroll already sent to BISTP).",
 	"payroll.tasks.update.title": "Approve Payroll Tasks",
 	"payroll.tasks.reconciliation.title": "Payroll Reconciliation Tasks",
 	"payroll.payroll.includedUnpaid": "Included unpaid",
@@ -758,12 +771,12 @@ var PAYMENT_POINT_PROJECTION = function PAYMENT_POINT_PROJECTION(modulesManager)
   return ['id', 'name', 'isDeleted', "location ".concat(modulesManager.getProjection('location.Location.FlatProjection')), "ppm ".concat(modulesManager.getProjection('admin.UserPicker.projection'))];
 };
 var BENEFIT_CONSUMPTION_PROJECTION = function BENEFIT_CONSUMPTION_PROJECTION() {
-  return ['id', 'jsonExt', 'code', 'individual {firstName, lastName, nib}', 'benefitAttachment {bill {id, code, terms, amountTotal, datePayed}}', 'receipt', 'photo', 'amount', 'type', 'status', 'dateDue'];
+  return ['id', 'jsonExt', 'code', 'individual {firstName, lastName, nib}', 'benefitAttachment {bill {id, code, terms, amountTotal, datePayed}}', 'receipt', 'photo', 'amount', 'type', 'status', 'dateDue', 'paymentDate'];
 };
 var PAYROLL_BENEFIT_CONSUMPTION_PROJECTION = function PAYROLL_BENEFIT_CONSUMPTION_PROJECTION() {
   return ['id',
   // eslint-disable-next-line max-len
-  'benefit{id,isDeleted,jsonExt,dateCreated,dateUpdated,dateValidFrom,dateValidTo,id,code,individual {firstName, lastName},benefitAttachment {bill {id, code, terms, datePayed}},receipt,photo,amount,type,status,dateDue}', 'payroll {id, name, status, paymentCycle {code, startDate, endDate}, paymentMethod, benefitPlanNameCode}'];
+  'benefit{id,isDeleted,jsonExt,dateCreated,dateUpdated,dateValidFrom,dateValidTo,id,code,individual {firstName, lastName},benefitAttachment {bill {id, code, terms, datePayed}},receipt,photo,amount,type,status,dateDue,paymentDate}', 'payroll {id, name, status, paymentCycle {code, startDate, endDate}, paymentMethod, paymentDate, benefitPlanNameCode}'];
 };
 var BENEFIT_CONSUMPTION_SUMMARY_PROJECTION = function BENEFIT_CONSUMPTION_SUMMARY_PROJECTION() {
   return ['totalAmountReceived', 'totalAmountDue'];
@@ -775,10 +788,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 }', 'benefitPlanNameCode', "paymentPoint { ".concat(PAYMENT_POINT_PROJECTION(modulesManager).join(' '), " }"), 'paymentCycle { code, startDate, endDate }', 'jsonExt', 'status', 'dateValidFrom', 'dateValidTo', 'isDeleted'].concat(_toConsumableArray(BISTP_SUMMARY_PROJECTION()));
+  return ['id', 'name', 'paymentMethod', 'paymentDate', 'paymentPlan { code, id, name, benefitPlanType }', 'benefitPlanNameCode', "paymentPoint { ".concat(PAYMENT_POINT_PROJECTION(modulesManager).join(' '), " }"), 'paymentCycle { code, startDate, endDate }', 'jsonExt', 'status', 'dateValidFrom', 'dateValidTo', 'isDeleted'].concat(_toConsumableArray(BISTP_SUMMARY_PROJECTION()));
 };
 var PAYROLL_SEARCHER_PROJECTION = function PAYROLL_SEARCHER_PROJECTION(modulesManager) {
-  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(BISTP_SUMMARY_PROJECTION()));
+  return ['id', 'name', 'paymentMethod', 'paymentDate', 'paymentPlan { code, id, name, benefitPlanType }', 'benefitPlanNameCode', "paymentPoint { ".concat(PAYMENT_POINT_PROJECTION(modulesManager).join(' '), " }"), 'paymentCycle { code, startDate, endDate }', 'jsonExt', 'status', 'dateValidFrom', 'dateValidTo', 'isDeleted'].concat(_toConsumableArray(BISTP_SUMMARY_PROJECTION()));
 };
 var CSV_RECONCILIATION_PROJECTION = function CSV_RECONCILIATION_PROJECTION() {
   return ['fileName', 'status', 'error', 'jsonExt'];
@@ -790,7 +803,7 @@ var formatPaymentPointGQL = function formatPaymentPointGQL(paymentPoint) {
   return "\n  ".concat(paymentPoint !== null && paymentPoint !== void 0 && paymentPoint.id ? "id: \"".concat(paymentPoint.id, "\"") : '', "\n  ").concat(paymentPoint !== null && paymentPoint !== void 0 && paymentPoint.name ? "name: \"".concat(formatGQLString(paymentPoint.name), "\"") : '', "\n  ").concat(paymentPoint !== null && paymentPoint !== void 0 && paymentPoint.location ? "locationId: ".concat(decodeId(paymentPoint.location.id)) : '', "\n  ").concat(paymentPoint !== null && paymentPoint !== void 0 && paymentPoint.ppm ? "ppmId: \"".concat(decodeId(paymentPoint.ppm.id), "\"") : '', "\n  ");
 };
 var formatPayrollGQL = function formatPayrollGQL(payroll) {
-  return "\n  ".concat(payroll !== null && payroll !== void 0 && payroll.id ? "id: \"".concat(payroll.id, "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.name ? "name: \"".concat(formatGQLString(payroll.name), "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.paymentPoint ? "paymentPointId: \"".concat(decodeId(payroll.paymentPoint.id), "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.paymentPlan ? "paymentPlanId: \"".concat(decodeId(payroll.paymentPlan.id), "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.paymentCycle ? "paymentCycleId: \"".concat(decodeId(payroll.paymentCycle.id), "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.paymentMethod ? "paymentMethod: \"".concat(payroll.paymentMethod, "\"") : '', "\n  ", "status: ".concat(PAYROLL_STATUS.PENDING_APPROVAL), "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.jsonExt ? "jsonExt: ".concat(JSON.stringify(payroll.jsonExt)) : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.dateValidFrom ? "dateValidFrom: \"".concat(payroll.dateValidFrom, "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.dateValidTo ? "dateValidTo: \"".concat(payroll.dateValidTo, "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.fromFailedInvoicesPayrollId ? "fromFailedInvoicesPayrollId: \"".concat(payroll.fromFailedInvoicesPayrollId, "\"") : '', "\n  ");
+  return "\n  ".concat(payroll !== null && payroll !== void 0 && payroll.id ? "id: \"".concat(payroll.id, "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.name ? "name: \"".concat(formatGQLString(payroll.name), "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.paymentPoint ? "paymentPointId: \"".concat(decodeId(payroll.paymentPoint.id), "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.paymentPlan ? "paymentPlanId: \"".concat(decodeId(payroll.paymentPlan.id), "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.paymentCycle ? "paymentCycleId: \"".concat(decodeId(payroll.paymentCycle.id), "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.paymentMethod ? "paymentMethod: \"".concat(payroll.paymentMethod, "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.paymentDate ? "paymentDate: \"".concat(payroll.paymentDate, "\"") : '', "\n  ", "status: ".concat(PAYROLL_STATUS.PENDING_APPROVAL), "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.jsonExt ? "jsonExt: ".concat(JSON.stringify(payroll.jsonExt)) : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.dateValidFrom ? "dateValidFrom: \"".concat(payroll.dateValidFrom, "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.dateValidTo ? "dateValidTo: \"".concat(payroll.dateValidTo, "\"") : '', "\n  ").concat(payroll !== null && payroll !== void 0 && payroll.fromFailedInvoicesPayrollId ? "fromFailedInvoicesPayrollId: \"".concat(payroll.fromFailedInvoicesPayrollId, "\"") : '', "\n  ");
 };
 var PERFORM_MUTATION = function PERFORM_MUTATION(mutationType, mutationInput, ACTION, clientMutationLabel) {
   var mutation = formatMutation(mutationType, mutationInput, clientMutationLabel);
@@ -892,6 +905,10 @@ function makePaymentForPayroll(payroll, clientMutationLabel) {
   var payrollUuids = "ids: [\"".concat(payroll === null || payroll === void 0 ? void 0 : payroll.id, "\"]");
   return PERFORM_MUTATION(MUTATION_SERVICE.PAYROLL.MAKE_PAYMENT, payrollUuids, ACTION_TYPE.MAKE_PAYMENT_PAYROLL, clientMutationLabel);
 }
+function updatePayrollPaymentDate(payroll, paymentDate, clientMutationLabel) {
+  var mutationInput = "\n    id: \"".concat(payroll === null || payroll === void 0 ? void 0 : payroll.id, "\"\n    paymentDate: \"").concat(paymentDate, "\"\n  ");
+  return PERFORM_MUTATION(MUTATION_SERVICE.PAYROLL.UPDATE_PAYMENT_DATE, mutationInput, ACTION_TYPE.UPDATE_PAYROLL_PAYMENT_DATE, clientMutationLabel);
+}
 function fetchBistpSummary(payrollId) {
   var query = "\n    {\n      total:       benefitConsumptionByPayroll(payrollUuid: \"".concat(payrollId, "\", first: 0) { totalCount }\n      pendentes:   benefitConsumptionByPayroll(payrollUuid: \"").concat(payrollId, "\", status: ACCEPTED, first: 0) { totalCount }\n      enviados:    benefitConsumptionByPayroll(payrollUuid: \"").concat(payrollId, "\", status: APPROVE_FOR_PAYMENT, first: 0) { totalCount }\n      confirmados: benefitConsumptionByPayroll(payrollUuid: \"").concat(payrollId, "\", status: RECONCILED, first: 0) { totalCount }\n      rejeitados:  benefitConsumptionByPayroll(payrollUuid: \"").concat(payrollId, "\", status: REJECTED, first: 0) { totalCount }\n    }\n  ");
   return graphql(query, ACTION_TYPE.GET_BISTP_SUMMARY);
@@ -1108,7 +1125,7 @@ function PaymentPointPage(_ref) {
     saveTooltip: formatMessage('tooltip.save')
   })));
 }
-var mapDispatchToProps$i = function mapDispatchToProps(dispatch) {
+var mapDispatchToProps$j = function mapDispatchToProps(dispatch) {
   return bindActionCreators({
     clearPaymentPoint: clearPaymentPoint,
     createPaymentPoint: createPaymentPoint,
@@ -1120,7 +1137,7 @@ var mapDispatchToProps$i = function mapDispatchToProps(dispatch) {
     journalize: journalize
   }, dispatch);
 };
-var mapStateToProps$i = function mapStateToProps(state, props) {
+var mapStateToProps$j = function mapStateToProps(state, props) {
   var _state$core$user$i_us, _state$core;
   return {
     paymentPointUuid: props.match.params.payment_point_uuid,
@@ -1131,7 +1148,7 @@ var mapStateToProps$i = function mapStateToProps(state, props) {
     paymentPoint: state.payroll.paymentPoint
   };
 };
-var PaymentPointPage$1 = connect(mapStateToProps$i, mapDispatchToProps$i)(PaymentPointPage);
+var PaymentPointPage$1 = connect(mapStateToProps$j, mapDispatchToProps$j)(PaymentPointPage);
 
 var useStyles$f = makeStyles(function (theme) {
   return {
@@ -1396,7 +1413,7 @@ function PaymentPointSearcher(_ref) {
     rowLocked: isRowDisabled
   });
 }
-var mapStateToProps$h = function mapStateToProps(state) {
+var mapStateToProps$i = function mapStateToProps(state) {
   return {
     fetchingPaymentPoints: state.payroll.fetchingPaymentPoints,
     fetchedPaymentPoints: state.payroll.fetchedPaymentPoints,
@@ -1409,7 +1426,7 @@ var mapStateToProps$h = function mapStateToProps(state) {
     mutation: state.payroll.mutation
   };
 };
-var mapDispatchToProps$h = function mapDispatchToProps(dispatch) {
+var mapDispatchToProps$i = function mapDispatchToProps(dispatch) {
   return bindActionCreators({
     fetchPaymentPoints: fetchPaymentPoints,
     deletePaymentPoint: deletePaymentPoint,
@@ -1418,7 +1435,7 @@ var mapDispatchToProps$h = function mapDispatchToProps(dispatch) {
     coreConfirm: coreConfirm
   }, dispatch);
 };
-var PaymentPointSearcher$1 = connect(mapStateToProps$h, mapDispatchToProps$h)(PaymentPointSearcher);
+var PaymentPointSearcher$1 = connect(mapStateToProps$i, mapDispatchToProps$i)(PaymentPointSearcher);
 
 var useStyles$e = makeStyles(function (theme) {
   return {
@@ -1748,7 +1765,7 @@ function AdvancedFiltersDialog(_ref) {
     disabled: !object || confirmed || readOnly
   }, formatMessage$1(intl, 'payroll', 'payroll.advancedFilters.button.filter')))) : /*#__PURE__*/React.createElement(React.Fragment, null)));
 }
-var mapStateToProps$g = function mapStateToProps(state, props) {
+var mapStateToProps$h = function mapStateToProps(state, props) {
   return {
     rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [],
     confirmed: state.core.confirmed,
@@ -1758,12 +1775,12 @@ var mapStateToProps$g = function mapStateToProps(state, props) {
     customFilters: state.core.customFilters
   };
 };
-var mapDispatchToProps$g = function mapDispatchToProps(dispatch) {
+var mapDispatchToProps$h = function mapDispatchToProps(dispatch) {
   return bindActionCreators({
     fetchCustomFilter: fetchCustomFilter
   }, dispatch);
 };
-var AdvancedFiltersDialog$1 = injectIntl(withTheme(withStyles(styles$3)(connect(mapStateToProps$g, mapDispatchToProps$g)(AdvancedFiltersDialog))));
+var AdvancedFiltersDialog$1 = injectIntl(withTheme(withStyles(styles$3)(connect(mapStateToProps$h, mapDispatchToProps$h)(AdvancedFiltersDialog))));
 
 function PayrollStatusPicker(_ref) {
   var required = _ref.required,
@@ -1831,7 +1848,7 @@ function PaymentMethodPicker(_ref) {
     required: required
   });
 }
-var mapStateToProps$f = function mapStateToProps(state) {
+var mapStateToProps$g = function mapStateToProps(state) {
   return {
     rights: !!state.core && !!state.core.user && !!state.core.user.i_user ? state.core.user.i_user.rights : [],
     confirmed: state.core.confirmed,
@@ -1841,12 +1858,99 @@ var mapStateToProps$f = function mapStateToProps(state) {
     paymentMethods: state.payroll.paymentMethods
   };
 };
-var mapDispatchToProps$f = function mapDispatchToProps(dispatch) {
+var mapDispatchToProps$g = function mapDispatchToProps(dispatch) {
   return bindActionCreators({
     fetchPaymentMethods: fetchPaymentMethods
   }, dispatch);
 };
-var PaymentMethodPicker$1 = connect(mapStateToProps$f, mapDispatchToProps$f)(PaymentMethodPicker);
+var PaymentMethodPicker$1 = connect(mapStateToProps$g, mapDispatchToProps$g)(PaymentMethodPicker);
+
+var EDITABLE_STATUSES = [PAYROLL_STATUS.PENDING_APPROVAL, PAYROLL_STATUS.APPROVE_FOR_PAYMENT];
+function PayrollPaymentDateDialog(_ref) {
+  var payroll = _ref.payroll,
+    updatePayrollPaymentDate = _ref.updatePayrollPaymentDate,
+    fetchPayroll = _ref.fetchPayroll,
+    submittingMutation = _ref.submittingMutation,
+    mutation = _ref.mutation;
+  var modulesManager = useModulesManager();
+  var _useTranslations = useTranslations(MODULE_NAME, modulesManager),
+    formatMessage = _useTranslations.formatMessage,
+    formatMessageWithValues = _useTranslations.formatMessageWithValues;
+  var _useState = useState(false),
+    _useState2 = _slicedToArray(_useState, 2),
+    isOpen = _useState2[0],
+    setIsOpen = _useState2[1];
+  var _useState3 = useState(null),
+    _useState4 = _slicedToArray(_useState3, 2),
+    paymentDate = _useState4[0],
+    setPaymentDate = _useState4[1];
+  var handleOpen = function handleOpen() {
+    var _payroll$paymentDate;
+    setPaymentDate((_payroll$paymentDate = payroll === null || payroll === void 0 ? void 0 : payroll.paymentDate) !== null && _payroll$paymentDate !== void 0 ? _payroll$paymentDate : null);
+    setIsOpen(true);
+  };
+  var handleClose = function handleClose() {
+    setIsOpen(false);
+  };
+  var handleSave = function handleSave() {
+    if (!paymentDate) return;
+    updatePayrollPaymentDate(payroll, paymentDate, formatMessageWithValues('payroll.paymentDate.mutation.updateLabel', mutationLabel(payroll)));
+  };
+  useEffect(function () {
+    if (!submittingMutation && (mutation === null || mutation === void 0 ? void 0 : mutation.actionType) === ACTION_TYPE.UPDATE_PAYROLL_PAYMENT_DATE && mutation !== null && mutation !== void 0 && mutation.clientMutationId && isOpen) {
+      handleClose();
+      if (payroll !== null && payroll !== void 0 && payroll.id) {
+        fetchPayroll(modulesManager, ["id: \"".concat(payroll.id, "\"")]);
+      }
+    }
+  }, [submittingMutation]);
+  if (!(payroll !== null && payroll !== void 0 && payroll.id)) return null;
+  if (!EDITABLE_STATUSES.includes(payroll === null || payroll === void 0 ? void 0 : payroll.status)) return null;
+  return /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Button, {
+    onClick: handleOpen,
+    variant: "outlined",
+    color: "primary",
+    style: {
+      marginTop: '16px'
+    }
+  }, formatMessage('payroll.paymentDate.update')), /*#__PURE__*/React.createElement(Dialog, {
+    open: isOpen,
+    onClose: handleClose
+  }, /*#__PURE__*/React.createElement(DialogTitle, null, formatMessage('payroll.paymentDate.update')), /*#__PURE__*/React.createElement(DialogContent, {
+    style: {
+      minWidth: 400
+    }
+  }, /*#__PURE__*/React.createElement(PublishedComponent, {
+    pubRef: "core.DatePicker",
+    module: "payroll",
+    label: "payroll.paymentDate",
+    value: paymentDate,
+    onChange: setPaymentDate,
+    required: true,
+    disablePast: true
+  })), /*#__PURE__*/React.createElement(DialogActions, null, /*#__PURE__*/React.createElement(Button, {
+    onClick: handleClose,
+    color: "primary"
+  }, formatMessage('payroll.beneficiaries.cancel')), /*#__PURE__*/React.createElement(Button, {
+    onClick: handleSave,
+    color: "primary",
+    variant: "contained",
+    disabled: !paymentDate
+  }, formatMessage('payroll.beneficiaries.confirm')))));
+}
+var mapStateToProps$f = function mapStateToProps(state) {
+  return {
+    submittingMutation: state.payroll.submittingMutation,
+    mutation: state.payroll.mutation
+  };
+};
+var mapDispatchToProps$f = function mapDispatchToProps(dispatch) {
+  return bindActionCreators({
+    updatePayrollPaymentDate: updatePayrollPaymentDate,
+    fetchPayroll: fetchPayroll
+  }, dispatch);
+};
+var PayrollPaymentDateDialog$1 = connect(mapStateToProps$f, mapDispatchToProps$f)(PayrollPaymentDateDialog);
 
 function ownKeys$3(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
 function _objectSpread$3(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys$3(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys$3(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
@@ -2016,6 +2120,28 @@ var PayrollHeadPanel = /*#__PURE__*/function (_FormPanel) {
           return _this2.updateAttribute('paymentMethod', paymentMethod);
         },
         label: formatMessage$1(intl, 'payroll', 'paymentMethod')
+      })), /*#__PURE__*/React.createElement(Grid, {
+        item: true,
+        xs: 3,
+        className: classes.item
+      }, /*#__PURE__*/React.createElement(PublishedComponent, {
+        pubRef: "core.DatePicker",
+        module: "payroll",
+        label: "payroll.paymentDate",
+        value: payroll === null || payroll === void 0 ? void 0 : payroll.paymentDate,
+        required: (payroll === null || payroll === void 0 ? void 0 : payroll.paymentMethod) === PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT,
+        readOnly: readOnly,
+        disablePast: !readOnly,
+        onChange: function onChange(paymentDate) {
+          return _this2.updateAttribute('paymentDate', paymentDate);
+        }
+      })), readOnly && /*#__PURE__*/React.createElement(Grid, {
+        item: true,
+        xs: 3,
+        className: classes.item
+      }, /*#__PURE__*/React.createElement(PayrollPaymentDateDialog$1, {
+        payroll: payroll,
+        readOnly: readOnly
       }))), /*#__PURE__*/React.createElement(Divider, null), !isPayrollFromFailedInvoices && /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(React.Fragment, null, /*#__PURE__*/React.createElement(Typography, null, /*#__PURE__*/React.createElement("div", {
         className: classes.item
       }, /*#__PURE__*/React.createElement(FormattedMessage, {
@@ -3543,7 +3669,7 @@ function PayrollPage(_ref) {
     };
   }, []);
   var mandatoryFieldsEmpty = function mandatoryFieldsEmpty() {
-    if (editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.name && editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.paymentPlan && editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.paymentCycle && editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.paymentMethod && !(editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.isDeleted)) return false;
+    if (editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.name && editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.paymentPlan && editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.paymentCycle && editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.paymentMethod && ((editedPayroll === null || editedPayroll === void 0 ? void 0 : editedPayroll.paymentMethod) !== PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT || editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.paymentDate) && !(editedPayroll !== null && editedPayroll !== void 0 && editedPayroll.isDeleted)) return false;
     return true;
   };
   var canSave = function canSave() {
@@ -3735,6 +3861,38 @@ function PayrollFilter(_ref) {
         filter: "paymentMethod: \"".concat(value, "\"")
       }]);
     }
+  })), /*#__PURE__*/React.createElement(Grid, {
+    item: true,
+    xs: 2,
+    className: classes.item
+  }, /*#__PURE__*/React.createElement(PublishedComponent, {
+    pubRef: "core.DatePicker",
+    module: "payroll",
+    label: "payroll.paymentDateFrom",
+    value: filterValue('paymentDate_Gte'),
+    onChange: function onChange(value) {
+      return onChangeFilters([{
+        id: 'paymentDate_Gte',
+        value: value,
+        filter: value ? "paymentDate_Gte: \"".concat(value, "\"") : EMPTY_STRING
+      }]);
+    }
+  })), /*#__PURE__*/React.createElement(Grid, {
+    item: true,
+    xs: 2,
+    className: classes.item
+  }, /*#__PURE__*/React.createElement(PublishedComponent, {
+    pubRef: "core.DatePicker",
+    module: "payroll",
+    label: "payroll.paymentDateTo",
+    value: filterValue('paymentDate_Lte'),
+    onChange: function onChange(value) {
+      return onChangeFilters([{
+        id: 'paymentDate_Lte',
+        value: value,
+        filter: value ? "paymentDate_Lte: \"".concat(value, "\"") : EMPTY_STRING
+      }]);
+    }
   })), /*#__PURE__*/React.createElement(ControlledField, {
     module: "payroll",
     id: "payrollFilter.showHistory",
@@ -3819,10 +3977,10 @@ function PayrollSearcher(_ref) {
     prevSubmittingMutationRef.current = submittingMutation;
   });
   var headers = function headers() {
-    return ['payroll.name', 'payroll.benefitPlan', 'payroll.paymentPoint', 'payroll.status', 'payroll.paymentMethod', 'payroll.bistp.progress', 'emptyLabel'];
+    return ['payroll.name', 'payroll.benefitPlan', 'payroll.paymentPoint', 'payroll.status', 'payroll.paymentMethod', 'payroll.paymentDate', 'payroll.bistp.progress', 'emptyLabel'];
   };
   var sorts = function sorts() {
-    return [['name', true], ['benefitPlanNameCode', true], ['paymentPoint', true], ['status', true], ['paymentMethod', true]];
+    return [['name', true], ['benefitPlanNameCode', true], ['paymentPoint', true], ['status', true], ['paymentMethod', true], ['paymentDate', true]];
   };
   var renderBistpProgress = function renderBistpProgress(payroll) {
     if (payroll.paymentMethod !== PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT) return null;
@@ -3884,6 +4042,9 @@ function PayrollSearcher(_ref) {
       return payroll.status ? "".concat(payroll.status) : '';
     }, function (payroll) {
       return payroll.paymentMethod ? "".concat(payroll.paymentMethod) : '';
+    }, function (payroll) {
+      var _payroll$paymentDate;
+      return (_payroll$paymentDate = payroll.paymentDate) !== null && _payroll$paymentDate !== void 0 ? _payroll$paymentDate : '—';
     }, function (payroll) {
       return renderBistpProgress(payroll);
     }, function (payroll) {
@@ -5684,9 +5845,11 @@ function BenefitConsumptionSearcher(_ref) {
       return isPayrollFromFailedInvoices ? BENEFIT_CONSUMPTION_STATUS.APPROVE_FOR_PAYMENT : benefitConsumption === null || benefitConsumption === void 0 ? void 0 : benefitConsumption.status;
     }, function (benefitConsumption) {
       return checkBenefitDueDate(benefitConsumption);
-    }, function (benefitConsumption) {
-      var _benefitConsumption$b;
-      return !benefitConsumption.receipt ? '' : benefitConsumption === null || benefitConsumption === void 0 || (_benefitConsumption$b = benefitConsumption.benefitAttachment[0]) === null || _benefitConsumption$b === void 0 || (_benefitConsumption$b = _benefitConsumption$b.bill) === null || _benefitConsumption$b === void 0 ? void 0 : _benefitConsumption$b.datePayed;
+    },
+    // paymentDate enviada ao BISTP; fallback para bill.datePayed (offline); "—" se ainda não enviado
+    function (benefitConsumption) {
+      var _benefitConsumption$p, _benefitConsumption$b, _benefitConsumption$b2;
+      return (_benefitConsumption$p = benefitConsumption === null || benefitConsumption === void 0 ? void 0 : benefitConsumption.paymentDate) !== null && _benefitConsumption$p !== void 0 ? _benefitConsumption$p : !benefitConsumption.receipt ? '—' : (_benefitConsumption$b = benefitConsumption === null || benefitConsumption === void 0 || (_benefitConsumption$b2 = benefitConsumption.benefitAttachment) === null || _benefitConsumption$b2 === void 0 || (_benefitConsumption$b2 = _benefitConsumption$b2[0]) === null || _benefitConsumption$b2 === void 0 || (_benefitConsumption$b2 = _benefitConsumption$b2.bill) === null || _benefitConsumption$b2 === void 0 ? void 0 : _benefitConsumption$b2.datePayed) !== null && _benefitConsumption$b !== void 0 ? _benefitConsumption$b : '—';
     }, function (benefitConsumption) {
       var jsonExt = (benefitConsumption === null || benefitConsumption === void 0 ? void 0 : benefitConsumption.jsonExt) || {};
       var hasBistpFields = jsonExt.bistp_skip_reason || jsonExt.bistp_processed || jsonExt.bistp_rejection_reason;
@@ -5707,7 +5870,7 @@ function BenefitConsumptionSearcher(_ref) {
     return benefitConsumption.id;
   };
   var sorts = function sorts() {
-    return [['individual_FirstName', true], ['individual_LastName', true], ['individual_Nib', true], ['photo', true], ['code', true], ['dateDue', true], ['receipt', true], ['amount', true], ['type', true], ['status', true]];
+    return [['individual_FirstName', true], ['individual_LastName', true], ['individual_Nib', true], ['photo', true], ['code', true], ['dateDue', true], ['receipt', true], ['amount', true], ['type', true], ['status', true], ['paymentDate', true]];
   };
   var defaultFilters = function defaultFilters() {
     var filters = {