Implemented: common admin permission on ship now button if any shipment package require tracking (#281) #289
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
…nt package require tracking (hotwax#281)
dt2patel
requested changes
Oct 12, 2023
src/views/Completed.vue
Outdated
| // if there are orders with tracking required and label image present | ||
| const trackingRequiredOrders = orderList.filter((order: any) => this.isTrackingRequiredForAnyShipmentPackage(order)) | ||
| if (trackingRequiredOrders.length) { | ||
| const orderHasMissingLabelImage = orderList.some((order: any) => order.missingLabelImage) |
There was a problem hiding this comment.
I think the terminology here should be around "trackingCode" so that even if label image is missing but user puts tracking code on shipment the variable still makes semantic sense.
src/authorization/Rules.ts
Outdated
| @@ -10,4 +10,5 @@ export default { | |||
| "APP_UNPACK_ORDER": "COMMON_ADMIN", | |||
| "APP_RECYCLE_ORDER": "COMMON_ADMIN", | |||
| "APP_STOREFULFILLMENT_ADMIN": "STOREFULFILLMENT_ADMIN", | |||
| "APP_SHIP_ORDER": "COMMON_ADMIN" | |||
There was a problem hiding this comment.
permission name should also include that this is "forceful" like "APP_FORCE_SHIP_ORDER" because for normal orders anyone is allowed to ship them
ravilodhi
reviewed
Oct 17, 2023
src/views/Completed.vue
Outdated
| @@ -332,6 +331,15 @@ export default defineComponent({ | |||
| handler: async () => { | |||
| let orderList = JSON.parse(JSON.stringify(this.completedOrders.list)) | |||
|
|
|||
| // if there are orders with tracking required and label image present | |||
There was a problem hiding this comment.
Here we only need to exclude those orders for which tracking is required but the shipping label is missing. Please correct the logic.
ymaheshwari1
requested changes
Oct 25, 2023
| if (resp.status == 200 && !hasError(resp)) { | ||
| !trackingRequiredAndMissingLabelOrders.length | ||
| ? showToast(translate('Orders shipped successfully')) | ||
| : showToast(translate('out of cannot be shipped due to missing tracking codes.', { remainingOrders: trackingRequiredAndMissingLabelOrders.length, totalOrders: packedOrdersCount })) |
There was a problem hiding this comment.
Suggested change
| : showToast(translate('out of cannot be shipped due to missing tracking codes.', { remainingOrders: trackingRequiredAndMissingLabelOrders.length, totalOrders: packedOrdersCount })) | |
| : showToast(translate('out of orders cannot be shipped due to missing tracking codes.', { remainingOrders: trackingRequiredAndMissingLabelOrders.length, totalOrders: packedOrdersCount })) |
| @@ -609,6 +624,13 @@ export default defineComponent({ | |||
| }, | |||
| fetchProductStock(productId: string) { | |||
| this.store.dispatch('stock/fetchStock', { productId }) | |||
| }, | |||
| isTrackingRequiredForAnyShipmentPackage(order: any) { | |||
| if (!order.shipmentPackages) { | |||
There was a problem hiding this comment.
Check the length of shipment packages.
R-Sourabh
added a commit
to R-Sourabh/fulfillment-pwa
that referenced
this pull request
Apr 16, 2024
R-Sourabh
added a commit
to R-Sourabh/fulfillment-pwa
that referenced
this pull request
Apr 16, 2024
R-Sourabh
added a commit
to R-Sourabh/fulfillment-pwa
that referenced
this pull request
Apr 18, 2024
R-Sourabh
added a commit
to R-Sourabh/fulfillment-pwa
that referenced
this pull request
Apr 22, 2024
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.
Related Issues
Closes #281
Short Description and Why It's Useful
Screenshots of Visual Changes before/after (If There Are Any)
IMPORTANT NOTICE - Remember to add changelog entry
Contribution and Currently Important Rules Acceptance