diff --git a/src/views/EditPackagingModal.vue b/src/views/EditPackagingModal.vue
index 86d4e684..1df768a5 100644
--- a/src/views/EditPackagingModal.vue
+++ b/src/views/EditPackagingModal.vue
@@ -7,9 +7,6 @@
         </ion-button>
       </ion-buttons>
       <ion-title>{{ translate("Edit packaging") }}</ion-title>
-      <ion-buttons slot="end">
-        <ion-button fill="clear">{{ translate("Save") }}</ion-button>
-      </ion-buttons>
     </ion-toolbar>
   </ion-header>
 
@@ -17,46 +14,45 @@
     <ion-card>
       <div class="card-header">
         <div class="order-tags">
-          <ion-chip outline>
+          <ion-chip outline @click="copyToClipboard(order.orderName, 'Copied to clipboard')">
             <ion-icon :icon="pricetag" />
-            <ion-label>NN10584</ion-label>
+            <ion-label>{{ order.orderName }}</ion-label>
           </ion-chip>
         </div>
 
         <div class="order-primary-info">
           <ion-label>
-            Darooty Magwood
-            <p>{{ translate("Ordered") }} 27th January 2020 9:24 PM EST</p>
+            {{ order.customerName }}
+            <p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy t a ZZZZ') }}</p>
           </ion-label>
         </div>
 
         <div class="order-metadata">
           <ion-label>
-            Next Day Shipping
-            <p>{{ translate("Ordered") }} 28th January 2020 2:32 PM EST</p>
+            {{ order.shipmentMethodTypeDesc }}
+            <p v-if="order.reservedDatetime">{{ translate("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy t a ZZZZ') }}</p>
           </ion-label>
         </div>
       </div>
 
-      <div class="order-item">
+      <div class="order-item" v-for="(item, index) in order.items" :key="index">
         <div class="product-info">
           <ion-item lines="none">
             <ion-thumbnail slot="start">
-              <img src="https://dev-resources.hotwax.io/resources/uploads/images/product/m/j/mj08-blue_main.jpg" />
+              <DxpShopifyImg size="small" :src="getProduct(item.productId).mainImageUrl" />
             </ion-thumbnail>
             <ion-label>
-              <p class="overline">WJ06-XL-PURPLE</p>
-              Juno Jacket
-              <p>Blue XL</p>
+              <p class="overline">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}</p>
+              {{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : item.productName }}
+              <p>{{ getFeature(getProduct(item.productId).featureHierarchy, '1/COLOR/')}} {{ getFeature(getProduct(item.productId).featureHierarchy, '1/SIZE/')}}</p>
             </ion-label>
           </ion-item>
         </div>
 
         <div class="product-metadata">
           <ion-item lines="none">
-            <ion-select :label="translate('Select box')">
-              <ion-select-option>Box A Type 3</ion-select-option>
-              <ion-select-option>Box B Type 2</ion-select-option>
+            <ion-select aria-label="Select box" interface="popover" :value="item.selectedBox" @ionChange="updateBox($event, item)">
+              <ion-select-option v-for="shipmentPackage in order.shipmentPackages" :key="shipmentPackage.shipmentId" :value="shipmentPackage.packageName"> {{ translate("Box") }} {{ shipmentPackage.packageName }}</ion-select-option>
             </ion-select>
           </ion-item>
         </div>
@@ -66,29 +62,35 @@
     <ion-list>
       <ion-item lines="none">
         <ion-note slot="start">{{ translate('Boxes') }}</ion-note>
-        <ion-button fill="clear" slot="end">
+        <ion-button fill="clear" slot="end" :disabled="addingBoxForOrderIds.includes(currentOrder.orderId)" @click="addBox(currentOrder)">
           {{ translate("Add") }}
           <ion-icon :icon="addCircleOutline"/>
         </ion-button>
       </ion-item>
-      <ion-item>
-        <ion-select label="Box A" value="3">
-          <ion-select-option value="1">Type 1</ion-select-option>
-          <ion-select-option value="2">Type 2</ion-select-option>
-          <ion-select-option value="3">Type 3</ion-select-option>  
+      <ion-item v-for="shipmentPackage in order.shipmentPackages" :key="shipmentPackage.shipmentId">
+        <ion-select :label="translate('Box ') + shipmentPackage.packageName" interface="popover" :value="shipmentPackage.shipmentBoxTypeId" :placeholder="translate('Select')" :disabled="!shipmentPackage.shipmentBoxTypes.length" @ionChange="updateBoxType($event, shipmentPackage.shipmentId)">
+          <ion-select-option v-for="boxType in shipmentPackage.shipmentBoxTypes" :key="boxTypeDesc(boxType)" :value="boxType">{{ boxTypeDesc(boxType) }}</ion-select-option>
         </ion-select>
       </ion-item>
     </ion-list>
   </ion-content>
+
+  <ion-fab vertical="bottom" horizontal="end" slot="fixed">
+    <ion-fab-button @click="saveOrder()">
+      <ion-icon :icon="saveOutline" />
+    </ion-fab-button>
+  </ion-fab>
 </template>
 
-<script>
+<script lang="ts">
 import { 
   IonButtons,
   IonButton,
   IonCard,
   IonChip,
   IonContent,
+  IonFab,
+  IonFabButton,
   IonHeader,
   IonIcon,
   IonItem,
@@ -101,9 +103,11 @@ import {
   IonTitle,
   IonToolbar,
   modalController } from "@ionic/vue";
-import { defineComponent } from "vue";
-import { addCircleOutline, closeOutline, pricetag } from "ionicons/icons";
-import { translate } from '@hotwax/dxp-components'
+import { computed, defineComponent } from "vue";
+import { addCircleOutline, closeOutline, pricetag, saveOutline } from "ionicons/icons";
+import { getProductIdentificationValue, translate, useProductIdentificationStore } from "@hotwax/dxp-components";
+import { copyToClipboard, formatUtcDate, getFeature } from "@/utils";
+import { mapGetters } from "vuex";
 
 export default defineComponent({
   name: "EditPackagingModal",
@@ -113,6 +117,8 @@ export default defineComponent({
     IonCard,
     IonChip,
     IonContent,
+    IonFab,
+    IonFabButton,
     IonHeader,
     IonIcon,
     IonItem,
@@ -125,18 +131,78 @@ export default defineComponent({
     IonTitle,
     IonToolbar,
   },
+  props: ["addingBoxForOrderIds", "addShipmentBox", "order"],
+  computed: {
+    ...mapGetters({
+      getProduct: 'product/getProduct',
+      boxTypeDesc: 'util/getShipmentBoxDesc'
+    }),
+  },
+  data() {
+    return {
+      currentOrder: {} as any
+    }
+  },
+  mounted() {
+    this.currentOrder = JSON.parse(JSON.stringify(this.order));
+  },
   methods: {
-    closeModal() {
-      modalController.dismiss({ dismissed: true });
+    closeModal(payload = {}) {
+      modalController.dismiss({ dismissed: true, ...payload });
+    },
+    getShipmentPackageType(shipmentPackage: any) {
+      let packageType = '';
+      if(shipmentPackage.shipmentBoxTypes.length){
+        packageType = shipmentPackage.shipmentBoxTypes.find((boxType: string) => boxType === shipmentPackage.shipmentBoxTypeId) ? shipmentPackage.shipmentBoxTypes.find((boxType: string) => boxType === shipmentPackage.shipmentBoxTypeId) : shipmentPackage.shipmentBoxTypes[0];
+      }
+      return packageType;
+    },
+    updateBox(event: any, item: any) {
+      const updatedBox = event.detail.value;
+
+      const currentOrderItem = this.currentOrder.items.find((currentItem: any) => currentItem.orderItemSeqId === item.orderItemSeqId);
+      currentOrderItem.selectedBox = updatedBox
+
+      this.currentOrder.isModified = true;
+    },
+    updateBoxType(event: any, shipmentId: any) {
+      const updatedBoxType = event.detail.value;
+
+      const currentShipmentPackage = this.currentOrder.shipmentPackages.find((shipmentPackage: any) => shipmentPackage.shipmentId === shipmentId)
+      currentShipmentPackage.shipmentBoxTypeId = updatedBoxType;
+
+      this.currentOrder.isModified = true
+    },
+    addBox(currentOrder: any) {
+      this.addShipmentBox(currentOrder);
+      modalController.dismiss();
     },
+    saveOrder() {
+      this.closeModal({ updatedOrder: this.currentOrder })
+    }
   },
   setup() {
+    const productIdentificationStore = useProductIdentificationStore();
+    let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref)
+
     return {
       addCircleOutline,
       closeOutline,
+      copyToClipboard,
+      formatUtcDate,
+      getFeature,
+      getProductIdentificationValue,
+      productIdentificationPref,
       pricetag,
+      saveOutline,
       translate
     };
   },
 });
-</script>
\ No newline at end of file
+</script>
+
+<style scoped>
+ion-content {
+  --padding-bottom: 80px;
+}
+</style>
\ No newline at end of file
diff --git a/src/views/InProgress.vue b/src/views/InProgress.vue
index 043ea8eb..ec2def3c 100644
--- a/src/views/InProgress.vue
+++ b/src/views/InProgress.vue
@@ -139,7 +139,7 @@
                     <ion-icon v-if="item.showKitComponents" color="medium" slot="icon-only" :icon="chevronUpOutline"/>
                     <ion-icon v-else color="medium" slot="icon-only" :icon="listOutline"/>
                   </ion-button>
-                  <ion-button fill="clear" size="small" @click.stop="openRejectReasonPopover($event, item, order)">
+                  <ion-button fill="clear" size="small" class="desktop-only" @click.stop="openRejectReasonPopover($event, item, order)">
                     <ion-icon color="danger" slot="icon-only" :icon="trashBinOutline"/>
                   </ion-button>
                   <ion-note v-if="getProductStock(item.productId).quantityOnHandTotal">{{ getProductStock(item.productId).quantityOnHandTotal }} {{ translate('pieces in stock') }}</ion-note>
@@ -176,7 +176,7 @@
             <div class="mobile-only">
               <ion-item>
                 <ion-button fill="clear"  :disabled="order.isModified || order.hasMissingInfo" @click.stop="isForceScanEnabled ? scanOrder(order) : packOrder(order)">{{ translate("Pack using default packaging") }}</ion-button>
-                <ion-button slot="end" fill="clear" color="medium" @click.stop="packagingPopover">
+                <ion-button slot="end" fill="clear" color="medium" @click.stop="packagingPopover($event, order)">
                   <ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
                 </ion-button>
               </ion-item>
@@ -310,6 +310,8 @@ import ShipmentBoxPopover from '@/components/ShipmentBoxPopover.vue'
 import QRCodeModal from '@/components/QRCodeModal.vue'
 import { useAuthStore } from '@hotwax/dxp-components'
 import ScanOrderItemModal from "@/components/ScanOrderItemModal.vue";
+import EditPackagingModal from '@/views/EditPackagingModal.vue'
+import ReportIssueModal from '@/views/ReportIssueModal.vue'
 
 
 export default defineComponent({
@@ -441,13 +443,34 @@ export default defineComponent({
     getInProgressOrders() {
       return JSON.parse(JSON.stringify(this.inProgressOrders.list)).splice(0, (this.inProgressOrders.query.viewIndex + 1) * (process.env.VUE_APP_VIEW_SIZE as any));
     },
-    async packagingPopover(ev: Event) {
+    async packagingPopover(ev: Event, order: any) {
       const popover = await popoverController.create({
         component: PackagingPopover,
+        componentProps: { order },
         event: ev,
         translucent: true,
         showBackdrop: false,
       });
+
+      popover.onDidDismiss().then(async(result) => {
+        if(result.data?.dismissed) {
+          const selectedAction = result.data.selectedAction;
+
+          const modal = await modalController.create({
+            component: selectedAction === 'editPackaging' ? EditPackagingModal : ReportIssueModal,
+            componentProps: selectedAction === 'editPackaging' ? { order, addingBoxForOrderIds: this.addingBoxForOrderIds, addShipmentBox: this.addShipmentBox } : { order }
+          })
+
+          modal.onDidDismiss().then((result) => {
+            if(result.data?.updatedOrder) {
+              this.save(result.data.updatedOrder);
+            }
+          })
+
+          modal.present();
+        }
+      })
+
       return popover.present();
     },
     async packOrder(order: any) {
@@ -1290,8 +1313,15 @@ ion-segment > ion-segment-button > ion-skeleton-text, ion-item > ion-skeleton-te
   height: 30px;
 }
 
-.order-item {
-  grid-template-columns: repeat(3, 1fr);
+.product-metadata {
+  display: flex;
+  align-items: center;
+}
+
+@media (min-width: 991px) {
+  .order-item {
+    grid-template-columns: repeat(3, 1fr);
+  }
 }
 </style>
 
diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
index b7b8a974..fbc1d970 100644
--- a/src/views/OrderDetail.vue
+++ b/src/views/OrderDetail.vue
@@ -151,7 +151,7 @@
           <div v-if="category === 'in-progress'" class="mobile-only">
             <ion-item>
               <ion-button fill="clear" :disabled="order.hasMissingInfo" @click="isForceScanEnabled ? scanOrder(order) :packOrder(order)">{{ translate("Pack using default packaging") }}</ion-button>
-              <ion-button slot="end" fill="clear" color="medium" @click="packagingPopover">
+              <ion-button slot="end" fill="clear" color="medium" @click="packagingPopover($event, order)">
                 <ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
               </ion-button>
             </ion-item>
@@ -347,6 +347,8 @@ import ReportIssuePopover from '@/components/ReportIssuePopover.vue'
 import ShippingDetails from '@/views/ShippingDetails.vue';
 import { isKit } from '@/utils/order'
 import ScanOrderItemModal from "@/components/ScanOrderItemModal.vue";
+import EditPackagingModal from '@/views/EditPackagingModal.vue';
+import ReportIssueModal from '@/views/ReportIssueModal.vue';
 
 export default defineComponent({
   name: "OrderDetail",
@@ -699,13 +701,34 @@ export default defineComponent({
       inProgressOrdersQuery.viewIndex = 0 // If the size changes, list index should be reintialised
       await this.store.dispatch('order/updateInProgressQuery', { ...inProgressOrdersQuery })
     },
-    async packagingPopover(ev: Event) {
+    async packagingPopover(ev: Event, order: any) {
       const popover = await popoverController.create({
         component: PackagingPopover,
+        componentProps: { order },
         event: ev,
         translucent: true,
         showBackdrop: false,
       });
+
+      popover.onDidDismiss().then(async(result) => {
+        if(result.data?.dismissed) {
+          const selectedAction = result.data.selectedAction;
+
+          const modal = await modalController.create({
+            component: selectedAction === 'editPackaging' ? EditPackagingModal : ReportIssueModal,
+            componentProps: selectedAction === 'editPackaging' ? { order, addingBoxForOrderIds: this.addingBoxForOrderIds, addShipmentBox: this.addShipmentBox } : { order }
+          })
+
+          modal.onDidDismiss().then((result) => {
+            if(result.data?.updatedOrder) {
+              this.save(result.data.updatedOrder);
+            }
+          })
+
+          modal.present();
+        }
+      })
+
       return popover.present();
     },
     async openRejectReasonPopover(ev: Event, item: any, order: any, kitProducts?: any) {
@@ -1373,8 +1396,10 @@ ion-segment > ion-segment-button > ion-skeleton-text, ion-item > ion-skeleton-te
   height: 30px;
 }
 
-.order-item {
-  grid-template-columns: repeat(3, 1fr);
+@media (min-width: 991px) {
+  .order-item {
+    grid-template-columns: repeat(3, 1fr);
+  }
 }
 
 .other-shipment-actions {
diff --git a/src/views/PackagingPopover.vue b/src/views/PackagingPopover.vue
index 4e0cadd4..7b589b3d 100644
--- a/src/views/PackagingPopover.vue
+++ b/src/views/PackagingPopover.vue
@@ -1,18 +1,14 @@
 <template>
   <ion-content>
     <ion-list>
-      <ion-item button @click="editPackaging">
+      <ion-item button @click="closePopover('editPackaging')">
         <ion-icon slot="start" :icon="pencil" />
         {{ translate("Edit packaging") }}
       </ion-item>
-      <ion-item button @click="reportIssue">
+      <ion-item button @click="closePopover('reportIssue')" lines="none">
         <ion-icon slot="start" :icon="warning" />
         {{ translate("Report an issue") }}
       </ion-item>
-      <ion-item button lines="none">
-        <ion-icon slot="start" :icon="refresh" />
-        {{ translate("Reject order") }}
-      </ion-item>
     </ion-list>
   </ion-content>
 </template>
@@ -23,11 +19,9 @@ import {
   IonIcon,
   IonItem,
   IonList,
-  modalController,
+  popoverController
 } from "@ionic/vue";
 import { defineComponent } from "vue";
-import EditPackagingModal from '@/views/EditPackagingModal.vue'
-import ReportIssueModal from '@/views/ReportIssueModal.vue'
 import { pencil, warning, refresh } from 'ionicons/icons'
 import { translate } from "@hotwax/dxp-components";
 
@@ -40,17 +34,8 @@ export default defineComponent({
     IonList,
   },
   methods: {
-    async editPackaging() {
-      const editmodal = await modalController.create({
-        component: EditPackagingModal
-      });
-      return editmodal.present();
-    },
-     async reportIssue() {
-      const reportmodal = await modalController.create({
-        component: ReportIssueModal
-      });
-      return reportmodal.present();
+    closePopover(selectedAction: string) {
+      popoverController.dismiss({ dismissed: true, selectedAction })
     }
   },
   setup() {
diff --git a/src/views/ReportIssueModal.vue b/src/views/ReportIssueModal.vue
index 4894d84e..0040a6ad 100644
--- a/src/views/ReportIssueModal.vue
+++ b/src/views/ReportIssueModal.vue
@@ -7,75 +7,82 @@
         </ion-button>
       </ion-buttons>
       <ion-title>{{ translate("Report an issue") }}</ion-title>
-      <ion-buttons slot="end">
-        <ion-button fill="clear">{{ translate("Save") }}</ion-button>
-      </ion-buttons>
     </ion-toolbar>
   </ion-header>
 
- <ion-content>
-   <ion-card>
-     <div class="card-header">
-       <div class="order-tags">
-         <ion-chip outline>
-           <ion-icon :icon="pricetag" />
-           <ion-label>NN10584</ion-label>
-         </ion-chip>
-       </div>
+  <ion-content>
+    <ion-card>
+      <div class="card-header">
+        <div class="order-tags">
+          <ion-chip outline @click="copyToClipboard(order.orderName, 'Copied to clipboard')">
+            <ion-icon :icon="pricetag" />
+            <ion-label>{{ order.orderName }}</ion-label>
+          </ion-chip>
+        </div>
 
-       <div class="order-primary-info">
-         <ion-label>
-           Darooty Magwood
-           <p>{{ translate("Ordered") }} 27th January 2020 9:24 PM EST</p>
-         </ion-label>
-       </div>
+        <div class="order-primary-info">
+          <ion-label>
+            {{ order.customerName }}
+            <p>{{ translate("Ordered") }} {{ formatUtcDate(order.orderDate, 'dd MMMM yyyy t a ZZZZ') }}</p>
+          </ion-label>
+        </div>
 
-       <div class="order-metadata">
-         <ion-label>
-           Next Day Shipping
-           <p>{{ translate("Ordered") }} 28th January 2020 2:32 PM EST</p>
-         </ion-label>
-       </div>
-     </div>
+        <div class="order-metadata">
+          <ion-label>
+            {{ order.shipmentMethodTypeDesc }}
+            <p v-if="order.reservedDatetime">{{ $t("Last brokered") }} {{ formatUtcDate(order.reservedDatetime, 'dd MMMM yyyy t a ZZZZ') }}</p>
+          </ion-label>
+        </div>
+      </div>
     </ion-card>
 
-    <ion-card>
+    <ion-card v-for="(item, index) in currentOrder.items" :key="index">
       <div class="order-item">
         <div class="product-info">
           <ion-item lines="none">
             <ion-thumbnail slot="start">
-              <img src="https://dev-resources.hotwax.io/resources/uploads/images/product/m/j/mj08-blue_main.jpg" />
+              <DxpShopifyImg size="small" :src="getProduct(item.productId).mainImageUrl" />
             </ion-thumbnail>
             <ion-label>
-              <p class="overline">WJ06-XL-PURPLE</p>
-              Juno Jacket
-              <p>Blue XL</p>
+              <p class="overline">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}</p>
+              {{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : item.productName }}
+              <p>{{ getFeature(getProduct(item.productId).featureHierarchy, '1/COLOR/')}} {{ getFeature(getProduct(item.productId).featureHierarchy, '1/SIZE/')}}</p>
             </ion-label>
           </ion-item>
         </div>
 
         <div class="product-metadata">
-          <ion-note>49 {{ translate("pieces in stock") }}</ion-note>
+          <ion-note v-if="getProductStock(item.productId).quantityOnHandTotal">{{ getProductStock(item.productId).quantityOnHandTotal }} {{ translate('pieces in stock') }}</ion-note>
+          <ion-button fill="clear" v-else size="small" @click.stop="fetchProductStock(item.productId)">
+            <ion-icon color="medium" slot="icon-only" :icon="cubeOutline"/>
+          </ion-button>
         </div>
       </div>
 
       <ion-item>
-        <ion-select :label="translate('Select an issue')" value="a">
-          <ion-select-option value="a">Out of stock</ion-select-option>
-          <ion-select-option value="b">Worn display</ion-select-option>
+        <ion-select :label="translate('Select issue')" interface="popover" @ionChange="updateRejectReason($event, item)" :value="selectedReason" >
+          <ion-select-option v-for="reason in rejectReasons" :key="reason.enumId" :value="reason.enumId">{{ reason.description ? translate(reason.description) : reason.enumId }}</ion-select-option>
         </ion-select>
       </ion-item>
     </ion-card> 
   </ion-content>
+
+  <ion-fab vertical="bottom" horizontal="end" slot="fixed">
+    <ion-fab-button @click="saveOrder()">
+      <ion-icon :icon="saveOutline" />
+    </ion-fab-button>
+  </ion-fab>
 </template>
 
-<script>
+<script lang="ts">
 import { 
   IonCard,
   IonChip,  
   IonButtons,
   IonButton,
   IonContent,
+  IonFab,
+  IonFabButton,
   IonHeader,
   IonIcon,
   IonItem,
@@ -87,38 +94,84 @@ import {
   IonThumbnail,
   IonToolbar,
   modalController } from "@ionic/vue";
-import { defineComponent } from "vue";
-import { closeOutline, pricetag } from "ionicons/icons";
-import { translate } from '@hotwax/dxp-components'
+import { computed, defineComponent } from "vue";
+import { closeOutline, cubeOutline, pricetag, saveOutline } from "ionicons/icons";
+import { mapGetters, useStore } from 'vuex';
+import { copyToClipboard, formatUtcDate, getFeature } from '@/utils';
+import { getProductIdentificationValue, translate, useProductIdentificationStore } from '@hotwax/dxp-components';
 
 export default defineComponent({
   name: "ReportIssueModal",
   components: { 
-     IonCard,
-     IonChip,  
-     IonButtons,
-     IonButton,
-     IonContent,
-     IonHeader,
-     IonIcon,
-     IonItem,
-     IonLabel,
-     IonNote,
-     IonSelect,
-     IonSelectOption,
-     IonTitle,
-     IonThumbnail,
-     IonToolbar
+    IonCard,
+    IonChip,  
+    IonButtons,
+    IonButton,
+    IonContent,
+    IonFab,
+    IonFabButton,
+    IonHeader,
+    IonIcon,
+    IonItem,
+    IonLabel,
+    IonNote,
+    IonSelect,
+    IonSelectOption,
+    IonTitle,
+    IonThumbnail,
+    IonToolbar
+  },
+  props: ["order"],
+  data() {
+    return {
+      selectedReason: "",
+      currentOrder: {} as any
+    }
+  },
+  computed: {
+    ...mapGetters({
+      getProduct: 'product/getProduct',
+      rejectReasons: 'util/getRejectReasons',
+      getProductStock: 'stock/getProductStock',
+    }),
+  },
+  mounted() {
+    this.currentOrder = JSON.parse(JSON.stringify(this.order))
   },
   methods: {
-    closeModal() {
-      modalController.dismiss({ dismissed: true });
+    closeModal(payload = {}) {
+      modalController.dismiss({ dismissed: true, ...payload });
     },
+    fetchProductStock(productId: string) {
+      this.store.dispatch('stock/fetchStock', { productId })
+    },
+    updateRejectReason(event: any, item: any) {
+      const updatedReason = event.detail.value;
+
+      const currentOrderItem = this.currentOrder.items.find((orderItem: any) => orderItem.orderItemSeqId === item.orderItemSeqId);
+      currentOrderItem.rejectReason = updatedReason
+      this.currentOrder.hasRejectedItem = true;
+    },
+    saveOrder() {
+      this.closeModal({ updatedOrder: this.currentOrder });
+    }
   },
   setup() {
+    const store = useStore();
+    const productIdentificationStore = useProductIdentificationStore();
+    let productIdentificationPref = computed(() => productIdentificationStore.getProductIdentificationPref)
+
     return {
       closeOutline,
+      copyToClipboard,
+      cubeOutline,
+      formatUtcDate,
+      getFeature,
+      getProductIdentificationValue,
+      productIdentificationPref,
       pricetag,
+      saveOutline,
+      store,
       translate
     };
   },