Merge pull request #424 from amansinghbais/#423

Implemented: re-route fulfillment product store setitng for order item splitting by user (#423)
hotwax · Dec 3, 2024 · 22a9a31 · 22a9a31
2 parents cc131be + 3658994
commit 22a9a31
Show file tree

Hide file tree

Showing 5 changed files with 9 additions and 2 deletions.
diff --git a/.env.example b/.env.example
@@ -9,7 +9,7 @@ VUE_APP_PERMISSION_ID="BOPIS_APP_VIEW"
 VUE_APP_LOCALES={"en-US": "English", "ja-JP": "日本語", "es-ES": "Español"}
 VUE_APP_ALIAS=
 VUE_APP_CURRENCY_FORMATS={"en": {"currency": {"style": "currency","currency": "USD"}}, "ja": {"currency": {"style": "currency", "currency": "JPY"}}, "es": {"currency": {"style": "currency","currency": "ESP"}}}
-VUE_APP_RF_CNFG_MPNG={ "allowDeliveryMethodUpdate": "CUST_DLVRMTHD_UPDATE", "allowDeliveryAddressUpdate": "CUST_DLVRADR_UPDATE", "allowPickupUpdate": "CUST_PCKUP_UPDATE", "allowCancel": "CUST_ALLOW_CNCL", "shippingMethod": "RF_SHIPPING_METHOD"}
+VUE_APP_RF_CNFG_MPNG={ "allowDeliveryMethodUpdate": "CUST_DLVRMTHD_UPDATE", "allowDeliveryAddressUpdate": "CUST_DLVRADR_UPDATE", "allowPickupUpdate": "CUST_PCKUP_UPDATE", "allowCancel": "CUST_ALLOW_CNCL", "shippingMethod": "RF_SHIPPING_METHOD", "orderItemSplit": "CUST_ORD_ITEM_SPLIT"}
 VUE_APP_DEFAULT_LOG_LEVEL="error"
 VUE_APP_LOGIN_URL="http://launchpad.hotwax.io/login"
 VUE_APP_NOTIF_APP_ID=BOPIS

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -120,6 +120,7 @@
   "Order reservations": "Order reservations",
   "order reservations at": "{ count } order reservations at { store }",
   "Other stores": "Other stores",
+  "Order item split": "Order item split",
   "Other items": "Other items",
   "Packed": "Packed",
   "Packing Slip": "Packing Slip",

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -117,6 +117,7 @@
   "Order reservations": "Order reservations",
   "order reservations at": "{ count } order reservations at { store }",
   "Other stores": "Otras tiendas",
+  "Order item split": "Order item split",
   "Other items": "Other items",
   "Packed": "Empacado",
   "Packing Slip": "Remisión de embalaje",

diff --git a/src/locales/ja.json b/src/locales/ja.json
@@ -112,6 +112,7 @@
   "Order will be marked as completed. This action is irreversible.": "注文の完了がマークされます。この操作は元に戻せません。",
   "Orders": "注文",
   "Orders Not Found": "注文が見つかりません",
+  "Order item split": "Order item split",
   "Order item rejection history": "注文アイテムの拒否履歴",
   "Order reservations": "注文予約",
   "order reservations at": "{count} 件の注文予約が {store} にあります",

diff --git a/src/views/Settings.vue b/src/views/Settings.vue
@@ -61,6 +61,9 @@
             <!-- <p>Uploading order cancelations to Shopify is currently disabled. Order cancelations in HotWax will not be synced to Shopify.</p> -->
             <ion-toggle label-placement="start" :disabled="!hasPermission(Actions.APP_RF_CONFIG_UPDATE) || Object.keys(rerouteFulfillmentConfig.allowCancel).length == 0" :checked="rerouteFulfillmentConfig.allowCancel.settingValue" @ionChange="updateRerouteFulfillmentConfiguration(rerouteFulfillmentConfig.allowCancel, $event.detail.checked)">{{ translate("Cancel order before fulfillment") }}</ion-toggle>
           </ion-item>
+          <ion-item lines="none">
+            <ion-toggle label-placement="start" :disabled="!hasPermission(Actions.APP_RF_CONFIG_UPDATE) || Object.keys(rerouteFulfillmentConfig.orderItemSplit).length == 0" :checked="rerouteFulfillmentConfig.orderItemSplit.settingValue" @ionChange="updateRerouteFulfillmentConfiguration(rerouteFulfillmentConfig.orderItemSplit, $event.detail.checked)">{{ translate("Order item split") }}</ion-toggle>
+          </ion-item>
           <ion-item lines="none">
             <ion-select :label="translate('Shipment method')" :disabled="!hasPermission(Actions.APP_RF_CONFIG_UPDATE) || Object.keys(rerouteFulfillmentConfig.shippingMethod).length == 0" interface="popover" :value="rerouteFulfillmentConfig.shippingMethod.settingValue" @ionChange="updateRerouteFulfillmentConfiguration(rerouteFulfillmentConfig.shippingMethod, $event.detail.value)">
               <ion-select-option v-for="shipmentMethod in availableShipmentMethods" :key="shipmentMethod.shipmentMethodTypeId" :value="shipmentMethod.shipmentMethodTypeId" >{{ shipmentMethod.description }}</ion-select-option>
@@ -241,7 +244,8 @@ export default defineComponent({
         allowDeliveryAddressUpdate: {},
         allowPickupUpdate: {},
         allowCancel: {},
-        shippingMethod: {}
+        shippingMethod: {},
+        orderItemSplit: {}
       } as any,
       availableShipmentMethods: [] as any,
       rerouteFulfillmentConfigMapping: (process.env.VUE_APP_RF_CNFG_MPNG? JSON.parse(process.env.VUE_APP_RF_CNFG_MPNG) : {}) as any