hotfix-payment-cycle

openimis · Mar 15, 2024 · f6a9b63 · f6a9b63
1 parent bf4413d
commit f6a9b63
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 15 deletions.
diff --git a/src/actions.js b/src/actions.js
@@ -46,7 +46,7 @@ const PAYROLL_BENEFIT_CONSUMPTION_PROJECTION = () => [
   '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 {runMonth, runYear}, paymentMethod, benefitPlanNameCode}',
+  'payroll {id, name, status, paymentCycle {code, startDate, endDate}, paymentMethod, benefitPlanNameCode}',
 ];
 
 const BENEFIT_CONSUMPTION_SUMMARY_PROJECTION = () => [

diff --git a/src/components/payroll/BenefitConsumptionPayrollFilter.js b/src/components/payroll/BenefitConsumptionPayrollFilter.js
@@ -85,20 +85,20 @@ function BenefitConsumptionPayrollFilter({ filters, onChangeFilters }) {
       <Grid item xs={2} className={classes.item}>
         <NumberInput
           module="payroll"
-          label={formatMessage('benefitConsumption.payroll.runMonth')}
+          label={formatMessage('benefitConsumption.payroll.startDate')}
           min={0}
           max={12}
-          value={filterValue('payroll_PaymentCycle_RunMonth')}
-          onChange={onChangeFilter('payroll_PaymentCycle_RunMonth')}
+          value={filterValue('payroll_PaymentCycle_StartDate')}
+          onChange={onChangeFilter('payroll_PaymentCycle_StartDate')}
         />
       </Grid>
       <Grid item xs={2} className={classes.item}>
         <NumberInput
           module="payroll"
-          label={formatMessage('benefitConsumption.payroll.runYear')}
+          label={formatMessage('benefitConsumption.payroll.endDate')}
           min={0}
-          value={filterValue('payroll_PaymentCycle_RunYear')}
-          onChange={onChangeFilter('payroll_PaymentCycle_RunYear')}
+          value={filterValue('payroll_PaymentCycle_EndDate')}
+          onChange={onChangeFilter('payroll_PaymentCycle_EndDate')}
         />
       </Grid>
       <Grid item xs={2} className={classes.item}>

diff --git a/src/components/payroll/BenefitConsumptionPayrollSearcher.js b/src/components/payroll/BenefitConsumptionPayrollSearcher.js
@@ -36,8 +36,8 @@ function BenefitConsumptionPayrollSearcher({
   const headers = () => [
     'benefitConsumption.payroll.name',
     'benefitConsumption.payroll.benefitPlan',
-    'benefitConsumption.payroll.runMonth',
-    'benefitConsumption.payroll.runYear',
+    'benefitConsumption.payroll.startDate',
+    'benefitConsumption.payroll.endDate',
     'benefitConsumption.status',
     'benefitConsumption.code',
     'benefitConsumption.receipt',
@@ -64,8 +64,8 @@ function BenefitConsumptionPayrollSearcher({
     (payrollBenefitConsumption) => payrollBenefitConsumption?.payroll?.name,
     (payrollBenefitConsumption) => payrollBenefitConsumption?.payroll?.benefitPlanNameCode,
     // eslint-disable-next-line max-len
-    (payrollBenefitConsumption) => payrollBenefitConsumption?.payroll?.paymentCycle?.runMonth,
-    (payrollBenefitConsumption) => payrollBenefitConsumption?.payroll?.paymentCycle?.runYear,
+    (payrollBenefitConsumption) => payrollBenefitConsumption?.payroll?.paymentCycle?.startDate,
+    (payrollBenefitConsumption) => payrollBenefitConsumption?.payroll?.paymentCycle?.startDate,
     (payrollBenefitConsumption) => payrollBenefitConsumption?.benefit?.status,
     (payrollBenefitConsumption) => payrollBenefitConsumption?.benefit?.code,
     (payrollBenefitConsumption) => payrollBenefitConsumption?.benefit?.receipt,
@@ -85,8 +85,8 @@ function BenefitConsumptionPayrollSearcher({
   const sorts = () => [
     ['payroll_Name', true],
     ['payroll_benefitPlanName', false],
-    ['payroll_PaymentCycle_RunMonth', true],
-    ['payroll_PaymentCycle_RunYear', true],
+    ['payroll_PaymentCycle_StartDate', true],
+    ['payroll_PaymentCycle_EndDate', true],
     ['benefit_Status', true],
     ['benefit_Code', true],
     ['benefit_Receipt', true],

diff --git a/src/translations/en.json b/src/translations/en.json
@@ -57,8 +57,8 @@
     "payroll.benefitConsumption.status.CANCELLED": "Cancelled",
     "payroll.benefitConsumption.status.DELETED": "Deleted",
     "payroll.benefitConsumption.status.SUSPENDED": "Suspended",
-    "payroll.benefitConsumption.payroll.runYear": "Accounting Year",
-    "payroll.benefitConsumption.payroll.runMonth": "Accounting Month",
+    "payroll.benefitConsumption.payroll.startDate": "Accounting Start Date",
+    "payroll.benefitConsumption.payroll.endDate": "Accounting End Date",
     "payroll.benefitConsumption.payroll.name": "Payroll Name",
     "payroll.benefitConsumption.payroll.benefitPlan": "Benefit Plan",
     "payroll.benefitConsumption.payroll.benefitPlanName": "Benefit Plan",