Implemented: support to reject transfer order items(#903)

src/components/ReportIssuePopover.vue

@@ -1,7 +1,8 @@
 <template>
   <ion-content>
     <ion-list>
-      <ion-item v-for="reason in rejectReasonOptions" :key="reason.enumId" @click="updateIssue(reason.enumId)" button>
+      <!-- If getting reject reasons in props, then use the same otherwise get the reasons from the util state -->
+      <ion-item v-for="reason in (rejectReasons?.length ? rejectReasons : rejectReasonOptions)" :key="reason.enumId" @click="updateIssue(reason.enumId)" button>
         {{ reason.description ? translate(reason.description) : reason.enumDescription ? translate(reason.enumDescription) : reason.enumId  }}
       </ion-item>
     </ion-list>
@@ -31,7 +32,7 @@ export default defineComponent({
       rejectReasonOptions: 'util/getRejectReasonOptions'
     })
   },
-  props: ["shipmentPackages"],
+  props: ["rejectReasons"],
   methods: {
     closePopover() {
       popoverController.dismiss();

src/components/TransferOrderItem.vue

@@ -34,7 +34,23 @@
         <ion-progress-bar :color="getProgressBarColor(item)" :value="getPickedToOrderedFraction(item)" />
       </div>
 
-      <div class="to-item-history">
+      <div class="to-item-history" v-if="isRejectionSupported && !isAnyItemShipped">
+        <ion-chip outline color="danger" v-if="item.rejectReasonId" @click="openRejectReasonPopover($event, item)">
+          <ion-icon :icon="closeCircleOutline" @click.stop="removeRejectionReason(item)"/>
+          <ion-label>{{ getRejectionReasonDescription(item.rejectReasonId) }}</ion-label>
+          <ion-icon :icon="caretDownOutline"/>
+        </ion-chip>
+        <ion-chip outline color="danger" v-else-if="isAnyItemSelectedForRejection" @click="openRejectReasonPopover($event, item)">
+          <ion-label>{{ getRejectionReasonDescription(defaultRejectReasonId) }}</ion-label>
+          <ion-icon :icon="caretDownOutline"/>
+        </ion-chip>
+        <ion-chip outline v-else @click="openRejectReasonPopover($event, item)">
+          <ion-label>{{ translate("Report an issue") }}</ion-label>
+          <ion-icon :icon="caretDownOutline"/>
+        </ion-chip>
+      </div>
+
+      <div class="to-item-history" v-else>
         <ion-chip outline @click="shippedHistory(item.productId)">
           <ion-icon :icon="checkmarkDone"/>
           <ion-label> {{ getShippedQuantity(item) }} {{ translate("shipped") }} </ion-label>
@@ -60,16 +76,18 @@ import {
   IonProgressBar,
   IonThumbnail,
   modalController,
+  popoverController,
 } from '@ionic/vue';
 import { computed, defineComponent } from 'vue';
-import { add, checkmarkDone, barcodeOutline } from 'ionicons/icons';
+import { add, caretDownOutline, checkmarkDone, closeCircleOutline, barcodeOutline } from 'ionicons/icons';
 import { mapGetters, useStore } from "vuex";
 import { getProductIdentificationValue, DxpShopifyImg, translate, useProductIdentificationStore } from '@hotwax/dxp-components';
 
 import { useRouter } from 'vue-router';
 import { Actions } from '@/authorization'
 import { getFeature } from '@/utils';
 import ShippedHistoryModal from '@/components/ShippedHistoryModal.vue'
+import ReportIssuePopover from './ReportIssuePopover.vue';
 
 
 export default defineComponent({
@@ -86,19 +104,29 @@ export default defineComponent({
     IonThumbnail,
     DxpShopifyImg,
   },
-  props: ["itemDetail"],
+  // As we are using the same component on detail and review page, thus defined prop isRejectionSupported
+  // for handing the case to enable rejection functionality
+  props: ["itemDetail", "isRejectionSupported"],
   data() {
     return {
       pickedQuantity: this.itemDetail.pickedQuantity,
-      item: this.itemDetail
+      item: this.itemDetail,
+      defaultRejectReasonId: "NO_VARIANCE_LOG"  // default variance reason, to be used when any other item is selected for rejection
     }
   },
   computed: {
     ...mapGetters({
       currentOrder: 'transferorder/getCurrent',
       getProduct: 'product/getProduct',
       isForceScanEnabled: 'util/isForceScanEnabled',
+      rejectReasons: "transferorder/getRejectReasons"
     }),
+    isAnyItemSelectedForRejection() {
+      return this.currentOrder.items.some((item: any) => item.rejectReasonId)
+    },
+    isAnyItemShipped() {
+      return !!Object.keys(this.currentOrder?.shippedQuantityInfo)?.length
+    }
   },
   methods: {
     getProgressBarColor(item: any) {
@@ -159,7 +187,33 @@ export default defineComponent({
     },
     getErrorText(item: any) {
       return translate('The picked quantity cannot exceed the ordered quantity.') + " " + (this.getShippedQuantity(item) > 0 ? translate("already shipped.", {shippedQuantity: this.getShippedQuantity(item)}): '')
-    }
+    },
+    async openRejectReasonPopover(ev: Event, item: any) {
+      const reportIssuePopover = await popoverController.create({
+        component: ReportIssuePopover,
+        componentProps: { rejectReasons: this.rejectReasons },
+        event: ev,
+        translucent: true,
+        showBackdrop: false,
+      });
+
+      reportIssuePopover.present();
+
+      const result = await reportIssuePopover.onDidDismiss();
+
+      if(result.data) {
+        item.rejectReasonId = result.data
+        await this.store.dispatch('transferorder/updateCurrentTransferOrder', this.currentOrder)
+      }
+    },
+    async removeRejectionReason(item: any) {
+      delete item["rejectReasonId"];
+      await this.store.dispatch('transferorder/updateCurrentTransferOrder', this.currentOrder)
+    },
+    getRejectionReasonDescription(rejectionReasonId: string) {
+      const reason = this.rejectReasons?.find((reason: any) => reason.enumId === rejectionReasonId)
+      return reason?.description ? reason.description : reason?.enumDescription ? reason.enumDescription : reason?.enumId;
+    },
   }, 
   setup() {
     const store = useStore(); 
@@ -172,7 +226,9 @@ export default defineComponent({
       Actions,
       add,
       barcodeOutline,
+      caretDownOutline,
       checkmarkDone,
+      closeCircleOutline,
       getFeature,
       getProductIdentificationValue,
       productIdentificationPref,

src/locales/en.json

@@ -22,6 +22,7 @@
   "Adding tracking code": "Adding tracking code",
   "Additional documents": "Additional documents",
   "Additional data": "Additional data",
+  "All order items are rejected": "All order items are rejected",
   "Allocation": "Allocation",
   "Allow collateral rejections": "Allow collateral rejections",
   "Allow partial rejections": "Allow partial rejections",
@@ -159,6 +160,7 @@
   "Failed to send to Retail Pro Server due to the following error, please contact support:.": "Failed to send to Retail Pro Server due to the following error, please contact support: {message}.",
   "Failed to ship order": "Failed to ship order",
   "Failed to reject in progress orders": "Failed to reject in progress orders",
+  "Failed to reject order": "Failed to reject order",
   "Failed to reject outstanding orders": "Failed to reject outstanding orders",
   "Failed to remove rejection reason.": "Failed to remove rejection reason.",
   "Failed to update carrier and shipment method association.": "Failed to update carrier and shipment method association.",
@@ -309,6 +311,7 @@
   "Order Identifications": "Order Identifications",
   "Order Invoicing Status": "Order Invoicing Status",
   "Order item sequence ID": "Order item sequence ID",
+  "Order items are rejected": "Order items are rejected",
   "Order Lookup": "Order Lookup",
   "Order level charges like shipping fees and taxes are being credited on this label becuase it is the first shipment of this order.": "Order level charges like shipping fees and taxes are being credited on this label becuase it is the first shipment of this order.",
   "Order level charges like shipping fees and taxes were already charged to the customer on the first label generated for this order.Label was generated by facility with tracking code": "Order level charges like shipping fees and taxes were already charged to the customer on the first label generated for this order.{space}Label was generated by facility {facilityName} with tracking code {trackingCode}",
@@ -379,14 +382,18 @@
   "Reject all": "Reject all",
   "Reject all in progress orders": "Reject all in progress orders",
   "Reject all open orders": "Reject all open orders",
+  "Reject transfer order": "Reject transfer order",
   "Reject to avoid order split (no variance)": "Reject to avoid order split (no variance)",
   "Reject in progress orders.": "Reject { ordersCount } in progress orders.",
+  "Reject Items": "Reject Items",
   "Reject open orders.": "Reject { ordersCount } open orders.",
   "Reject order": "Reject order",
+  "Rejected": "Rejected",
   "Rejected at": "Rejected at",
   "Rejected by": "Rejected by",
   "Rejected from": "Rejected from",
   "Rejected items": "Rejected items",
+  "Rejecting a transfer order will remove it from your facility. Your inventory levels will not be affected from this rejection.": "Rejecting a transfer order will remove it from your facility.{space}Your inventory levels will not be affected from this rejection.",
   "Rejecting has been started. All in progress orders will be rejected shortly.": "Rejecting has been started. All in progress orders will be rejected shortly.",
   "Rejecting has been started. All outstanding orders will be rejected shortly.": "Rejecting has been started. All outstanding orders will be rejected shortly.",
   "Rejection reason ID" : "Rejection reason ID",

src/locales/es.json

@@ -7,6 +7,7 @@
   "Affect QOH": "Affect QOH",
   "Affect QOH on rejection": "Affect QOH on rejection",
   "All": "Todo",
+  "All order items are rejected": "All order items are rejected",
   "App": "Aplicación",
   "Are you sure you want to remove this rejection reason?": "¿Estás seguro de que quieres eliminar este motivo de rechazo?",
   "A store represents a company or a unique catalog of products. If your OMS is connected to multiple eCommerce stores selling different collections of products, you may have multiple Product Stores set up in HotWax Commerce.": "Una tienda representa una empresa o un catálogo único de productos. Si tu OMS está conectado a múltiples tiendas de comercio electrónico que venden diferentes colecciones de productos, es posible que tengas varias Tiendas de Productos configuradas en HotWax Commerce.",
@@ -156,6 +157,7 @@
   "Failed to send to Retail Pro Server due to the following error, please contact support:.": "Erro al enviar al servidor de Ratail Pro debido al siguiente error, por favor contactar a soporte: {message}.",
   "Failed to ship order": "Error al enviar el pedido",
   "Failed to reject in progress orders": "Error al rechazar pedidos en curso",
+  "Failed to reject order": "Failed to reject order",
   "Failed to reject outstanding orders": "Error al rechazar pedidos pendientes",
   "Failed to remove rejection reason.": "Error al eliminar la razon de rechazo.",
   "Failed to update carrier and shipment method association.": "Error al actualizar transportadora y asociación de metodo de envio.",
@@ -306,6 +308,7 @@
   "Order Identifications": "Identificaciones de pedidos",
   "Order Invoicing Status": "Estado de facturación de la orden ",
   "Order item sequence ID": "Order item sequence ID",
+  "Order items are rejected": "Order items are rejected",
   "Order Lookup": "Búsqueda de pedidos",
   "Order level charges like shipping fees and taxes are being credited on this label becuase it is the first shipment of this order.": "Order level charges like shipping fees and taxes are being credited on this label becuase it is the first shipment of this order.",
   "Order level charges like shipping fees and taxes were already charged to the customer on the first label generated for this order.Label was generated by facility with tracking code": "Order level charges like shipping fees and taxes were already charged to the customer on the first label generated for this order.{space}Label was generated by facility {facilityName} with tracking code {trackingCode}",
@@ -377,14 +380,17 @@
   "Reject all in progress orders": "Rechazar todos los pedidos en curso",
   "Reject all open orders": "Rechazar todos los pedidos abiertos",
   "Reject in progress orders.": "Rechazar { ordersCount } pedidos en curso.",
+  "Reject Items": "Reject Items",
   "Reject open orders.": "Rechazar { ordersCount } pedidos abiertos.",
   "Reject order": "Rechazar pedido",
   "Reject to avoid order split (no variance)": "Reject to avoid order split (no variance)",
+  "Reject transfer order": "Reject transfer order",
   "Rejected": "Rechazado",
   "Rejected at": "Rejected at",
   "Rejected by": "Rejected by",
   "Rejected from": "Rejected from",
   "Rejected items": "Rejected items",
+  "Rejecting a transfer order will remove it from your facility. Your inventory levels will not be affected from this rejection.": "Rejecting a transfer order will remove it from your facility.{space}Your inventory levels will not be affected from this rejection.",
   "Rejecting has been started. All in progress orders will be rejected shortly.": "Se ha iniciado el proceso de rechazo. Todos los pedidos en curso se rechazarán en breve.",
   "Rejecting has been started. All outstanding orders will be rejected shortly.": "Se ha iniciado el proceso de rechazo. Todos los pedidos pendientes se rechazarán en breve.",
   "Rejection reason ID": "Rejection reason ID",

src/locales/ja.json

@@ -7,6 +7,7 @@
   "Affect QOH": "Affect QOH",
   "Affect QOH on rejection": "Affect QOH on rejection",
   "All": "すべて",
+  "All order items are rejected": "All order items are rejected",
   "App": "アプリ",
   "Approved for fulfillment": "出荷承認済み",
   "Are you sure you want to remove this rejection reason?": "この拒否理由を削除してもよろしいですか？",
@@ -159,6 +160,7 @@
   "Failed to send to Retail Pro Server due to the following error, please contact support:.": "Failed to send to Retail Pro Server due to the following error, please contact support: {message}.",
   "Failed to ship order": "注文の出荷に失敗しました",
   "Failed to reject in progress orders": "進行中の注文の拒否に失敗しました",
+  "Failed to reject order": "Failed to reject order",
   "Failed to reject outstanding orders": "未処理の注文の拒否に失敗しました",
   "Failed to remove rejection reason.": "拒否理由の削除に失敗しました。",
   "Failed to update carrier and shipment method association.": "キャリアと出荷方法の関連付けの更新に失敗しました。",
@@ -307,6 +309,7 @@
   "Order Identifications": "注文識別",
   "Order Invoicing Status": "Order Invoicing Status",
   "Order item sequence ID": "Order item sequence ID",
+  "Order items are rejected": "Order items are rejected",
   "Order Lookup": "注文検索",
   "Order level charges like shipping fees and taxes are being credited on this label becuase it is the first shipment of this order.": "Order level charges like shipping fees and taxes are being credited on this label becuase it is the first shipment of this order.",
   "Order level charges like shipping fees and taxes were already charged to the customer on the first label generated for this order.Label was generated by facility with tracking code": "Order level charges like shipping fees and taxes were already charged to the customer on the first label generated for this order.{space}Label was generated by facility {facilityName} with tracking code {trackingCode}",
@@ -378,13 +381,17 @@
   "Reject all in progress orders": "進行中のすべての注文を拒否",
   "Reject all open orders": "オープン注文をすべて拒否",
   "Reject in progress orders.": "進行中の{ordersCount}件の注文を拒否。",
+  "Reject Items": "Reject Items",
   "Reject open orders.": "オープンの{ordersCount}件の注文を拒否。",
   "Reject order": "注文を拒否",
   "Reject to avoid order split (no variance)": "Reject to avoid order split (no variance)",
+  "Reject transfer order": "Reject transfer order",
+  "Rejected": "Rejected",
   "Rejected at": "Rejected at",
   "Rejected by": "Rejected by",
   "Rejected from": "Rejected from",
   "Rejected items": "Rejected items",
+  "Rejecting a transfer order will remove it from your facility. Your inventory levels will not be affected from this rejection.": "Rejecting a transfer order will remove it from your facility.{space}Your inventory levels will not be affected from this rejection.",
   "Rejecting has been started. All in progress orders will be rejected shortly.": "拒否が開始されました。進行中のすべての注文はまもなく拒否されます。",
   "Rejecting has been started. All outstanding orders will be rejected shortly.": "拒否が開始されました。未処理のすべての注文はまもなく拒否されます。",
   "Rejection reason ID": "Rejection reason ID",

src/services/OrderService.ts

@@ -4,6 +4,7 @@
 import { showToast, formatPhoneNumber } from '@/utils';
 import store from '@/store';
 import { cogOutline } from 'ionicons/icons';
+import { prepareSolrQuery } from '@/utils/solrHelper';
 
 const fetchOrderHeader = async (params: any): Promise<any> => {
   return await api({
@@ -887,6 +888,23 @@
   return phoneNumber
 }
 
+const fetchRejectReasons = async(query: any): Promise<any> => {
+  return api({
+    url: "performFind",
+    method: "get", // TODO: cache this api request
+    params: query,
+    cache: true
+  })
+}
+
+const rejectOrderItems = async (payload: any): Promise <any> => {
+  return api({
+    url: "rejectOrderItems",
+    method: "post",
+    data: payload
+  });
+}
+
 export const OrderService = {
   addShipmentBox,
   addTrackingCode,
@@ -896,6 +914,7 @@
   fetchOrderAttribute,
   fetchOrderHeader,
   fetchOrderItems,
+  fetchRejectReasons,
   fetchShipmentCarrierDetail,
   fetchShipmentItems,
   fetchShipments,
@@ -919,6 +938,7 @@
   printTransferOrder,
   rejectFulfillmentReadyOrderItem,
   rejectOrderItem,
+  rejectOrderItems,
   retryShippingLabel,
   shipOrder,
   unpackOrder,

src/store/modules/transferorder/TransferOrderState.ts

@@ -14,5 +14,6 @@ export default interface TransferOrderState {
   shipment: {
     current: any,
     list: any
-  }
+  },
+  rejectReasons: Array<any>;
 }