OP-1473: Payment status lists multiple rejected options (#18)

* Payment status bug fixed * Corrected a typo
openimis · Jul 12, 2023 · 8c103f7 · 8c103f7
1 parent 40d6a3e
commit 8c103f7
Show file tree

Hide file tree

Showing 3 changed files with 75 additions and 71 deletions.
diff --git a/src/constants.js b/src/constants.js
@@ -1,10 +1,10 @@
-export const RIGHT_PAYMENT = 101401
-export const RIGHT_PAYMENT_SEARCH = 101401
-export const RIGHT_PAYMENT_ADD = 101402
-export const RIGHT_PAYMENT_EDIT = 101403
-export const RIGHT_PAYMENT_DELETE = 101404
+export const RIGHT_PAYMENT = 101401;
+export const RIGHT_PAYMENT_SEARCH = 101401;
+export const RIGHT_PAYMENT_ADD = 101402;
+export const RIGHT_PAYMENT_EDIT = 101403;
+export const RIGHT_PAYMENT_DELETE = 101404;
 
 export const MODULE_NAME = "payment";
 
-export const PAYMENT_STATUS = [-3, -2, -1, 1, 2, 3, 4, 5];
-export const PAYMENTS_TAB_VALUE = "paymentsTab"
+export const PAYMENT_STATUS = [-5, -4, -3, -2, -1, 0, 1, 2, 3, 4, 5];
+export const PAYMENTS_TAB_VALUE = "paymentsTab";
diff --git a/src/pickers/PaymentStatusPicker.js b/src/pickers/PaymentStatusPicker.js
@@ -4,15 +4,16 @@ import { ConstantBasedPicker } from "@openimis/fe-core";
 import { PAYMENT_STATUS } from "../constants";
 
 class PaymentStatusPicker extends Component {
-
-    render() {
-        return <ConstantBasedPicker
-            module="payment"
-            label="payment.status"
-            constants={PAYMENT_STATUS}
-            {...this.props}
-        />
-    }
+  render() {
+    return (
+      <ConstantBasedPicker
+        module="payment"
+        label="payment.status"
+        constants={PAYMENT_STATUS}
+        {...this.props}
+      />
+    );
+  }
 }
 
-export default PaymentStatusPicker;
+export default PaymentStatusPicker;
diff --git a/src/translations/en.json b/src/translations/en.json
@@ -1,55 +1,58 @@
 {
-    "payment.addNewPayment.tooltip": "Add new payment",
-    "payment.addNewPaymentTooltip": "Add new payment",
-    "payment.CreatePayment.mutationLabel": "Create payment",
-    "payment.deletePayment.tooltip": "Delete payment",
-    "payment.addNewPayment.tooltip.selectPremium": "Please select a contribution to add a payment",
-    "payment.deletePaymentDialog.message": "Are you sure you want to delete this payment?",
-    "payment.deletePaymentDialog.title": "Delete payment",
-    "payment.deletePaymentDialog.yes.button": "Yes",
-    "payment.expectedAmount_Gte": "Expected amount above",
-    "payment.expectedAmount_Lte": "Expected amount under",
-    "payment.menu.payments": "Payments",
-    "payment.openNewTab": "Open in new tab",
-    "payment.openNewTabHead": " ",
-    "payment.payment.dateLastSms": "Date last SMS",
-    "payment.payment.expectedAmount": "Expected Amount",
-    "payment.payment.matchedDate": "Matched date",
-    "payment.payment.officer": "Officer",
-    "payment.payment.officerCode": "Officer code",
-    "payment.payment.origin": "Origin",
-    "payment.payment.receiptNo": "Receipt No",
-    "payment.payment.receivedAmount": "Received Amount",
-    "payment.payment.receivedDate": "Received Date",
-    "payment.payment.receivedDateFrom": "Received date from",
-    "payment.payment.receivedDateTo": "Received date to",
-    "payment.payment.rejectedReason": "Rejected reason",
-    "payment.payment.requestDate": "Request Date",
-    "payment.payment.requestDateFrom": "Request date from",
-    "payment.payment.requestDateTo": "Request date to",
-    "payment.payment.status": "Status",
-    "payment.payment.status.-1": "Rejected",
-    "payment.payment.status.-2": "Rejected",
-    "payment.payment.status.-3": "Rejected",
-    "payment.payment.status.1": "Not Yet Confirmed",
-    "payment.payment.status.2": "Posted",
-    "payment.payment.status.3": "Assigned",
-    "payment.payment.status.4": "Unmatched",
-    "payment.payment.status.5": "Matched",
-    "payment.payment.status.none": " ",
-    "payment.payment.status.null": "Any",
-    "payment.payment.transferFee": "Transfer fee",
-    "payment.payment.typeOfPayment": "Type Of Payment",
-    "payment.PaymentFilter.status": "Status",
-    "payment.PaymentFilter.typeOfPayment": "Payment Type",
-    "payment.PaymentOverview.newTitle": "New payment",
-    "payment.PaymentOverview.title": "Payment Details",
-    "payment.paymentSummaries": "{count} payment(s) found",
-    "payment.PremiumsPayments": "{count} Matched Payments",
-    "payment.PremiumsPaymentsOfPremium": "{count} Matched Payments of Premium {premium}",
-    "payment.receivedAmount_Gte": "Received amount above",
-    "payment.receivedAmount_Lte": "Received amount under",
-    "payment.showHistory": "Show historical values",
-    "payment.UpdatePayment.mutationLabel": "Update payment",
-    "payment.showReconciledOnly" : "Show reconciled only"
-}
+  "payment.addNewPayment.tooltip": "Add new payment",
+  "payment.addNewPaymentTooltip": "Add new payment",
+  "payment.CreatePayment.mutationLabel": "Create payment",
+  "payment.deletePayment.tooltip": "Delete payment",
+  "payment.addNewPayment.tooltip.selectPremium": "Please select a contribution to add a payment",
+  "payment.deletePaymentDialog.message": "Are you sure you want to delete this payment?",
+  "payment.deletePaymentDialog.title": "Delete payment",
+  "payment.deletePaymentDialog.yes.button": "Yes",
+  "payment.expectedAmount_Gte": "Expected amount above",
+  "payment.expectedAmount_Lte": "Expected amount under",
+  "payment.menu.payments": "Payments",
+  "payment.openNewTab": "Open in new tab",
+  "payment.openNewTabHead": " ",
+  "payment.payment.dateLastSms": "Date last SMS",
+  "payment.payment.expectedAmount": "Expected Amount",
+  "payment.payment.matchedDate": "Matched date",
+  "payment.payment.officer": "Officer",
+  "payment.payment.officerCode": "Officer code",
+  "payment.payment.origin": "Origin",
+  "payment.payment.receiptNo": "Receipt No",
+  "payment.payment.receivedAmount": "Received Amount",
+  "payment.payment.receivedDate": "Received Date",
+  "payment.payment.receivedDateFrom": "Received date from",
+  "payment.payment.receivedDateTo": "Received date to",
+  "payment.payment.rejectedReason": "Rejected reason",
+  "payment.payment.requestDate": "Request Date",
+  "payment.payment.requestDateFrom": "Request date from",
+  "payment.payment.requestDateTo": "Request date to",
+  "payment.payment.status": "Status",
+  "payment.payment.status.-5": "Failed to Match",
+  "payment.payment.status.-4": "Failed to Receive Payment",
+  "payment.payment.status.-3": "Failed to Receive Control Number",
+  "payment.payment.status.-2": "Failed to Request Control Number",
+  "payment.payment.status.-1": "Failed to Create Payment",
+  "payment.payment.status.0": "Cancelled",
+  "payment.payment.status.1": "Payment Created",
+  "payment.payment.status.2": "Control Number Requested",
+  "payment.payment.status.3": "Control Number Received",
+  "payment.payment.status.4": "Payment Received",
+  "payment.payment.status.5": "Matched",
+  "payment.payment.status.none": " ",
+  "payment.payment.status.null": "Any",
+  "payment.payment.transferFee": "Transfer fee",
+  "payment.payment.typeOfPayment": "Type Of Payment",
+  "payment.PaymentFilter.status": "Status",
+  "payment.PaymentFilter.typeOfPayment": "Payment Type",
+  "payment.PaymentOverview.newTitle": "New payment",
+  "payment.PaymentOverview.title": "Payment Details",
+  "payment.paymentSummaries": "{count} payment(s) found",
+  "payment.PremiumsPayments": "{count} Matched Payments",
+  "payment.PremiumsPaymentsOfPremium": "{count} Matched Payments of Premium {premium}",
+  "payment.receivedAmount_Gte": "Received amount above",
+  "payment.receivedAmount_Lte": "Received amount under",
+  "payment.showHistory": "Show historical values",
+  "payment.UpdatePayment.mutationLabel": "Update payment",
+  "payment.showReconciledOnly": "Show reconciled only"
+}