@stssocialst-stp/fe-payroll 0.1.9 → 0.2.1

This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
package/dist/index.js CHANGED
@@ -12,7 +12,6 @@ var redux = require('redux');
12
12
  var reactRedux = require('react-redux');
13
13
  var styles$7 = require('@material-ui/styles');
14
14
  var DeleteIcon = require('@material-ui/icons/Delete');
15
- var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
16
15
  var _classCallCheck = require('@babel/runtime/helpers/classCallCheck');
17
16
  var _createClass = require('@babel/runtime/helpers/createClass');
18
17
  var _possibleConstructorReturn = require('@babel/runtime/helpers/possibleConstructorReturn');
@@ -22,6 +21,7 @@ var reactIntl = require('react-intl');
22
21
  var core = require('@material-ui/core');
23
22
  var styles$6 = require('@material-ui/core/styles');
24
23
  var AddIcon = require('@material-ui/icons/Add');
24
+ var _toConsumableArray = require('@babel/runtime/helpers/toConsumableArray');
25
25
  var VisibilityIcon = require('@material-ui/icons/Visibility');
26
26
  var _debounce = require('lodash/debounce');
27
27
  var Button = require('@material-ui/core/Button');
@@ -38,7 +38,6 @@ var reactToPrint = require('react-to-print');
38
38
  var PrintIcon = require('@material-ui/icons/Print');
39
39
  var DialogContentText = require('@material-ui/core/DialogContentText');
40
40
  var PhotoCameraOutlinedIcon = require('@material-ui/icons/PhotoCameraOutlined');
41
- var LinearProgress = require('@material-ui/core/LinearProgress');
42
41
  var DownloadIcon = require('@material-ui/icons/CloudDownload');
43
42
  var Chip = require('@material-ui/core/Chip');
44
43
 
@@ -49,13 +48,13 @@ var React__default = /*#__PURE__*/_interopDefaultLegacy(React);
49
48
  var MonetizationOnIcon__default = /*#__PURE__*/_interopDefaultLegacy(MonetizationOnIcon);
50
49
  var _slicedToArray__default = /*#__PURE__*/_interopDefaultLegacy(_slicedToArray);
51
50
  var DeleteIcon__default = /*#__PURE__*/_interopDefaultLegacy(DeleteIcon);
52
- var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
53
51
  var _classCallCheck__default = /*#__PURE__*/_interopDefaultLegacy(_classCallCheck);
54
52
  var _createClass__default = /*#__PURE__*/_interopDefaultLegacy(_createClass);
55
53
  var _possibleConstructorReturn__default = /*#__PURE__*/_interopDefaultLegacy(_possibleConstructorReturn);
56
54
  var _getPrototypeOf__default = /*#__PURE__*/_interopDefaultLegacy(_getPrototypeOf);
57
55
  var _inherits__default = /*#__PURE__*/_interopDefaultLegacy(_inherits);
58
56
  var AddIcon__default = /*#__PURE__*/_interopDefaultLegacy(AddIcon);
57
+ var _toConsumableArray__default = /*#__PURE__*/_interopDefaultLegacy(_toConsumableArray);
59
58
  var VisibilityIcon__default = /*#__PURE__*/_interopDefaultLegacy(VisibilityIcon);
60
59
  var _debounce__default = /*#__PURE__*/_interopDefaultLegacy(_debounce);
61
60
  var Button__default = /*#__PURE__*/_interopDefaultLegacy(Button);
@@ -71,7 +70,6 @@ var Typography__default = /*#__PURE__*/_interopDefaultLegacy(Typography);
71
70
  var PrintIcon__default = /*#__PURE__*/_interopDefaultLegacy(PrintIcon);
72
71
  var DialogContentText__default = /*#__PURE__*/_interopDefaultLegacy(DialogContentText);
73
72
  var PhotoCameraOutlinedIcon__default = /*#__PURE__*/_interopDefaultLegacy(PhotoCameraOutlinedIcon);
74
- var LinearProgress__default = /*#__PURE__*/_interopDefaultLegacy(LinearProgress);
75
73
  var DownloadIcon__default = /*#__PURE__*/_interopDefaultLegacy(DownloadIcon);
76
74
  var Chip__default = /*#__PURE__*/_interopDefaultLegacy(Chip);
77
75
 
@@ -732,6 +730,7 @@ function isBase64Encoded(str) {
732
730
  return base64RegExp.test(str);
733
731
  }
734
732
 
733
+ /* eslint-disable max-len */
735
734
  var PAYMENT_POINT_PROJECTION = function PAYMENT_POINT_PROJECTION(modulesManager) {
736
735
  return ['id', 'name', 'isDeleted', "location ".concat(modulesManager.getProjection('location.Location.FlatProjection')), "ppm ".concat(modulesManager.getProjection('admin.UserPicker.projection'))];
737
736
  };
@@ -749,14 +748,11 @@ var BENEFIT_CONSUMPTION_SUMMARY_PROJECTION = function BENEFIT_CONSUMPTION_SUMMAR
749
748
  var BENEFIT_ATTACHMENT_PROJECTION = function BENEFIT_ATTACHMENT_PROJECTION() {
750
749
  return ['benefit{id, status, code, dateDue, receipt, individual {firstName, lastName}, jsonExt, type, status, amount, receipt}', 'bill{id, code, terms, amountTotal, datePayed}'];
751
750
  };
752
- var BISTP_SUMMARY_PROJECTION = function BISTP_SUMMARY_PROJECTION() {
753
- return ['bistpSummary { total reconciled rejected pending skippedNib sendFailed }'];
754
- };
755
751
  var PAYROLL_PROJECTION = function PAYROLL_PROJECTION(modulesManager) {
756
- 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()));
752
+ 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'];
757
753
  };
758
754
  var PAYROLL_SEARCHER_PROJECTION = function PAYROLL_SEARCHER_PROJECTION(modulesManager) {
759
- 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()));
755
+ 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'];
760
756
  };
761
757
  var CSV_RECONCILIATION_PROJECTION = function CSV_RECONCILIATION_PROJECTION() {
762
758
  return ['fileName', 'status', 'error', 'jsonExt'];
@@ -2885,7 +2881,7 @@ function downloadPayroll(payrollId, payrollFileName) {
2885
2881
  }
2886
2882
 
2887
2883
  function PaymentApproveForPaymentDialog(_ref) {
2888
- var _payrollDetail$id, _bistpSummary$reconci, _bistpSummary$total, _bistpSummary$pending, _bistpSummary$rejecte, _bistpSummary$skipped, _bistpSummary$sendFai;
2884
+ var _payrollDetail$id;
2889
2885
  var classes = _ref.classes,
2890
2886
  payroll = _ref.payroll,
2891
2887
  closePayroll = _ref.closePayroll,
@@ -2982,14 +2978,12 @@ function PaymentApproveForPaymentDialog(_ref) {
2982
2978
  var downloadPayrollData = function downloadPayrollData(payrollUuid, payrollName) {
2983
2979
  downloadPayroll(payrollUuid, payrollName);
2984
2980
  };
2985
- var isBistp = (payrollDetail === null || payrollDetail === void 0 ? void 0 : payrollDetail.paymentMethod) === PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT;
2986
- var bistpSummary = (payroll === null || payroll === void 0 ? void 0 : payroll.bistpSummary) || {};
2987
2981
  return /*#__PURE__*/React__default["default"].createElement(React__default["default"].Fragment, null, /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
2988
2982
  onClick: handleOpen,
2989
2983
  variant: "contained",
2990
2984
  color: "primary",
2991
2985
  className: classes.button
2992
- }, isBistp ? formatMessage('payroll.bistp.viewSummary') : formatMessage('payroll.viewReconciliationSummary')), /*#__PURE__*/React__default["default"].createElement(Dialog__default["default"], {
2986
+ }, formatMessage('payroll.viewReconciliationSummary')), /*#__PURE__*/React__default["default"].createElement(Dialog__default["default"], {
2993
2987
  open: isOpen,
2994
2988
  onClose: handleClose,
2995
2989
  PaperProps: {
@@ -3008,83 +3002,7 @@ function PaymentApproveForPaymentDialog(_ref) {
3008
3002
  }
3009
3003
  }, formatMessageWithValues('payroll.reconciliationSummary', {
3010
3004
  payrollName: payrollDetail.name
3011
- })), /*#__PURE__*/React__default["default"].createElement(DialogContent__default["default"], null, isBistp ? /*#__PURE__*/React__default["default"].createElement(core.Grid, {
3012
- container: true,
3013
- spacing: 2,
3014
- style: {
3015
- marginBottom: 16
3016
- }
3017
- }, /*#__PURE__*/React__default["default"].createElement(core.Grid, {
3018
- item: true,
3019
- xs: 3
3020
- }, /*#__PURE__*/React__default["default"].createElement(core.Paper, {
3021
- elevation: 3,
3022
- style: {
3023
- padding: '20px',
3024
- backgroundColor: '#e8f5e9'
3025
- }
3026
- }, /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3027
- variant: "h6",
3028
- gutterBottom: true
3029
- }, formatMessage('payroll.bistp.reconciled')), /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3030
- variant: "body1"
3031
- }, (_bistpSummary$reconci = bistpSummary.reconciled) !== null && _bistpSummary$reconci !== void 0 ? _bistpSummary$reconci : 0, " / ", (_bistpSummary$total = bistpSummary.total) !== null && _bistpSummary$total !== void 0 ? _bistpSummary$total : 0))), /*#__PURE__*/React__default["default"].createElement(core.Grid, {
3032
- item: true,
3033
- xs: 3
3034
- }, /*#__PURE__*/React__default["default"].createElement(core.Paper, {
3035
- elevation: 3,
3036
- style: {
3037
- padding: '20px',
3038
- backgroundColor: '#fff3e0'
3039
- }
3040
- }, /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3041
- variant: "h6",
3042
- gutterBottom: true
3043
- }, formatMessage('payroll.bistp.pending')), /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3044
- variant: "body1"
3045
- }, (_bistpSummary$pending = bistpSummary.pending) !== null && _bistpSummary$pending !== void 0 ? _bistpSummary$pending : 0))), /*#__PURE__*/React__default["default"].createElement(core.Grid, {
3046
- item: true,
3047
- xs: 3
3048
- }, /*#__PURE__*/React__default["default"].createElement(core.Paper, {
3049
- elevation: 3,
3050
- style: {
3051
- padding: '20px',
3052
- backgroundColor: '#ffebee'
3053
- }
3054
- }, /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3055
- variant: "h6",
3056
- gutterBottom: true
3057
- }, formatMessage('payroll.bistp.rejected')), /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3058
- variant: "body1"
3059
- }, (_bistpSummary$rejecte = bistpSummary.rejected) !== null && _bistpSummary$rejecte !== void 0 ? _bistpSummary$rejecte : 0))), /*#__PURE__*/React__default["default"].createElement(core.Grid, {
3060
- item: true,
3061
- xs: 3
3062
- }, /*#__PURE__*/React__default["default"].createElement(core.Paper, {
3063
- elevation: 3,
3064
- style: {
3065
- padding: '20px',
3066
- backgroundColor: '#e3f2fd'
3067
- }
3068
- }, /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3069
- variant: "h6",
3070
- gutterBottom: true
3071
- }, formatMessage('payroll.bistp.skippedNib')), /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3072
- variant: "body1"
3073
- }, (_bistpSummary$skipped = bistpSummary.skippedNib) !== null && _bistpSummary$skipped !== void 0 ? _bistpSummary$skipped : 0))), /*#__PURE__*/React__default["default"].createElement(core.Grid, {
3074
- item: true,
3075
- xs: 3
3076
- }, /*#__PURE__*/React__default["default"].createElement(core.Paper, {
3077
- elevation: 3,
3078
- style: {
3079
- padding: '20px',
3080
- backgroundColor: '#fce4ec'
3081
- }
3082
- }, /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3083
- variant: "h6",
3084
- gutterBottom: true
3085
- }, formatMessage('payroll.bistp.sendFailed')), /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3086
- variant: "body1"
3087
- }, (_bistpSummary$sendFai = bistpSummary.sendFailed) !== null && _bistpSummary$sendFai !== void 0 ? _bistpSummary$sendFai : 0)))) : /*#__PURE__*/React__default["default"].createElement(core.Grid, {
3005
+ })), /*#__PURE__*/React__default["default"].createElement(DialogContent__default["default"], null, "(", /*#__PURE__*/React__default["default"].createElement(core.Grid, {
3088
3006
  container: true,
3089
3007
  spacing: 2
3090
3008
  }, /*#__PURE__*/React__default["default"].createElement(core.Grid, {
@@ -3129,7 +3047,7 @@ function PaymentApproveForPaymentDialog(_ref) {
3129
3047
  gutterBottom: true
3130
3048
  }, formatMessage('payroll.summary.deliveredReconciliation')), /*#__PURE__*/React__default["default"].createElement(Typography__default["default"], {
3131
3049
  variant: "body1"
3132
- }, totalReconciledBillAmount)))), /*#__PURE__*/React__default["default"].createElement("div", {
3050
+ }, totalReconciledBillAmount)))), ")}", /*#__PURE__*/React__default["default"].createElement("div", {
3133
3051
  style: {
3134
3052
  backgroundColor: '#DFEDEF'
3135
3053
  }
@@ -3722,39 +3640,11 @@ function PayrollSearcher(_ref) {
3722
3640
  prevSubmittingMutationRef.current = submittingMutation;
3723
3641
  });
3724
3642
  var headers = function headers() {
3725
- return ['payroll.name', 'payroll.benefitPlan', 'payroll.paymentPoint', 'payroll.status', 'payroll.paymentMethod', 'payroll.bistp.progress', 'emptyLabel'];
3643
+ return ['payroll.name', 'payroll.benefitPlan', 'payroll.paymentPoint', 'payroll.status', 'payroll.paymentMethod', 'emptyLabel'];
3726
3644
  };
3727
3645
  var sorts = function sorts() {
3728
3646
  return [['name', true], ['benefitPlanNameCode', true], ['paymentPoint', true], ['status', true], ['paymentMethod', true]];
3729
3647
  };
3730
- var renderBistpProgress = function renderBistpProgress(payroll) {
3731
- if (payroll.paymentMethod !== PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT) return null;
3732
- var summary = payroll.bistpSummary || {};
3733
- var total = summary.total || 0;
3734
- var reconciled = summary.reconciled || 0;
3735
- var progress = total > 0 ? reconciled / total * 100 : 0;
3736
- return /*#__PURE__*/React__default["default"].createElement("div", {
3737
- style: {
3738
- display: 'flex',
3739
- alignItems: 'center',
3740
- gap: 8,
3741
- minWidth: 120
3742
- }
3743
- }, /*#__PURE__*/React__default["default"].createElement(LinearProgress__default["default"], {
3744
- variant: "determinate",
3745
- value: progress,
3746
- style: {
3747
- flex: 1,
3748
- height: 8,
3749
- borderRadius: 4
3750
- }
3751
- }), /*#__PURE__*/React__default["default"].createElement("span", {
3752
- style: {
3753
- fontSize: '0.75rem',
3754
- whiteSpace: 'nowrap'
3755
- }
3756
- }, reconciled, "/", total));
3757
- };
3758
3648
  var defaultFilters = function defaultFilters() {
3759
3649
  return {
3760
3650
  isDeleted: {
@@ -3787,8 +3677,6 @@ function PayrollSearcher(_ref) {
3787
3677
  return payroll.status ? "".concat(payroll.status) : '';
3788
3678
  }, function (payroll) {
3789
3679
  return payroll.paymentMethod ? "".concat(payroll.paymentMethod) : '';
3790
- }, function (payroll) {
3791
- return renderBistpProgress(payroll);
3792
3680
  }, function (payroll) {
3793
3681
  return /*#__PURE__*/React__default["default"].createElement(core.Tooltip, {
3794
3682
  title: formatMessage('tooltip.viewDetails')
@@ -3892,13 +3780,13 @@ function PayrollsPage() {
3892
3780
  return /*#__PURE__*/React__default["default"].createElement("div", {
3893
3781
  className: classes.page
3894
3782
  }, /*#__PURE__*/React__default["default"].createElement(feCore.Helmet, {
3895
- title: formatMessage('paymentPoint.page.title')
3783
+ title: formatMessage('payroll.page.title')
3896
3784
  }), rights.includes(RIGHT_PAYROLL_SEARCH) && /*#__PURE__*/React__default["default"].createElement(PayrollSearcher$1, null), rights.includes(RIGHT_PAYROLL_CREATE) && feCore.withTooltip(/*#__PURE__*/React__default["default"].createElement("div", {
3897
3785
  className: classes.fab
3898
3786
  }, /*#__PURE__*/React__default["default"].createElement(core.Fab, {
3899
3787
  color: "primary",
3900
3788
  onClick: onCreate
3901
- }, /*#__PURE__*/React__default["default"].createElement(AddIcon__default["default"], null))), formatMessage('createButton.tooltip')));
3789
+ }, /*#__PURE__*/React__default["default"].createElement(AddIcon__default["default"], null))), formatMessage('tooltip.createButton')));
3902
3790
  }
3903
3791
 
3904
3792
  function PayrollPaymentFilesSearcher(_ref) {
@@ -4097,36 +3985,8 @@ function PayrollSearcherApproved(_ref) {
4097
3985
  React.useEffect(function () {
4098
3986
  prevSubmittingMutationRef.current = submittingMutation;
4099
3987
  });
4100
- var renderBistpProgress = function renderBistpProgress(payroll) {
4101
- if (payroll.paymentMethod !== PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT) return null;
4102
- var summary = payroll.bistpSummary || {};
4103
- var total = summary.total || 0;
4104
- var reconciled = summary.reconciled || 0;
4105
- var progress = total > 0 ? reconciled / total * 100 : 0;
4106
- return /*#__PURE__*/React__default["default"].createElement("div", {
4107
- style: {
4108
- display: 'flex',
4109
- alignItems: 'center',
4110
- gap: 8,
4111
- minWidth: 120
4112
- }
4113
- }, /*#__PURE__*/React__default["default"].createElement(LinearProgress__default["default"], {
4114
- variant: "determinate",
4115
- value: progress,
4116
- style: {
4117
- flex: 1,
4118
- height: 8,
4119
- borderRadius: 4
4120
- }
4121
- }), /*#__PURE__*/React__default["default"].createElement("span", {
4122
- style: {
4123
- fontSize: '0.75rem',
4124
- whiteSpace: 'nowrap'
4125
- }
4126
- }, reconciled, "/", total));
4127
- };
4128
3988
  var headers = function headers() {
4129
- return ['payroll.name', 'payroll.paymentPlan', 'payroll.paymentPoint', 'payroll.status', 'payroll.paymentMethod', 'payroll.bistp.progress', 'emptyLabel'];
3989
+ return ['payroll.name', 'payroll.paymentPlan', 'payroll.paymentPoint', 'payroll.status', 'payroll.paymentMethod', 'emptyLabel'];
4130
3990
  };
4131
3991
  var sorts = function sorts() {
4132
3992
  return [['name', true], ['paymentPlan', true], ['paymentPoint', true], ['status', true], ['paymentMethod', true]];
@@ -4164,8 +4024,6 @@ function PayrollSearcherApproved(_ref) {
4164
4024
  return payroll.status ? "".concat(payroll.status) : '';
4165
4025
  }, function (payroll) {
4166
4026
  return payroll.paymentMethod ? "".concat(payroll.paymentMethod) : '';
4167
- }, function (payroll) {
4168
- return renderBistpProgress(payroll);
4169
4027
  }, function (payroll) {
4170
4028
  return /*#__PURE__*/React__default["default"].createElement(PayrollReconciliationFilesDialog, {
4171
4029
  classes: classes,
@@ -4253,7 +4111,7 @@ function ApprovedPayrollsPage() {
4253
4111
  return /*#__PURE__*/React__default["default"].createElement("div", {
4254
4112
  className: classes.page
4255
4113
  }, /*#__PURE__*/React__default["default"].createElement(feCore.Helmet, {
4256
- title: formatMessage('paymentPoint.page.title')
4114
+ title: formatMessage('payroll.page.title')
4257
4115
  }), rights.includes(RIGHT_PAYROLL_SEARCH) && /*#__PURE__*/React__default["default"].createElement(PayrollSearcherApproved$1, {
4258
4116
  classes: classes
4259
4117
  }));
@@ -4506,36 +4364,8 @@ function PayrollSearcherReconciled(_ref) {
4506
4364
  React.useEffect(function () {
4507
4365
  prevSubmittingMutationRef.current = submittingMutation;
4508
4366
  });
4509
- var renderBistpProgress = function renderBistpProgress(payroll) {
4510
- if (payroll.paymentMethod !== PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT) return null;
4511
- var summary = payroll.bistpSummary || {};
4512
- var total = summary.total || 0;
4513
- var reconciled = summary.reconciled || 0;
4514
- var progress = total > 0 ? reconciled / total * 100 : 0;
4515
- return /*#__PURE__*/React__default["default"].createElement("div", {
4516
- style: {
4517
- display: 'flex',
4518
- alignItems: 'center',
4519
- gap: 8,
4520
- minWidth: 120
4521
- }
4522
- }, /*#__PURE__*/React__default["default"].createElement(LinearProgress__default["default"], {
4523
- variant: "determinate",
4524
- value: progress,
4525
- style: {
4526
- flex: 1,
4527
- height: 8,
4528
- borderRadius: 4
4529
- }
4530
- }), /*#__PURE__*/React__default["default"].createElement("span", {
4531
- style: {
4532
- fontSize: '0.75rem',
4533
- whiteSpace: 'nowrap'
4534
- }
4535
- }, reconciled, "/", total));
4536
- };
4537
4367
  var headers = function headers() {
4538
- return ['payroll.name', 'payroll.paymentPlan', 'payroll.paymentPoint', 'payroll.status', 'payroll.paymentMethod', 'payroll.bistp.progress', 'emptyLabel'];
4368
+ return ['payroll.name', 'payroll.paymentPlan', 'payroll.paymentPoint', 'payroll.status', 'payroll.paymentMethod', 'emptyLabel'];
4539
4369
  };
4540
4370
  var sorts = function sorts() {
4541
4371
  return [['name', true], ['paymentPlan', true], ['paymentPoint', true], ['status', true], ['paymentMethod', true]];
@@ -4573,8 +4403,6 @@ function PayrollSearcherReconciled(_ref) {
4573
4403
  return payroll.status ? "".concat(payroll.status) : '';
4574
4404
  }, function (payroll) {
4575
4405
  return payroll.paymentMethod ? "".concat(payroll.paymentMethod) : '';
4576
- }, function (payroll) {
4577
- return renderBistpProgress(payroll);
4578
4406
  }, function (payroll) {
4579
4407
  return /*#__PURE__*/React__default["default"].createElement(PayrollReconciliationFilesDialog, {
4580
4408
  classes: classes,
@@ -4662,7 +4490,7 @@ function ReconciledPayrollsPage() {
4662
4490
  return /*#__PURE__*/React__default["default"].createElement("div", {
4663
4491
  className: classes.page
4664
4492
  }, /*#__PURE__*/React__default["default"].createElement(feCore.Helmet, {
4665
- title: formatMessage('paymentPoint.page.title')
4493
+ title: formatMessage('payroll.page.title')
4666
4494
  }), rights.includes(RIGHT_PAYROLL_SEARCH) && /*#__PURE__*/React__default["default"].createElement(PayrollSearcherReconciled$1, {
4667
4495
  classes: classes
4668
4496
  }));
@@ -5835,6 +5663,7 @@ function PaymentPendingPayrollPaymentDialog(_ref) {
5835
5663
  var classes = _ref.classes,
5836
5664
  payroll = _ref.payroll,
5837
5665
  fetchPayroll = _ref.fetchPayroll,
5666
+ closePayroll = _ref.closePayroll,
5838
5667
  payrollDetail = _ref.payrollDetail;
5839
5668
  var modulesManager = feCore.useModulesManager();
5840
5669
  var _useState = React.useState((_payrollDetail$id = payrollDetail === null || payrollDetail === void 0 ? void 0 : payrollDetail.id) !== null && _payrollDetail$id !== void 0 ? _payrollDetail$id : null),
@@ -5902,6 +5731,10 @@ function PaymentPendingPayrollPaymentDialog(_ref) {
5902
5731
  setTotalReconciledBillAmount(reconciledAmount);
5903
5732
  }
5904
5733
  }, [isOpen, payroll]);
5734
+ var closePayrollCallback = function closePayrollCallback() {
5735
+ closePayroll(payrollDetail, formatMessageWithValues('payroll.mutation.closeLabel', mutationLabel(payrollDetail)));
5736
+ handleClose();
5737
+ };
5905
5738
  var downloadPayrollData = function downloadPayrollData(payrollUuid, payrollName) {
5906
5739
  downloadPayroll(payrollUuid, payrollName);
5907
5740
  };
@@ -6007,7 +5840,15 @@ function PaymentPendingPayrollPaymentDialog(_ref) {
6007
5840
  margin: '0 16px',
6008
5841
  marginBottom: '15px'
6009
5842
  }
6010
- }, formatMessage('payroll.summary.download'))), /*#__PURE__*/React__default["default"].createElement("div", {
5843
+ }, formatMessage('payroll.summary.download')), /*#__PURE__*/React__default["default"].createElement(Button__default["default"], {
5844
+ onClick: closePayrollCallback,
5845
+ variant: "contained",
5846
+ color: "primary",
5847
+ style: {
5848
+ margin: '0 16px',
5849
+ marginBottom: '15px'
5850
+ }
5851
+ }, formatMessage('payroll.summary.approveAndClose'))), /*#__PURE__*/React__default["default"].createElement("div", {
6011
5852
  style: {
6012
5853
  "float": 'right',
6013
5854
  paddingRight: '16px'
@@ -6030,7 +5871,8 @@ var mapStateToProps$1 = function mapStateToProps(state) {
6030
5871
  };
6031
5872
  var mapDispatchToProps$1 = function mapDispatchToProps(dispatch) {
6032
5873
  return redux.bindActionCreators({
6033
- fetchPayroll: fetchPayroll
5874
+ fetchPayroll: fetchPayroll,
5875
+ closePayroll: closePayroll
6034
5876
  }, dispatch);
6035
5877
  };
6036
5878
  var PayrollPendingPayrollSummary = reactRedux.connect(mapStateToProps$1, mapDispatchToProps$1)(PaymentPendingPayrollPaymentDialog);
@@ -6063,36 +5905,8 @@ function PayrollSearcherPending(_ref) {
6063
5905
  React.useEffect(function () {
6064
5906
  prevSubmittingMutationRef.current = submittingMutation;
6065
5907
  });
6066
- var renderBistpProgress = function renderBistpProgress(payroll) {
6067
- if (payroll.paymentMethod !== PAYMENT_METHOD.STRATEGY_BISTP_PAYMENT) return null;
6068
- var summary = payroll.bistpSummary || {};
6069
- var total = summary.total || 0;
6070
- var reconciled = summary.reconciled || 0;
6071
- var progress = total > 0 ? reconciled / total * 100 : 0;
6072
- return /*#__PURE__*/React__default["default"].createElement("div", {
6073
- style: {
6074
- display: 'flex',
6075
- alignItems: 'center',
6076
- gap: 8,
6077
- minWidth: 120
6078
- }
6079
- }, /*#__PURE__*/React__default["default"].createElement(LinearProgress__default["default"], {
6080
- variant: "determinate",
6081
- value: progress,
6082
- style: {
6083
- flex: 1,
6084
- height: 8,
6085
- borderRadius: 4
6086
- }
6087
- }), /*#__PURE__*/React__default["default"].createElement("span", {
6088
- style: {
6089
- fontSize: '0.75rem',
6090
- whiteSpace: 'nowrap'
6091
- }
6092
- }, reconciled, "/", total));
6093
- };
6094
5908
  var headers = function headers() {
6095
- return ['payroll.name', 'payroll.paymentPlan', 'payroll.paymentPoint', 'payroll.status', 'payroll.paymentMethod', 'payroll.bistp.progress', 'emptyLabel'];
5909
+ return ['payroll.name', 'payroll.paymentPlan', 'payroll.paymentPoint', 'payroll.status', 'payroll.paymentMethod', 'emptyLabel'];
6096
5910
  };
6097
5911
  var sorts = function sorts() {
6098
5912
  return [['name', true], ['paymentPlan', true], ['paymentPoint', true], ['status', true], ['paymentMethod', true]];
@@ -6130,8 +5944,6 @@ function PayrollSearcherPending(_ref) {
6130
5944
  return payroll.status ? "".concat(payroll.status) : '';
6131
5945
  }, function (payroll) {
6132
5946
  return payroll.paymentMethod ? "".concat(payroll.paymentMethod) : '';
6133
- }, function (payroll) {
6134
- return renderBistpProgress(payroll);
6135
5947
  }, function (payroll) {
6136
5948
  return /*#__PURE__*/React__default["default"].createElement(PayrollReconciliationFilesDialog, {
6137
5949
  classes: classes,
@@ -6219,7 +6031,7 @@ function PendingPayrollsPage() {
6219
6031
  return /*#__PURE__*/React__default["default"].createElement("div", {
6220
6032
  className: classes.page
6221
6033
  }, /*#__PURE__*/React__default["default"].createElement(feCore.Helmet, {
6222
- title: formatMessage('paymentPoint.page.title')
6034
+ title: formatMessage('payroll.page.title')
6223
6035
  }), rights.includes(RIGHT_PAYROLL_SEARCH) && /*#__PURE__*/React__default["default"].createElement(PayrollSearcherPending$1, {
6224
6036
  classes: classes
6225
6037
  }));