CM-731: create payroll from unpaid invoices

openimis · Feb 19, 2024 · 88ab0e5 · 88ab0e5
1 parent 3cd1f08
commit 88ab0e5
Show file tree

Hide file tree

Showing 11 changed files with 127 additions and 62 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -83,19 +83,24 @@ const formatPayrollGQL = (payroll) => `
   ${payroll?.paymentMethod ? `paymentMethod: "${payroll.paymentMethod}"` : ''}
   ${`status: ${PAYROLL_STATUS.PENDING_APPROVAL}`}
   ${
-  payroll.jsonExt
+  payroll?.jsonExt
     ? `jsonExt: ${JSON.stringify(payroll.jsonExt)}`
     : ''
 }
   ${
-  payroll.dateValidFrom
+  payroll?.dateValidFrom
     ? `dateValidFrom: "${payroll.dateValidFrom}"`
     : ''
 }
   ${
-  payroll.dateValidTo
+  payroll?.dateValidTo
     ? `dateValidTo: "${payroll.dateValidTo}"`
     : ''
+}
+  ${
+  payroll?.fromFailedInvoicesPayrollId
+    ? `fromFailedInvoicesPayrollId: "${payroll.fromFailedInvoicesPayrollId}"`
+    : ''
 }
   `;
 

diff --git a/src/components/payroll/BenefitConsumptionSearcher.js b/src/components/payroll/BenefitConsumptionSearcher.js
@@ -8,7 +8,7 @@ import {
 } from '@openimis/fe-core';
 import PhotoCameraOutlinedIcon from '@material-ui/icons/PhotoCameraOutlined';
 import { fetchBenefitConsumptions } from '../../actions';
-import { DEFAULT_PAGE_SIZE, ROWS_PER_PAGE_OPTIONS } from '../../constants';
+import { BENEFIT_CONSUMPTION_STATUS, DEFAULT_PAGE_SIZE, ROWS_PER_PAGE_OPTIONS } from '../../constants';
 import BenefitConsumptionFilter from './BenefitConsumptionFilter';
 
 function BenefitConsumptionSearcher({
@@ -19,6 +19,7 @@ function BenefitConsumptionSearcher({
   benefitConsumptions,
   benefitConsumptionsPageInfo,
   benefitConsumptionsTotalCount,
+  isPayrollFromFailedInvoices,
   payrollUuid,
 }) {
   const modulesManager = useModulesManager();
@@ -51,7 +52,8 @@ function BenefitConsumptionSearcher({
     (benefitConsumption) => benefitConsumption?.receipt,
     (benefitConsumption) => benefitConsumption?.amount,
     (benefitConsumption) => benefitConsumption?.type,
-    (benefitConsumption) => benefitConsumption?.status,
+    (benefitConsumption) => (isPayrollFromFailedInvoices
+      ? BENEFIT_CONSUMPTION_STATUS.APPROVE_FOR_PAYMENT : benefitConsumption?.status),
   ];
 
   const rowIdentifier = (benefitConsumption) => benefitConsumption.id;
@@ -68,16 +70,28 @@ function BenefitConsumptionSearcher({
     ['status', true],
   ];
 
-  const defaultFilters = () => ({
-    isDeleted: {
-      value: false,
-      filter: 'isDeleted: false',
-    },
-    payrollUuid: {
-      value: payrollUuid,
-      filter: `payrollUuid: "${payrollUuid}"`,
-    },
-  });
+  const defaultFilters = () => {
+    const filters = {
+      isDeleted: {
+        value: false,
+        filter:
+        'isDeleted: false',
+      },
+      payrollUuid: {
+        value: payrollUuid,
+        filter:
+        `payrollUuid: "${payrollUuid}"`,
+      },
+    };
+    if (isPayrollFromFailedInvoices) {
+      filters.status = {
+        value: BENEFIT_CONSUMPTION_STATUS.ACCEPTED,
+        filter:
+              `status: ${BENEFIT_CONSUMPTION_STATUS.ACCEPTED}`,
+      };
+    }
+    return filters;
+  };
 
   const benefitConsumptionFilter = ({ filters, onChangeFilters }) => (
     <BenefitConsumptionFilter filters={filters} onChangeFilters={onChangeFilters} />
@@ -87,7 +101,7 @@ function BenefitConsumptionSearcher({
     <div>
       <Searcher
         module="payroll"
-        FilterPane={benefitConsumptionFilter}
+        FilterPane={!isPayrollFromFailedInvoices && benefitConsumptionFilter}
         fetch={fetch}
         items={benefitConsumptions}
         itemsPageInfo={benefitConsumptionsPageInfo}

diff --git a/src/components/payroll/BenefitConsumptionTabPanel.js b/src/components/payroll/BenefitConsumptionTabPanel.js
@@ -23,7 +23,9 @@ function BenefitConsumptionsTabLabel({
   );
 }
 
-function BenefitConsumptionsTabPanel({ value, rights, payrollUuid }) {
+function BenefitConsumptionsTabPanel({
+  value, rights, payrollUuid, isPayrollFromFailedInvoices,
+}) {
   return (
     <PublishedComponent
       pubRef="policyHolder.TabPanel"
@@ -33,7 +35,11 @@ function BenefitConsumptionsTabPanel({ value, rights, payrollUuid }) {
     >
       {
         rights.includes(RIGHT_PAYROLL_SEARCH) && payrollUuid && (
-        <BenefitConsumptionSearcher rights={rights} payrollUuid={payrollUuid} />
+        <BenefitConsumptionSearcher
+          rights={rights}
+          payrollUuid={payrollUuid}
+          isPayrollFromFailedInvoices={isPayrollFromFailedInvoices}
+        />
         )
       }
     </PublishedComponent>

diff --git a/src/components/payroll/PayrollHeadPanel.js b/src/components/payroll/PayrollHeadPanel.js
@@ -11,7 +11,6 @@ import {
   PublishedComponent,
   TextInput,
   withModulesManager,
-  decodeId,
 } from '@openimis/fe-core';
 import AdvancedFiltersDialog from './AdvancedFiltersDialog';
 import { CLEARED_STATE_FILTER } from '../../constants';
@@ -71,27 +70,31 @@ class PayrollHeadPanel extends FormPanel {
   };
 
   render() {
-    const { edited, classes, intl } = this.props;
+    const {
+      edited, classes, intl, readOnly, isPayrollFromFailedInvoices,
+    } = this.props;
     const payroll = { ...edited };
     const { appliedCustomFilters, appliedFiltersRowStructure } = this.state;
-    const readOnly = Boolean(payroll?.id);
     return (
       <>
-        <AdvancedFiltersDialog
-          object={payroll?.paymentPlan?.benefitPlan
-            ? JSON.parse(JSON.parse(payroll.paymentPlan.benefitPlan))
-            : null}
-          objectToSave={payroll}
-          moduleName="social_protection"
-          objectType="BenefitPlan"
-          setAppliedCustomFilters={this.setAppliedCustomFilters}
-          appliedCustomFilters={appliedCustomFilters}
-          appliedFiltersRowStructure={appliedFiltersRowStructure}
-          setAppliedFiltersRowStructure={this.setAppliedFiltersRowStructure}
-          updateAttributes={this.updateJsonExt}
-          getDefaultAppliedCustomFilters={this.getDefaultAppliedCustomFilters}
-          readOnly={readOnly}
-        />
+        {!isPayrollFromFailedInvoices
+            && (
+            <AdvancedFiltersDialog
+              object={payroll?.paymentPlan?.benefitPlan
+                ? JSON.parse(JSON.parse(payroll.paymentPlan.benefitPlan))
+                : null}
+              objectToSave={payroll}
+              moduleName="social_protection"
+              objectType="BenefitPlan"
+              setAppliedCustomFilters={this.setAppliedCustomFilters}
+              appliedCustomFilters={appliedCustomFilters}
+              appliedFiltersRowStructure={appliedFiltersRowStructure}
+              setAppliedFiltersRowStructure={this.setAppliedFiltersRowStructure}
+              updateAttributes={this.updateJsonExt}
+              getDefaultAppliedCustomFilters={this.getDefaultAppliedCustomFilters}
+              readOnly={readOnly}
+            />
+            )}
         <Grid container className={classes.item}>
           <Grid item xs={3} className={classes.item}>
             <TextInput
@@ -100,7 +103,7 @@ class PayrollHeadPanel extends FormPanel {
               value={payroll?.name}
               required
               onChange={(name) => this.updateAttribute('name', name)}
-              readOnly={readOnly}
+              readOnly={isPayrollFromFailedInvoices ? !isPayrollFromFailedInvoices : readOnly}
             />
           </Grid>
           <Grid item xs={3} className={classes.item}>
@@ -133,18 +136,18 @@ class PayrollHeadPanel extends FormPanel {
               filterLabels={false}
               onChange={(paymentCycle) => this.updateAttribute('paymentCycle', paymentCycle)}
               value={payroll?.paymentCycle}
+              readOnly={isPayrollFromFailedInvoices ? !isPayrollFromFailedInvoices : readOnly}
+            />
+          </Grid>
+          {readOnly && !isPayrollFromFailedInvoices && (
+          <Grid item xs={3} className={classes.item}>
+            <PayrollStatusPicker
+              required
+              withNull={false}
               readOnly={readOnly}
+              value={!!payroll?.status && payroll.status}
             />
           </Grid>
-          {readOnly && (
-            <Grid item xs={3} className={classes.item}>
-              <PayrollStatusPicker
-                required
-                withNull={false}
-                readOnly={readOnly}
-                value={!!payroll?.status && payroll.status}
-              />
-            </Grid>
           )}
           <Grid item xs={3} className={classes.item}>
             <PaymentMethodPicker

diff --git a/src/components/payroll/PayrollTab.js b/src/components/payroll/PayrollTab.js
@@ -39,7 +39,7 @@ const useStyles = makeStyles((theme) => ({
 }));
 
 function PayrollTab({
-  rights, setConfirmedAction, payrollUuid, isInTask, payroll,
+  rights, setConfirmedAction, payrollUuid, isInTask, payroll, isPayrollFromFailedInvoices,
 }) {
   const classes = useStyles();
 
@@ -72,10 +72,11 @@ function PayrollTab({
               tabStyle={tabStyle}
               payrollUuid={payrollUuid}
               isInTask={isInTask}
+              isPayrollFromFailedInvoices={isPayrollFromFailedInvoices}
             />
           </div>
           <div style={{ float: 'right', paddingRight: '16px' }}>
-            {payrollUuid && (
+            {payrollUuid && !isPayrollFromFailedInvoices && (
             <Button
               onClick={() => downloadPayrollData(payrollUuid, payroll.name)}
               color="#DFEDEF"
@@ -105,6 +106,7 @@ function PayrollTab({
         setConfirmedAction={setConfirmedAction}
         payrollUuid={payrollUuid}
         isInTask={isInTask}
+        isPayrollFromFailedInvoices={isPayrollFromFailedInvoices}
       />
     </Paper>
   );

diff --git a/src/components/payroll/PayrollTaskTabPanel.js b/src/components/payroll/PayrollTaskTabPanel.js
@@ -7,10 +7,10 @@ import {
 } from '../../constants';
 
 function PayrollTaskTabLabel({
-  onChange, tabStyle, isSelected, modulesManager, payrollUuid, isInTask,
+  onChange, tabStyle, isSelected, modulesManager, payrollUuid, isInTask, isPayrollFromFailedInvoices,
 }) {
   const { formatMessage } = useTranslations(MODULE_NAME, modulesManager);
-  if (!payrollUuid || isInTask) {
+  if (!payrollUuid || isInTask || isPayrollFromFailedInvoices) {
     return null;
   }
   return (

diff --git a/src/components/payroll/dialogs/PaymentReconciliationSummaryDialog.js b/src/components/payroll/dialogs/PaymentReconciliationSummaryDialog.js
@@ -8,6 +8,7 @@ import DialogTitle from '@material-ui/core/DialogTitle';
 import {
   useModulesManager,
   useTranslations,
+  useHistory,
 } from '@openimis/fe-core';
 import {
   Paper,
@@ -16,7 +17,12 @@ import {
 import Typography from '@material-ui/core/Typography';
 import { connect } from 'react-redux';
 import { bindActionCreators } from 'redux';
-import { MODULE_NAME, BENEFIT_CONSUMPTION_STATUS } from '../../../constants';
+import {
+  MODULE_NAME,
+  BENEFIT_CONSUMPTION_STATUS,
+  PAYROLL_PAYROLL_ROUTE,
+  PAYROLL_FROM_FAILED_INVOICES_URL_PARAM,
+} from '../../../constants';
 import downloadPayroll from '../../../utils/export';
 
 import BenefitConsumptionSearcherModal from '../BenefitConsumptionSearcherModal';
@@ -25,6 +31,9 @@ function PaymentReconcilationSummarytDialog({
   classes,
   payroll,
 }) {
+  const history = useHistory();
+  const modulesManager = useModulesManager();
+  const { formatMessage, formatMessageWithValues } = useTranslations(MODULE_NAME, modulesManager);
   const [isOpen, setIsOpen] = useState(false);
   const [totalBeneficiaries, setTotalBeneficiaries] = useState(0);
   const [selectedBeneficiaries, setSelectedBeneficiaries] = useState(0);
@@ -39,8 +48,11 @@ function PaymentReconcilationSummarytDialog({
     setIsOpen(false);
   };
 
-  const modulesManager = useModulesManager();
-  const { formatMessage, formatMessageWithValues } = useTranslations(MODULE_NAME, modulesManager);
+  const handleCreatePaymentForFailedInvoice = () => {
+    history.push(
+      `/${modulesManager.getRef(PAYROLL_PAYROLL_ROUTE)}/${payroll?.id}/${PAYROLL_FROM_FAILED_INVOICES_URL_PARAM}`,
+    );
+  };
 
   useEffect(() => {
     if (isOpen) {
@@ -160,7 +172,7 @@ function PaymentReconcilationSummarytDialog({
           <div style={{ maxWidth: '3000px' }}>
             <div style={{ float: 'left' }}>
               <Button
-                onClick={() => {}}
+                onClick={handleCreatePaymentForFailedInvoice}
                 variant="contained"
                 color="primary"
                 disabled={totalBeneficiaries === selectedBeneficiaries}

diff --git a/src/constants.js b/src/constants.js
@@ -91,3 +91,5 @@ export const BENEFIT_CONSUMPTION_STATUS_LIST = [
 ];
 
 export const BENEFIT_PLAN_CONTENT_TYPE_ID = 175;
+
+export const PAYROLL_FROM_FAILED_INVOICES_URL_PARAM = 'createPayrollFromFailedInvoices=true';
diff --git a/src/index.js b/src/index.js
@@ -65,7 +65,7 @@ const DEFAULT_CONFIG = {
     { path: ROUTE_PAYROLLS, component: PayrollsPage },
     { path: ROUTE_PAYROLLS_APPROVED, component: ApprovedPayrollsPage },
     { path: ROUTE_PAYROLLS_RECONCILED, component: ReconciledPayrollsPage },
-    { path: `${ROUTE_PAYROLL}/:payroll_uuid?`, component: PayrollPage },
+    { path: `${ROUTE_PAYROLL}/:payroll_uuid?/:createPayrollFromFailedInvoices?`, component: PayrollPage },
   ],
   'invoice.MainMenu': [
     {
Original file line number	Diff line number	Diff line change
Expand Up		@@ -91,3 +91,5 @@ export const BENEFIT_CONSUMPTION_STATUS_LIST = [
		];

		export const BENEFIT_PLAN_CONTENT_TYPE_ID = 175;

		export const PAYROLL_FROM_FAILED_INVOICES_URL_PARAM = 'createPayrollFromFailedInvoices=true';