Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Fixed: added optional check for the reject entire order reason (#813) #854

Merged
merged 1 commit into from
Nov 13, 2024
Merged

Fixed: added optional check for the reject entire order reason (#813) #854

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
2 changes: 1 addition & 1 deletion src/views/InProgress.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -390,7 +390,7 @@ export default defineComponent({
methods: {
getRejectionReasonDescription (rejectionReasonId: string) {
const reason = this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId)
return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason.enumId;
return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason?.enumId;
},
async openRejectReasonPopover(ev: Event, item: any, order: any) {
const reportIssuePopover = await popoverController.create({
Expand Down
2 changes: 1 addition & 1 deletion src/views/OrderDetail.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -684,7 +684,7 @@ export default defineComponent({
},
getRejectionReasonDescription (rejectionReasonId: string) {
const reason = this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId)
return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason.enumId;
return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason?.enumId;
},
isEntierOrderRejectionEnabled(order: any) {
return (!this.partialOrderRejectionConfig || !this.partialOrderRejectionConfig.settingValue || !JSON.parse(this.partialOrderRejectionConfig.settingValue)) && order.hasRejectedItem
Expand Down
Loading