Skip to content

Commit 494b686

Browse files
authored
Merge pull request #854 from amansinghbais/#813
Fixed: added optional check for the reject entire order reason (#813)
2 parents 56a93ba + 844cf4e commit 494b686

File tree

2 files changed

+2
-2
lines changed

2 files changed

+2
-2
lines changed

src/views/InProgress.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -390,7 +390,7 @@ export default defineComponent({
390390
methods: {
391391
getRejectionReasonDescription (rejectionReasonId: string) {
392392
const reason = this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId)
393-
return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason.enumId;
393+
return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason?.enumId;
394394
},
395395
async openRejectReasonPopover(ev: Event, item: any, order: any) {
396396
const reportIssuePopover = await popoverController.create({

src/views/OrderDetail.vue

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -684,7 +684,7 @@ export default defineComponent({
684684
},
685685
getRejectionReasonDescription (rejectionReasonId: string) {
686686
const reason = this.rejectReasonOptions?.find((reason: any) => reason.enumId === rejectionReasonId)
687-
return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason.enumId;
687+
return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason?.enumId;
688688
},
689689
isEntierOrderRejectionEnabled(order: any) {
690690
return (!this.partialOrderRejectionConfig || !this.partialOrderRejectionConfig.settingValue || !JSON.parse(this.partialOrderRejectionConfig.settingValue)) && order.hasRejectedItem

0 commit comments

Comments
 (0)