-
Notifications
You must be signed in to change notification settings - Fork 105
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
fix(cashboxes): display all cashboxes in selection
This commit allows a user to select any project's cashbox from the cashbox selection page. As designed, BHIMA assumes that users will have separate projects and use their own cashboxes, so those are cleanly separated from the remaining cashboxes. However, it does give the user the possibility of using any registered cashbox. Closes #1976.
- Loading branch information
Showing
6 changed files
with
207 additions
and
118 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,68 @@ | ||
| {"CASH":{"CAUTION":"Caution", | ||
| "CAUTION_COVER":"Invoice(s) covered by the caution", | ||
| "CAUTION_PAYMENT":"Caution Payment", | ||
| "CAUTION_REMAINING":"Remaining Caution", | ||
| "CONFIRM_PAYMENT_WHEN_CAUTION":"The debtor has a positive balance with the hospital. Accepting cash from the debtor will increase their credit with the hospital. Are you sure you want to accept payment?", | ||
| "CURRENT_CASHBOX":"Current Cashbox", | ||
| "DEBTOR_INVOICES":"Debtor Invoices", | ||
| "PAYMENT":"Payment", | ||
| "PAYMENT_DESCRIPTION":"Cash payment by {{patientName}} ({{patientReference}}) against invoice(s) {{invoiceReferences}}.", | ||
| "PREPAYMENT_DESCRIPTION":"Prepayment by {{patientName}} ({{patientReference}}).", | ||
| "REGISTRY":{"INCLUDE_ONLY_REVERSED_RECORDS":"Include only reversed cash payments", | ||
| "EXCLUDE_REVERSED_RECORDS":"Exclude all reversed cash payments", | ||
| "REVERSED_RECORDS":"Reversed Records"}, | ||
| "SELECTION":{"GO_TO_CASHBOX_PAGE":"Go to Cashbox Page", | ||
| "MISSING_CASH":"Missing Cash", | ||
| "TITLE":"Select a Cashbox"}, | ||
| "TITLE":"Cash Window", | ||
| "RECEIPT":{"TITLE":"Cash Receipt", | ||
| "SUCCESS":"Successfully created a Cash Payment"}, | ||
| "TRANSFER":{"TITLE":"New Cash Transfer", | ||
| "ACTION":"You are transferring funds out of the cashbox.", | ||
| "REMINDER":"Please perform a cash count and indicate both the currency and amount to be transferred in the form below.", | ||
| "SUCCESS":"Successfully transferred money out of the cash window.", | ||
| "DESCRIPTION":"Cash transfer of {{ amount }} from {{ fromLabel }} to {{ toLabel }} by {{ userName }}."}, | ||
| "VOUCHER":{"CASHBOXES":{"AVAILABLE":"Available Cashboxes", | ||
| "CHANGE_CASHBOX":"Change Cashbox", | ||
| "CURRENT_CASHBOX":"Current Cashbox", | ||
| "LINK":"Click here to add it.", | ||
| "MISSING":"Don't see your cashbox?", | ||
| "TRANSFER":"Transfer Funds", | ||
| "NO_INVOICES_ASSIGNED":"You have not assigned any invoices. Please assign at least one invoice to the payment.", | ||
| "NO_CASHBOX_SELECTED":"You have no selected a cashbox. Please select a cashbox to continue.", | ||
| "SELECTED":"Selected cash"}, | ||
| "BARCODE":{"SCAN":"Scan the barcode", | ||
| "AWAITING_INPUT":"Waiting input", | ||
| "AWAITING_HTTP":"Barcode done! search invoice...", | ||
| "READ_SUCCESS":"Invoice found", | ||
| "READ_ERROR":"Can't read barcode! Please enter code manually"}, | ||
| "OPEN_BARCODE_MODAL":"Scan another barcode on successful payment.", | ||
| "DEBTOR_INVOICES":"Debtor Invoices", | ||
| "RECEIPTS_TITLE":"Cash Payment Receipt", | ||
| "REPORT":"Report", | ||
| "SLIP":"Cash Voucher", | ||
| "TITLE":"Cash Window", | ||
| "SELECTED":"Selected Invoices"}, | ||
| "MOTIVE":"Notes"}} | ||
| { | ||
| "CASH":{ | ||
| "CAUTION":"Caution", | ||
| "CAUTION_COVER":"Invoice(s) covered by the caution", | ||
| "CAUTION_PAYMENT":"Caution Payment", | ||
| "CAUTION_REMAINING":"Remaining Caution", | ||
| "CONFIRM_PAYMENT_WHEN_CAUTION":"The debtor has a positive balance with the hospital. Accepting cash from the debtor will increase their credit with the hospital. Are you sure you want to accept payment?", | ||
| "CURRENT_CASHBOX":"Current Cashbox", | ||
| "DEBTOR_INVOICES":"Debtor Invoices", | ||
| "PAYMENT":"Payment", | ||
| "PAYMENT_DESCRIPTION":"Cash payment by {{patientName}} ({{patientReference}}) against invoice(s) {{invoiceReferences}}.", | ||
| "PREPAYMENT_DESCRIPTION":"Prepayment by {{patientName}} ({{patientReference}}).", | ||
| "REGISTRY":{ | ||
| "INCLUDE_ONLY_REVERSED_RECORDS":"Include only reversed cash payments", | ||
| "EXCLUDE_REVERSED_RECORDS":"Exclude all reversed cash payments", | ||
| "REVERSED_RECORDS":"Reversed Records" | ||
| }, | ||
| "SELECTION":{ | ||
| "GO_TO_CASHBOX_PAGE":"Go to Cashbox Page", | ||
| "MISSING_CASH":"Missing Cash", | ||
| "TITLE":"Select a Cashbox", | ||
| "CURRENT_PROJECT_CASHBOXES" : "Current Project Cashboxes", | ||
| "OTHER_PROJECT_CASHBOXES" : "Other Project Cashboxes", | ||
| "NO_OTHER_PROJECT_CASHBOXES" : "No cashboxes found registered to other projects.", | ||
| "NO_CURRENT_PROJECT_CASHBOXES" : "No cashboxes found registered to the current project." | ||
| }, | ||
| "TITLE":"Cash Window", | ||
| "RECEIPT":{ | ||
| "TITLE":"Cash Receipt", | ||
| "SUCCESS":"Successfully created a Cash Payment" | ||
| }, | ||
| "TRANSFER":{ | ||
| "TITLE":"New Cash Transfer", | ||
| "ACTION":"You are transferring funds out of the cashbox.", | ||
| "REMINDER":"Please perform a cash count and indicate both the currency and amount to be transferred in the form below.", | ||
| "SUCCESS":"Successfully transferred money out of the cash window.", | ||
| "DESCRIPTION":"Cash transfer of {{ amount }} from {{ fromLabel }} to {{ toLabel }} by {{ userName }}." | ||
| }, | ||
| "VOUCHER":{ | ||
| "CASHBOXES":{ | ||
| "AVAILABLE":"Available Cashboxes", | ||
| "CHANGE_CASHBOX":"Change Cashbox", | ||
| "CURRENT_CASHBOX":"Current Cashbox", | ||
| "LINK":"Click here to add it.", | ||
| "MISSING":"Don't see your cashbox?", | ||
| "TRANSFER":"Transfer Funds", | ||
| "NO_INVOICES_ASSIGNED":"You have not assigned any invoices. Please assign at least one invoice to the payment.", | ||
| "NO_CASHBOX_SELECTED":"You have no selected a cashbox. Please select a cashbox to continue.", | ||
| "SELECTED":"Selected cash" | ||
| }, | ||
| "BARCODE":{ | ||
| "SCAN":"Scan the barcode", | ||
| "AWAITING_INPUT":"Waiting input", | ||
| "AWAITING_HTTP":"Barcode done! search invoice...", | ||
| "READ_SUCCESS":"Invoice found", | ||
| "READ_ERROR":"Can't read barcode! Please enter code manually" | ||
| }, | ||
| "OPEN_BARCODE_MODAL":"Scan another barcode on successful payment.", | ||
| "DEBTOR_INVOICES":"Debtor Invoices", | ||
| "RECEIPTS_TITLE":"Cash Payment Receipt", | ||
| "REPORT":"Report", | ||
| "SLIP":"Cash Voucher", | ||
| "TITLE":"Cash Window", | ||
| "SELECTED":"Selected Invoices" | ||
| }, | ||
| "MOTIVE":"Notes" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,46 +1,64 @@ | ||
| {"CASH":{"CAUTION":"Caution", | ||
| "CAUTION_COVER":"Facture(s) couvert par la caution", | ||
| "CAUTION_PAYMENT":"Paiement Caution", | ||
| "CAUTION_REMAINING":"Caution Restante", | ||
| "CONFIRM_PAYMENT_WHEN_CAUTION":"Procéder au paiement alors que le patient dispose d'une caution ?", | ||
| "CURRENT_CASHBOX":"Caisse courante", | ||
| "PAYMENT_DESCRIPTION":"Paiement par {{patientName}} ({{patientReference}}) contre les facture(s) {{invoiceReferences}}.", | ||
| "PREPAYMENT_DESCRIPTION":"Paiement caution par {{patientName}} ({{patientReference}}).", | ||
| "DEBTOR_INVOICES":{"TITLE":"Facture(s) debiteur"}, | ||
| "REGISTRY":{"INCLUDE_ONLY_REVERSED_RECORDS":"Inclure uniquement les paiements inversees", | ||
| "EXCLUDE_REVERSED_RECORDS":"Exclure toutes les paiements inversees", | ||
| "REVERSED_RECORDS":"Paiements Inversees"}, | ||
| "PAYMENT":"Paiement", | ||
| "RECEIPT":{"TITLE":"Recu", | ||
| "SUCCESS":"Créé avec succès un paiement en espèces"}, | ||
| "SELECTION":{"GO_TO_CASHBOX_PAGE":"Allez a la page de gestion de caisse", | ||
| "MISSING_CASH":"Caisse manquante", | ||
| "TITLE":"Selection caisse"}, | ||
| "TITLE":"Caisse Auxilliaire", | ||
| "TRANSFER":{"ACTION":"Vous avez transféré des fonds de la caisse.", | ||
| "TITLE":"Transfert", | ||
| "REMINDER":"S'il vous plaît effectuer un comptage de caisse et indiquent à la fois la devise et le montant à transférer dans le formulaire ci-dessous.", | ||
| "SUCCESS":"Transfer effectué vers le compte de transfer.", | ||
| "DESCRIPTION":"Transfer de {{ amount }} viens de {{ fromLabel }} à {{ toLabel }} par {{ userName }}."}, | ||
| "VOUCHER":{"CASHBOXES":{"AVAILABLE":"Caisse disponibles", | ||
| "CHANGE_CASHBOX":"Changer de caisse", | ||
| "CURRENT_CASHBOX":"Caisse auxilliare courant", | ||
| "LINK":"Cliquez ici pour l'ajouter.", | ||
| "MISSING":"Vous ne trouvez pas votre caisse?", | ||
| "NO_INVOICES_ASSIGNED":"Vous n'avez pas sélectionné des factures! S'il vous plaît choisir des factures pour continuer.", | ||
| "NO_CASHBOX_SELECTED":"Vous n'avez pas sélectionné une caisse. S'il vous plaît choisir une caisse pour continuer.", | ||
| "SELECTED":"Selectionnée", | ||
| "TRANSFER":"Transférer Fonds"}, | ||
| "BARCODE":{"SCAN":"Scanner le Code à Barres", | ||
| "AWAITING_INPUT":"En Attente d'Entrée", | ||
| "AWAITING_HTTP":"Code à barres lu! Recherche de factures ....", | ||
| "READ_SUCCESS":"Facture Trouvée", | ||
| "READ_ERROR":"Code à barres illisible! Entrez le code à barres manuellement."}, | ||
| "OPEN_BARCODE_MODAL":"Numériser un autre code à barres lors d'un paiement réussi.", | ||
| "DEBTOR_INVOICES":"Factures des débiteurs", | ||
| "REPORT":"Rapport", | ||
| "RECEIPTS_TITLE":"Reçu de paiement des factures", | ||
| "SLIP":"Caisse en espèces", | ||
| "TITLE":"Recu de caisse", | ||
| "SELECTED":"Facture selectionnée"}, | ||
| "MOTIVE":"Motif"}} | ||
| { | ||
| "CASH":{ | ||
| "CAUTION":"Caution", | ||
| "CAUTION_COVER":"Facture(s) couvert par la caution", | ||
| "CAUTION_PAYMENT":"Paiement Caution", | ||
| "CAUTION_REMAINING":"Caution Restante", | ||
| "CONFIRM_PAYMENT_WHEN_CAUTION":"Procéder au paiement alors que le patient dispose d'une caution ?", | ||
| "CURRENT_CASHBOX":"Caisse courante", | ||
| "PAYMENT_DESCRIPTION":"Paiement par {{patientName}} ({{patientReference}}) contre les facture(s) {{invoiceReferences}}.", | ||
| "PREPAYMENT_DESCRIPTION":"Paiement caution par {{patientName}} ({{patientReference}}).", | ||
| "DEBTOR_INVOICES":{ | ||
| "TITLE":"Facture(s) debiteur" | ||
| }, | ||
| "REGISTRY":{"INCLUDE_ONLY_REVERSED_RECORDS":"Inclure uniquement les paiements inversees", | ||
| "EXCLUDE_REVERSED_RECORDS":"Exclure toutes les paiements inversees", | ||
| "REVERSED_RECORDS":"Paiements Inversees"}, | ||
| "PAYMENT":"Paiement", | ||
| "RECEIPT":{ | ||
| "TITLE":"Recu", | ||
| "SUCCESS":"Créé avec succès un paiement en espèces" | ||
| }, | ||
| "SELECTION":{ | ||
| "GO_TO_CASHBOX_PAGE":"Allez a la page de gestion de caisse", | ||
| "MISSING_CASH":"Caisse manquante", | ||
| "TITLE":"Selection Caisse", | ||
| "CURRENT_PROJECT_CASHBOXES" : "Caisses pour ce Projet", | ||
| "OTHER_PROJECT_CASHBOXES" : "Caisses pour tous Projets", | ||
| "NO_OTHER_PROJECT_CASHBOXES" : "Il n'y a aucune caisses enregistrer pour les autres projets.", | ||
| "NO_CURRENT_PROJECT_CASHBOXES" : "Il n'y a aucune caisses enregistrer pour votre projet." | ||
| }, | ||
| "TITLE":"Caisse Auxilliaire", | ||
| "TRANSFER":{ | ||
| "ACTION":"Vous avez transféré des fonds de la caisse.", | ||
| "TITLE":"Transfert", | ||
| "REMINDER":"S'il vous plaît effectuer un comptage de caisse et indiquent à la fois la devise et le montant à transférer dans le formulaire ci-dessous.", | ||
| "SUCCESS":"Transfer effectué vers le compte de transfer.", | ||
| "DESCRIPTION":"Transfer de {{ amount }} viens de {{ fromLabel }} à {{ toLabel }} par {{ userName }}."}, | ||
| "VOUCHER":{"CASHBOXES":{"AVAILABLE":"Caisse disponibles", | ||
| "CHANGE_CASHBOX":"Changer de caisse", | ||
| "CURRENT_CASHBOX":"Caisse auxilliare courant", | ||
| "LINK":"Cliquez ici pour l'ajouter.", | ||
| "MISSING":"Vous ne trouvez pas votre caisse?", | ||
| "NO_INVOICES_ASSIGNED":"Vous n'avez pas sélectionné des factures! S'il vous plaît choisir des factures pour continuer.", | ||
| "NO_CASHBOX_SELECTED":"Vous n'avez pas sélectionné une caisse. S'il vous plaît choisir une caisse pour continuer.", | ||
| "SELECTED":"Selectionnée", | ||
| "TRANSFER":"Transférer Fonds" | ||
| }, | ||
| "BARCODE":{ | ||
| "SCAN":"Scanner le Code à Barres", | ||
| "AWAITING_INPUT":"En Attente d'Entrée", | ||
| "AWAITING_HTTP":"Code à barres lu! Recherche de factures ....", | ||
| "READ_SUCCESS":"Facture Trouvée", | ||
| "READ_ERROR":"Code à barres illisible! Entrez le code à barres manuellement."}, | ||
| "OPEN_BARCODE_MODAL":"Numériser un autre code à barres lors d'un paiement réussi.", | ||
| "DEBTOR_INVOICES":"Factures des débiteurs", | ||
| "REPORT":"Rapport", | ||
| "RECEIPTS_TITLE":"Reçu de paiement des factures", | ||
| "SLIP":"Caisse en espèces", | ||
| "TITLE":"Recu de caisse", | ||
| "SELECTED":"Facture selectionnée" | ||
| }, | ||
| "MOTIVE":"Motif" | ||
| } | ||
| } |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Oops, something went wrong.