Merge pull request #758 from swati1717/main

Moved Jobs into Correct Sections(#757)
hotwax · Jan 13, 2025 · 3e20545 · 3e20545
2 parents ec37509 + f43db01
commit 3e20545
Show file tree

Hide file tree

Showing 6 changed files with 45 additions and 9 deletions.
diff --git a/.env.example b/.env.example
@@ -2,12 +2,12 @@ VUE_APP_I18N_LOCALE=en-US
 VUE_APP_I18N_FALLBACK_LOCALE=en-US
 VUE_APP_CACHE_MAX_AGE=3600
 VUE_APP_VIEW_SIZE=10
-VUE_APP_FULFILLMENT_JOB_ENUMS={"AUTO_CNCL_DAL":"JOB_CNCL_ORD_DTE","ODR_FLMNT_HST":"JOB_ORD_FLMNT_HST","SHIP_PKD_ODRS":"JOB_SHIP_ORD_PKD", "OPN_BOPIS_ORD_NT":"JOB_OPN_BOPIS_ORD_NT", "READYPICK_BOPIS_ORD_NT": "JOB_RP_BOPIS_ORD_NT", "OPEN_SHIPPING_ORD_NT" : "JOB_OPEN_SHIP_ORD_NT"}
-VUE_APP_JOB_FREQUENCY_TYPE={"PRE_ORDER_CTLG":"default","ADD_PRODR_TG_SHPFY":"default","REMV_PRODR_TG_SHPFY":"default","ADD_PRODR_SHPG_DTE_SHPFY":"default","ADD_BACKODR_TG_SHPFY":"default","IMP_NEW_ORDERS":"default","IMP_CANCELLED_ORDERS":"default","REMV_BACKODR_TG_SHPFY":"default","IMP_CANCELLED_ITEMS":"default","AUTO_RELSE_DAILY":"default","IMP_RETURNS":"default","UPLD_CNCLD_ORDRS":"default","UPLD_REFUNDS":"default","NTS_PRMS_DT_CHNG":"default","REJ_ORDR":"default","UNFIL_ORDERS":"default","AUTO_CNCL_DAL":"default","BTCH_BRKR_ORD":"default","LIST_PRE_ORDER":"slow","LIST_BACK_ORDER":"slow","IMP_PRDTS":"default","SYNC_PRDTS":"slow","HARD_SYNC":"slow","IMP_PRDTS_BLK":"default","IMP_ORDERS_BLK":"default","JOB_IMP_QUEUE":"default"}
-VUE_APP_ODR_JOB_ENUMS={"IMP_NEW_ORDERS":"JOB_IMP_ORD","APR_ORD":"JOB_APR_ORD","UPDT_ORDS":"JOB_IMP_ORD_UPD","IMP_CANCELLED_ORDERS":"JOB_IMP_ORD_CNCL","IMP_CANCELLED_ITEMS":"JOB_IMP_ITM_CNCL","IMP_RETURNS":"JOB_IMP_RTN","UPLD_CNCLD_ORDRS":"JOB_UL_CNCLD_ORD","UPLD_REFUNDS":"JOB_UL_REFUNDS","UNFIL_ORDERS":"JOB_BKR_ORD_UNF","AUTO_CNCL_DAL":"JOB_CNCL_ORD_DTE","BTCH_BRKR_ORD":"JOB_BKR_ORD"}
+VUE_APP_FULFILLMENT_JOB_ENUMS={"AUTO_CNCL_DAL":"JOB_CNCL_ORD_DTE","ODR_FLMNT_HST":"JOB_ORD_FLMNT_HST","SHIP_PKD_ODRS":"JOB_SHIP_ORD_PKD", "OPN_BOPIS_ORD_NT":"JOB_OPN_BOPIS_ORD_NT", "READYPICK_BOPIS_ORD_NT": "JOB_RP_BOPIS_ORD_NT", "OPEN_SHIPPING_ORD_NT" : "JOB_OPEN_SHIP_ORD_NT","BROKER_MAIL_ODR":"JOB_BROKER_MAIL_ODR","PACKED_MAIL_ODR":"JOB_PACKED_MAIL_ODR","COMPLET_MAIL_ODR":"JOB_COMPLET_MAIL_ODR"}
+VUE_APP_JOB_FREQUENCY_TYPE={"PRE_ORDER_CTLG":"default","ADD_PRODR_TG_SHPFY":"default","REMV_PRODR_TG_SHPFY":"default","ADD_PRODR_SHPG_DTE_SHPFY":"default","ADD_BACKODR_TG_SHPFY":"default","IMP_NEW_ORDERS":"default","IMP_CANCELLED_ORDERS":"default","IMP_MISS_ORD":"default","REMV_BACKODR_TG_SHPFY":"default","IMP_CANCELLED_ITEMS":"default","AUTO_RELSE_DAILY":"default","IMP_RETURNS":"default","UPLD_CNCLD_ORDRS":"default","UPLD_REFUNDS":"default","NTS_PRMS_DT_CHNG":"default","REJ_ORDR":"default","UNFIL_ORDERS":"default","AUTO_CNCL_DAL":"default","BTCH_BRKR_ORD":"default","LIST_PRE_ORDER":"slow","LIST_BACK_ORDER":"slow","IMP_PRDTS":"default","SYNC_PRDTS":"slow","ACT_PROD_SHPFY":"default","HARD_SYNC":"slow","IMP_PROD_FACILITY":"default","IMP_PRDTS_BLK":"default","IMP_ORDERS_BLK":"default","JOB_IMP_QUEUE":"default"}
+VUE_APP_ODR_JOB_ENUMS={"IMP_NEW_ORDERS":"JOB_IMP_ORD","APR_ORD":"JOB_APR_ORD","UPDT_ORDS":"JOB_IMP_ORD_UPD","IMP_CANCELLED_ORDERS":"JOB_IMP_ORD_CNCL","IMP_CANCELLED_ITEMS":"JOB_IMP_ITM_CNCL","IMP_MISS_ORD":"JOB_IMP_MISS_ORD","IMP_RETURNS":"JOB_IMP_RTN","UPLD_CNCLD_ORDRS":"JOB_UL_CNCLD_ORD","UPLD_REFUNDS":"JOB_UL_REFUNDS","UNFIL_ORDERS":"JOB_BKR_ORD_UNF","AUTO_CNCL_DAL":"JOB_CNCL_ORD_DTE","BTCH_BRKR_ORD":"JOB_BKR_ORD"}
 VUE_APP_PRODR_JOB_ENUMS={"ADD_PRODR_TG_SHPFY":"JOB_ADD_PREORD_VRT","REMV_PRODR_TG_SHPFY":"JOB_RMV_PREORD_VRT", "ADD_BACKODR_TG_SHPFY":"JOB_ADD_BACKORD_VRT","REMV_BACKODR_TG_SHPFY":"JOB_RMV_BACKORD_VRT","AUTO_RELSE_DAILY":"JOB_RLS_ORD_DTE", "REL_PREODR_CAT": "JOB_REL_PREODR_CAT", "PREORDER_CAT_SYC": "JOB_PREORDER_CAT_SYC", "ADD_TAG_BACKORD": "JOB_ADD_TAG_BACKORD", "ADD_TAG_PREORD": "JOB_ADD_TAG_PREORD", "UL_PRMS_DTE": "JOB_UL_PRMS_DTE", "UL_PRMS_DTE_UPD": "JOB_UL_PRMS_DTE_UPD", "SD_PRMSDDTE_CNG_NOTI": "SD_PRMSDDTE_CNG_NOTI", "UL_PRMS_DTE_UPD": "JOB_UL_PRMS_DTE_UPD" }
-VUE_APP_PRD_JOB_ENUMS={"IMP_PRDTS":"JOB_IMP_PROD_NEW","SYNC_PRDTS":"JOB_IMP_PROD_UPD"}
-VUE_APP_INV_JOB_ENUMS={"HARD_SYNC":"JOB_UL_INV"}
+VUE_APP_PRD_JOB_ENUMS={"IMP_PRDTS":"JOB_IMP_PROD_NEW","SYNC_PRDTS":"JOB_IMP_PROD_UPD","ACT_PROD_SHPFY":"JOB_ACT_PROD_SHPFY"}
+VUE_APP_INV_JOB_ENUMS={"HARD_SYNC":"JOB_UL_INV","IMP_PROD_FACILITY":"JOB_IMP_PROD_FAC"}
 VUE_APP_INITIAL_JOB_ENUMS={"IMP_PRDTS_BLK":"JOB_IMP_PROD_NEW_BLK","IMP_ORDERS_BLK":"JOB_IMP_ORD_BLK","UL_PRCS":"JOB_UL_PRCS","JOB_IMP_QUEUE":"JOB_PRC_PND_DML"}
 VUE_APP_INITIAL_JOB_TYPES={"JOB_IMP_PROD_NEW_BLK":"products","JOB_IMP_ORD_BLK":"orders"}
 VUE_APP_BASE_URL=

diff --git a/src/locales/en.json b/src/locales/en.json
@@ -1,4 +1,5 @@
 {
+  "Activate products on Shopify": "Activate products on Shopify",
   "A store represents a company or a unique catalog of products. If your OMS is connected to multiple eCommerce stores sellling different collections of products, you may have multiple Product Stores set up in HotWax Commerce.": "A store represents a company or a unique catalog of products. If your OMS is connected to multiple eCommerce stores sellling different collections of products, you may have multiple Product Stores set up in HotWax Commerce.",
   "Add": "Add",
   "Add a note with the promise date given to the customer at the time of placing the order.": "Add a note with the promise date given to the customer at the time of placing the order.",
@@ -133,9 +134,11 @@
   "Hourly": "Hourly",
   "Import": "Import",
   "Import all products from Shopify. Make sure you run this before importing orders in bulk during intial setup.": "Import all products from Shopify. Make sure you run this before importing orders in bulk during intial setup.",
+  "Import last day orders from Shopify": "Import last day orders from Shopify",
   "Import new orders": "Import new orders",
   "Import orders in bulk": "Import orders in bulk",
   "Import products": "Import products",
+  "Import product facility": "Import product facility",
   "Import products in bulk": "Import products in bulk",
   "Import queue": "Import queue",
   "In 15 minutes": "In 15 minutes",
@@ -281,9 +284,12 @@
   "Select a different time zone": "Select a different time zone",
   "Select time zone": "Select time zone",
   "Send All Produced System Messages": "Send All Produced System Messages",
+  "Send Broker Order Mail": "Send Broker Order Mail",
+  "Send Completed Order Mail": "Send Completed Order Mail",
   "Send next bulk query system message in queue": "Send next bulk query system message in queue",
+  "Send Packed Order Mail": "Send Packed Order Mail",
   "Send shopify fulfillment ack feed": "Send shopify fulfillment ack feed",
-  "Sends notifications for open orders and ready-to-pickup orders.":"Sends notifications for open orders and ready-to-pickup orders.",
+  "Sends notifications for open, ready-for-pickup BOPIS orders and brokered, packed, and completed Sales orders.": "Sends notifications for open, ready-for-pickup BOPIS orders and brokered, packed, and completed Sales orders.",
   "Service has been scheduled": "Service has been scheduled",
   "Service updated successfully": "Service updated successfully",
   "Services have been scheduled in bulk": "Services have been scheduled in bulk",
@@ -367,4 +373,4 @@
   "Would you like to update your time zone to . Your profile is currently set to . This setting can always be changed from the settings menu.": "Would you like to update your time zone to {localTimeZone}. Your profile is currently set to {profileTimeZone}. This setting can always be changed from the settings menu.",
   "Yes": "Yes",
   "You do not have permission to access this page": "You do not have permission to access this page"
-}
+}
diff --git a/src/views/Fulfillment.vue b/src/views/Fulfillment.vue
@@ -61,9 +61,24 @@
               <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('OPEN_SHIPPING_ORD_NT') }}</ion-label>
               <ion-skeleton-text v-else style="width: 30%;" animated />
             </ion-item>
+            <ion-item button @click="viewJobConfiguration({ id: 'BROKER_MAIL_ODR', status: getJobStatus(jobEnums['BROKER_MAIL_ODR']) })" detail>
+              <ion-label class="ion-text-wrap">{{ translate("Send Broker Order Mail") }}</ion-label>
+              <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('BROKER_MAIL_ODR') }}</ion-label>
+              <ion-skeleton-text v-else style="width: 30%;" animated />
+            </ion-item>
+            <ion-item button @click="viewJobConfiguration({ id: 'PACKED_MAIL_ODR', status: getJobStatus(jobEnums['PACKED_MAIL_ODR']) })" detail>
+              <ion-label class="ion-text-wrap">{{ translate("Send Packed Order Mail") }}</ion-label>
+              <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('PACKED_MAIL_ODR') }}</ion-label>
+              <ion-skeleton-text v-else style="width: 30%;" animated />
+            </ion-item>
+            <ion-item button @click="viewJobConfiguration({ id: 'COMPLET_MAIL_ODR', status: getJobStatus(jobEnums['COMPLET_MAIL_ODR']) })" detail>
+              <ion-label class="ion-text-wrap">{{ translate("Send Completed Order Mail") }}</ion-label>
+              <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('COMPLET_MAIL_ODR') }}</ion-label>
+              <ion-skeleton-text v-else style="width: 30%;" animated />
+            </ion-item>
             <ion-item lines="none">
               <ion-label class="ion-text-wrap">
-                <p>{{ translate("Sends notifications for open orders and ready-to-pickup orders.") }}</p>
+                <p>{{ translate("Sends notifications for open, ready-for-pickup BOPIS orders and brokered, packed, and completed Sales orders.") }}</p>
               </ion-label>
             </ion-item>
           </ion-card>
@@ -398,4 +413,4 @@ export default defineComponent({
   },
 });
 </script>
-
+
diff --git a/src/views/Inventory.vue b/src/views/Inventory.vue
@@ -19,6 +19,11 @@
               <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('HARD_SYNC') }}</ion-label>
               <ion-skeleton-text v-else style="width: 30%;" animated />
             </ion-item>
+            <ion-item button @click="viewJobConfiguration({ id: 'IMP_PROD_FACILITY', status: getJobStatus(jobEnums['IMP_PROD_FACILITY'])})" detail>
+              <ion-label class="ion-text-wrap">{{ translate("Import product facility") }}</ion-label>
+              <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('IMP_PROD_FACILITY') }}</ion-label>
+              <ion-skeleton-text v-else style="width: 30%;" animated />
+            </ion-item>
             <ion-item lines="none">
               <ion-label class="ion-text-wrap">
                 <p>{{ translate("Performing a hard sync from HotWax Commerce to Shopify is useful for eliminating any discrepencies.") }}</p>

diff --git a/src/views/Orders.vue b/src/views/Orders.vue
@@ -39,6 +39,11 @@
               <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('IMP_CANCELLED_ITEMS') }}</ion-label>
               <ion-skeleton-text v-else style="width: 30%;" animated />
             </ion-item>
+            <ion-item @click="viewJobConfiguration({ id: 'IMP_MISS_ORD', status: getJobStatus(jobEnums['IMP_MISS_ORD'])})" detail button>
+              <ion-label class="ion-text-wrap">{{ translate("Import last day orders from Shopify") }}</ion-label>
+              <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('IMP_MISS_ORD') }}</ion-label>
+              <ion-skeleton-text v-else style="width: 30%;" animated />
+            </ion-item>
             <ion-item @click="viewJobConfiguration({ id: 'IMP_RETURNS', status: getJobStatus(jobEnums['IMP_RETURNS'])})" detail button>
               <ion-label class="ion-text-wrap">{{ translate("Returns") }}</ion-label>
               <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('IMP_RETURNS') }}</ion-label>

diff --git a/src/views/Product.vue b/src/views/Product.vue
@@ -24,6 +24,11 @@
               <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('SYNC_PRDTS') }} </ion-label>
               <ion-skeleton-text v-else style="width: 30%;" animated />
             </ion-item>
+            <ion-item button @click="viewJobConfiguration({ id: 'ACT_PROD_SHPFY', status: getJobStatus(jobEnums['ACT_PROD_SHPFY'])})" detail>
+              <ion-label class="ion-text-wrap">{{ translate("Activate products on Shopify") }}</ion-label>
+              <ion-label v-if="!isLoading" slot="end">{{ getTemporalExpression('ACT_PROD_SHPFY') }} </ion-label>
+              <ion-skeleton-text v-else style="width: 30%;" animated />
+            </ion-item>
             <ion-item lines="none">
               <ion-label class="ion-text-wrap"><p>{{ translate("Sync products and category structures from Shopify into HotWax Commerce and keep them up to date.") }}</p></ion-label>
             </ion-item>