6455 cancelled prescription status #6509
Merged
Conversation
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
github-actions
bot
added
Team Piwakawaka
Bundle size differenceComparing this PR to
|
jmbrunskill
reviewed
Feb 13, 2025
| @@ -34,6 +34,7 @@ const createStatusLog = (invoice: PrescriptionRowFragment) => { | |||
| [InvoiceNodeStatus.Allocated]: null, | |||
| [InvoiceNodeStatus.Shipped]: null, | |||
| [InvoiceNodeStatus.Delivered]: null, | |||
| [InvoiceNodeStatus.Cancelled]: null, | |||
There was a problem hiding this comment.
if (statusIdx >= 3) {
statusLog[InvoiceNodeStatus.Cancelled] = invoice.cancelledDatetime;
}
We might want something like this added, I think that will require chaging the PrescriptionRowFragment as well though.
There was a problem hiding this comment.
Added an issue follow up on this...
| @@ -740,6 +740,7 @@ fn legacy_invoice_status(t: &InvoiceType, status: &InvoiceStatus) -> Option<Lega | |||
| InvoiceStatus::Shipped => LegacyTransactStatus::Fn, | |||
| InvoiceStatus::Delivered => LegacyTransactStatus::Fn, | |||
| InvoiceStatus::Verified => LegacyTransactStatus::Fn, | |||
| InvoiceStatus::Cancelled => LegacyTransactStatus::Fn, // TODO enable cancelled status to sync with mSupply https://github.com/msupply-foundation/open-msupply/issues/6495 | |||
There was a problem hiding this comment.
Thanks for these comments!
| @@ -213,6 +214,7 @@ impl ActivityLogNodeType { | |||
| from::DemographicIndicatorUpdated => to::DemographicIndicatorUpdated, | |||
| from::DemographicProjectionCreated => to::DemographicProjectionCreated, | |||
| from::DemographicProjectionUpdated => to::DemographicProjectionUpdated, | |||
| &repository::ActivityLogType::InvoiceStatusCancelled | &repository::ActivityLogType::PrescriptionStatusCancelled => todo!() | |||
There was a problem hiding this comment.
We don't really want to have todo! code in the develop branch, will push a fix for this, mapping to the right fields.
from::PrescriptionStatusCancelled => to::PrescriptionStatusCancelled,
from::InvoiceStatusCancelled => to::InvoiceStatusCancelled,
jmbrunskill
reviewed
Feb 13, 2025
| @@ -184,6 +186,7 @@ export const isInboundDisabled = (inbound: InboundRowFragment): boolean => { | |||
| case InvoiceNodeStatus.Allocated: | |||
| // Inbound shipments can be edited when having been delivered | |||
| case InvoiceNodeStatus.Delivered: | |||
| case InvoiceNodeStatus.Cancelled: | |||
There was a problem hiding this comment.
I think this needs to be in the disabled section, after Verified
jmbrunskill
approved these changes
Feb 13, 2025
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Fixes #6455
👩🏻💻 What does this PR do?
Adds the cancelled status for invoices.
This means prescriptions can now have a cancelled status.
💌 Any notes for the reviewer?
🧪 Testing
📃 Documentation