diff --git a/.env.example b/.env.example
index 79dc852..7669ab1 100644
--- a/.env.example
+++ b/.env.example
@@ -8,6 +8,6 @@ VUE_APP_ALIAS={}
 VUE_APP_MAPPING_TYPES={"PO": "PO_MAPPING_PREF","RSTINV": "INV_MAPPING_PREF","RSTSTK": "STK_MAPPING_PREF"}
 VUE_APP_MAPPING_PO={"orderId": { "label": "Order ID", "required": true }, "productSku": { "label": "Shopify product SKU", "required": true },"orderDate": { "label": "Arrival date", "required": true }, "quantity": { "label": "Ordered quantity", "required": true }, "facility": { "label": "Facility ID", "required": true }}
 VUE_APP_MAPPING_RSTINV={"productIdentification": { "label": "Product Identification", "required": true }, "quantity": { "label": "Quantity", "required": true }, "facility": { "label": "Facility ID", "required": true }}
-VUE_APP_MAPPING_RSTSTK={"product": { "label": "Product", "required": true }, "facility": { "label": "Facility", "required": true }, "restockQuantity": { "label": "Restock quantity", "required": true }, "schedule": { "label": "Schedule", "required": false }, "shopifyStore": { "label": "Shopify store", "required": false }, "restockName": { "label": "Restock name", "required": false }}
+VUE_APP_MAPPING_RSTSTK={"product": { "label": "Product", "required": true }, "facility": { "label": "Facility", "required": true }, "restockQuantity": { "label": "Restock quantity", "required": true }}
 VUE_APP_DEFAULT_LOG_LEVEL="error"
 VUE_APP_LOGIN_URL="http://launchpad.hotwax.io/login"
\ No newline at end of file
diff --git a/src/components/ScheduledRestockPopover.vue b/src/components/ScheduledRestockPopover.vue
index 4effb87..0b6473a 100644
--- a/src/components/ScheduledRestockPopover.vue
+++ b/src/components/ScheduledRestockPopover.vue
@@ -2,12 +2,12 @@
   <ion-content>
     <ion-list>
       <ion-list-header>
-        jobname
+        {{ job.jobName || job.jobId }}
       </ion-list-header>
       <ion-item button>
         Reschedule
       </ion-item>
-      <ion-item button>
+      <ion-item button @click="cancelJob()" lines="none">
         Cancel
       </ion-item>
     </ion-list>
@@ -15,6 +15,10 @@
 </template>
     
 <script lang="ts">
+import logger from "@/logger";
+import { StockService } from "@/services/StockService";
+import { hasError, showToast } from "@/utils";
+import { translate } from "@hotwax/dxp-components";
 import {
   IonContent,
   IonItem,
@@ -22,6 +26,7 @@ import {
   IonListHeader
 } from "@ionic/vue";
 import { defineComponent } from "vue";
+import { useStore } from "vuex";
   
 export default defineComponent({
   name: "ScheduledRestockPopover",
@@ -31,10 +36,32 @@ export default defineComponent({
     IonList,
     IonListHeader
   },
+  props: ["job"],
+  methods: {
+    async cancelJob() {
+      let resp;
+      try {
+        resp = await StockService.cancelJob({
+          jobId: this.job.jobId
+        });
+        if (resp.status == 200 && !hasError(resp)) {
+          showToast(translate('Service updated successfully'))
+          await this.store.dispatch('stock/fetchJobs')
+        } else {
+          throw resp.data;
+        }
+      } catch (err) {
+        showToast(translate('Failed to cancel job'))
+        logger.error(err)
+      }
+      return resp;
+    },
+  },
 
   setup() {
-    
+    const store = useStore();
     return {
+      store
     }
   },
 });
diff --git a/src/services/StockService.ts b/src/services/StockService.ts
index 129f7db..453ba90 100644
--- a/src/services/StockService.ts
+++ b/src/services/StockService.ts
@@ -16,7 +16,25 @@ const fetchJobInformation = async (payload: any): Promise <any>  => {
   });
 }
 
+const updateJob = async (payload: any): Promise <any>  => {
+  return api({
+    url: "service/updateJobSandbox",
+    method: "post",
+    data: payload
+  });
+}
+
+const cancelJob = async (payload: any): Promise <any> => {
+  return api({
+    url: "service/cancelScheduledJob",
+    method: "post",
+    data: payload
+  });
+}
+
 export const StockService = {
+  cancelJob,
   scheduleJob,
-  fetchJobInformation
+  fetchJobInformation,
+  updateJob
 }
\ No newline at end of file
diff --git a/src/store/index.ts b/src/store/index.ts
index b05f7e7..98c0a33 100644
--- a/src/store/index.ts
+++ b/src/store/index.ts
@@ -22,7 +22,7 @@ const state: any = {
 }
 
 const persistState = createPersistedState({
-    paths: ['user'],
+    paths: ['user', 'util.productStores'],
     fetchBeforeUse: true
 })
 
diff --git a/src/store/modules/stock/actions.ts b/src/store/modules/stock/actions.ts
index b864af1..6145a79 100644
--- a/src/store/modules/stock/actions.ts
+++ b/src/store/modules/stock/actions.ts
@@ -9,7 +9,6 @@ import { StockService } from "@/services/StockService";
 import { translate } from "@hotwax/dxp-components";
 import logger from "@/logger";
 import { DateTime } from 'luxon'
-import router from '@/router'
 
 const actions: ActionTree<StockState, RootState> = {
   async processUpdateStockItems ({ commit, rootGetters }, items) {
@@ -86,7 +85,7 @@ const actions: ActionTree<StockState, RootState> = {
     }, {});
     const facilityIds = externalFacilityIds.map((externalFacilityId: any) => facilityMapping[externalFacilityId]).filter((facilityId: any) => facilityId);
     const cachedProducts = await store.dispatch("product/fetchProducts", payload);
-    
+
     const initial = items.map((item: any) => {
       const product = cachedProducts[item.product];
       
@@ -127,7 +126,7 @@ const actions: ActionTree<StockState, RootState> = {
 
       const payload = {
         'JOB_NAME': restockName || state.schedule.restockName || `Created ${DateTime.now().toLocaleString(DateTime.DATETIME_MED)}`,
-        'SERVICE_NAME': "shipPackedOrders", // TODO: make dynamic
+        'SERVICE_NAME': job.serviceName,
         'SERVICE_COUNT': '0',
         'SERVICE_TEMP_EXPR': job.jobStatus,
         'SERVICE_RUN_AS_SYSTEM':'Y',
@@ -137,7 +136,7 @@ const actions: ActionTree<StockState, RootState> = {
           'maxRecurrenceCount': '-1',
           'parentJobId': job.parentJobId,
           'runAsUser': 'system', //default system, but empty in run now.  TODO Need to remove this as we are using SERVICE_RUN_AS_SYSTEM, currently kept it for backward compatibility
-          'recurrenceTimeZone': this.state.user.current.userTimeZone,
+          'recurrenceTimeZone': this.state.user.current.usershipPackedOrdersTimeZone,
           'createdByUserLogin': this.state.user.current.userLoginId,
           'lastModifiedByUserLogin': this.state.user.current.userLoginId,
         },
@@ -154,14 +153,6 @@ const actions: ActionTree<StockState, RootState> = {
         resp = await StockService.scheduleJob({ ...payload });
         if (resp.status == 200 && !hasError(resp)) {
           showToast(translate('Service has been scheduled'));
-          // await dispatch('fetchJobs', {
-          //   inputFields: {
-          //     'systemJobEnumId': payload.systemJobEnumId,
-          //     'systemJobEnumId_op': 'equals',
-          //   },
-          //   orderBy: "runTime ASC"
-          // })
-          router.push('/scheduled-restock')
         } else {
           showToast(translate('Something went wrong'))
         }
@@ -256,4 +247,4 @@ const actions: ActionTree<StockState, RootState> = {
   }
 }
 
-export default actions;
+export default actions;
\ No newline at end of file
diff --git a/src/views/ScheduledRestock.vue b/src/views/ScheduledRestock.vue
index 4eefa1f..3b237fd 100644
--- a/src/views/ScheduledRestock.vue
+++ b/src/views/ScheduledRestock.vue
@@ -19,11 +19,11 @@
         <ion-list>
           <ion-list-header>{{ translate("Saved mappings") }}</ion-list-header>
           <div>
-            <ion-chip outline @click="addFieldMapping()"> 
+            <ion-chip :disabled="!this.content.length" outline @click="addFieldMapping()"> 
               <ion-icon :icon="addOutline" />
               <ion-label>{{ translate("New mapping") }}</ion-label>
             </ion-chip>
-            <ion-chip outline="true" v-for="(mapping, index) in fieldMappings('RSTSTK') ?? []" :key="index" @click="mapFields(mapping)"> 
+            <ion-chip :disabled="!this.content.length" outline="true" v-for="(mapping, index) in fieldMappings('RSTSTK') ?? []" :key="index" @click="mapFields(mapping)"> 
               {{ mapping.name }}
             </ion-chip>
           </div>
@@ -81,12 +81,12 @@
           </ion-item>
         </ion-list>
         
-        <ion-button color="medium" expand="block" class="review" @click="review()">
+        <ion-button :disabled="!this.content.length" color="medium" expand="block" class="review" @click="review()">
           {{ translate("Review") }}
           <ion-icon slot="end" :icon="arrowForwardOutline" />
         </ion-button>
 
-        <ion-list>
+        <ion-list v-if="jobs.length">
           <ion-list-header>Scheduled Restock</ion-list-header>
           <ion-item v-for="job in jobs" :key="job.jobId">
             <ion-label>
@@ -94,11 +94,23 @@
                 {{ job.jobName }}
               <p>inbound</p>
             </ion-label>
-            <ion-button color="light">{{ getTime(job.runTime) }}</ion-button> 
-            <ion-button fill="clear" color="medium" @click="openScheduledRestockPopover($event)">
+            <ion-button color="light" @click="changeRunTime(job)">{{ getTime(job.runTime) }}</ion-button>
+            <ion-button fill="clear" color="medium" @click="openScheduledRestockPopover($event, job)">
               <ion-icon slot="icon-only" :icon="ellipsisVerticalOutline" />
-            </ion-button>     
+            </ion-button> 
           </ion-item>
+          <ion-modal class="date-time-modal" :is-open="isUpdateDateTimeModalOpen" @didDismiss="() => isUpdateDateTimeModalOpen = false">
+            <ion-content force-overscroll="false">
+              <ion-datetime    
+                id="schedule-datetime"        
+                show-default-buttons 
+                hour-cycle="h23"
+                presentation="date-time"
+                :value="currentJob.runTime ? getDateTime(currentJob.runTime) : getDateTime(DateTime.now().toMillis())"
+                @ionChange="changeJobRunTime($event)"
+              />
+            </ion-content>
+          </ion-modal>
         </ion-list>
 
       </main>
@@ -120,6 +132,7 @@ import CreateMappingModal from "@/components/CreateMappingModal.vue";
 import { DateTime } from 'luxon';
 import { UtilService } from '@/services/UtilService'
 import logger from "@/logger";
+import { StockService } from "@/services/StockService";
 
 export default defineComponent({
   name: "ScheduledRestock",
@@ -156,18 +169,24 @@ export default defineComponent({
       shopifyShops: [],
       restockName: '',
       selectedProductStoreId: '',
-      selectedShopifyShopId: ''
+      selectedShopifyShopId: '',
+      isUpdateDateTimeModalOpen: false,
+      shopId: '',
+      currentJob: {}
     }
   },
   computed: {
     ...mapGetters({
       fieldMappings: 'user/getFieldMappings',
       jobs: 'stock/getScheduledJobs',
-      productStores: 'util/getProductStores'
+      productStores: 'util/getProductStores',
+      userProfile: 'user/getUserProfile'
     })
   },
   mixins:[ parseFileMixin ],
   async ionViewDidEnter() {
+    this.selectedProductStoreId = ""
+    this.selectedShopifyShopId = ""
     this.file = {}
     this.content = []
     this.fieldMapping = Object.keys(this.fields)?.reduce((fieldMapping, field) => {
@@ -204,6 +223,10 @@ export default defineComponent({
     updateTime() {
       this.isDateTimeModalOpen = true
     },
+    changeRunTime(job) {
+      this.currentJob = job
+      this.isUpdateDateTimeModalOpen = true
+    },
     getTime(time) {
       return DateTime.fromMillis(time, { setZone: true}).toFormat("hh:mm a dd MMM yyyy")
     },
@@ -216,6 +239,49 @@ export default defineComponent({
       }
       this.schedule = setTime;
     },
+    changeJobRunTime(event) {
+      const currentTime = DateTime.now().toMillis();
+      const setTime = DateTime.fromISO(event.detail.value).toMillis();
+      if (setTime < currentTime) {
+        showToast('Please provide a future date and time');
+        return;
+      }
+      this.updateJob(setTime)
+    },
+    async updateJob(updatedTime) {
+      let resp;
+      const job = {
+        ...this.currentJob,
+        runTime: updatedTime
+      }
+
+      const payload = {
+        'jobId': job.jobId,
+        'systemJobEnumId': job.systemJobEnumId,
+        'recurrenceTimeZone': this.userProfile.userTimeZone,
+        'tempExprId': job.jobStatus,
+        'statusId': "SERVICE_PENDING",
+        'runTimeEpoch': '',  // when updating a job clearning the epoch time, as job honors epoch time as runTime and the new job created also uses epoch time as runTime
+        'lastModifiedByUserLogin': this.userProfile.userLoginId
+      }
+
+      job?.runTime && (payload['runTime'] = job.runTime)
+      job?.sinceId && (payload['sinceId'] = job.sinceId)
+      job?.jobName && (payload['jobName'] = job.jobName)
+
+      try {
+        resp = await StockService.updateJob(payload)
+        if (!hasError(resp) && resp.data.successMessage) {
+          await this.store.dispatch('stock/fetchJobs')
+          showToast(translate('Service updated successfully'))
+        } else {
+          throw resp.data
+        }
+      } catch (err) {
+        showToast(translate('Failed to update job'))
+        logger.error(err)
+      }
+    },
     mapFields(mapping) {
       const fieldMapping = JSON.parse(JSON.stringify(mapping));
 
@@ -251,29 +317,20 @@ export default defineComponent({
         showToast(translate("Please upload a valid reset inventory csv to continue"));
       }
     },
-    async openScheduledRestockPopover(ev) {
+    async openScheduledRestockPopover(ev, job) {
       const popover = await popoverController.create({
         component: ScheduledRestockPopover,
         event: ev,
         translucent: true,
         showBackdrop: false,
+        componentProps: { job }
       });
       return popover.present();
     },
-    review() {
-      // const areAllFieldsSelected = Object.values(this.fieldMapping).every(field => field !== "");
-      // if (!areAllFieldsSelected) {
-      //   showToast(translate("Select all the fields to continue"));
-      //   return;
-      // } 
-
-      if(!this.selectedProductStoreId) {
-        showToast(translate("Please select product store."));
-        return;
-      }
-
-      if(!this.selectedProductStoreId) {
-        showToast(translate("Please select shopify shop"));
+    async review() {
+      const areAllFieldsSelected = Object.values(this.fieldMapping).every(field => field !== "");
+      if (!areAllFieldsSelected) {
+        showToast(translate("Select all the fields to continue"));
         return;
       }
 
@@ -287,9 +344,8 @@ export default defineComponent({
         }
       })
 
-      console.log('this.schedule', this.schedule)
-      this.store.dispatch('stock/processUpdateRestockItems', restockItems);
-      this.store.dispatch('stock/scheduledStock', {
+      await this.store.dispatch('stock/processUpdateRestockItems', restockItems);
+      await this.store.dispatch('stock/scheduledStock', {
         productStoreId: this.selectedProductStoreId,
         shopId: this.selectedShopifyShopId,
         restockName: this.restockName,
@@ -310,8 +366,10 @@ export default defineComponent({
       this.selectedShopifyShopId = ''
       this.selectedProductStoreId = event.detail.value;
       this.fetchShopifyShops(this.selectedProductStoreId);
-    }
-
+    },
+    getDateTime(time) {
+      return DateTime.fromMillis(time).toISO()
+    },
   },
   setup() {
     const router = useRouter();
diff --git a/src/views/ScheduledRestockReview.vue b/src/views/ScheduledRestockReview.vue
index fb90446..43ed978 100644
--- a/src/views/ScheduledRestockReview.vue
+++ b/src/views/ScheduledRestockReview.vue
@@ -34,7 +34,7 @@
                   show-default-buttons 
                   hour-cycle="h23"
                   presentation="date-time"
-                  :value="schedule.scheduledTime ? getTime(schedule.scheduledTime) : DateTime.now()"
+                  :value="schedule.scheduledTime ? getDateTime(schedule.scheduledTime) : getDateTime(DateTime.now().toMillis())"
                   @ionChange="updateCustomTime($event)"
                 />
               </ion-content>
@@ -47,6 +47,7 @@
               </ion-select>
             </ion-item>
             <ion-item>
+              <ion-icon slot="start" :icon="globeOutline"/>
               <ion-select :label="translate('Product store')" interface="popover" :value="selectedProductStoreId" @ionChange="updateProductStore($event)">
                 <ion-select-option v-for="productStore in productStores" :key="productStore.productStoreId" :value="productStore.productStoreId">
                   {{ productStore.storeName || productStore.productStoreId}}
@@ -61,14 +62,6 @@
                 </ion-select-option>
               </ion-select>
             </ion-item>
-            <!-- <ion-item>
-              <ion-icon slot="start" :icon="globeOutline"/>
-              <ion-select label="Shopify Store" interface="popover" :placeholder = "translate('Select')">
-              <ion-select-option :value="schedule.shopId" v-for="shop in shopifyShops" :key="shop.shopId">
-                {{ shop.name ? shop.name : shop.shopId }}
-              </ion-select-option>
-              </ion-select>
-            </ion-item> -->
             <ion-item lines="none">
               <ion-input label="Restock name" placeholder="name" v-model="restockName"></ion-input>
             </ion-item>
@@ -100,8 +93,8 @@
           <ion-checkbox :checked="item.isSelected" @ion-change="selectListItem(item)"/>
         </div>
       </div>
-      <ion-fab ion-fab vertical="bottom" horizontal="end" slot="fixed">
-        <ion-fab-button @click="save" :disabled="!selectedProductStoreId">
+      <ion-fab vertical="bottom" horizontal="end" slot="fixed">
+        <ion-fab-button @click="save" :disabled="!Object.keys(parsedItems).length">
           <ion-icon :icon="cloudUploadOutline" />
         </ion-fab-button>
       </ion-fab>
@@ -111,17 +104,18 @@
   
 <script>
 import { defineComponent } from "vue";
-import { IonBackButton, IonButton, IonButtons, IonCheckbox, IonChip, IonContent,IonFab,IonFabButton, IonHeader, IonIcon, IonInput, IonItem, IonLabel, IonList, IonPage, IonSearchbar, IonSelect, IonSelectOption, IonThumbnail, IonTitle, IonToolbar, alertController} from "@ionic/vue";
-import { translate } from "@hotwax/dxp-components";
-import { DxpShopifyImg } from "@hotwax/dxp-components";
+import { IonBackButton, IonButton, IonButtons, IonCheckbox, IonChip, IonContent, IonDatetime, IonFab, IonFabButton, IonHeader, IonIcon, IonInput, IonItem, IonLabel, IonList, IonModal, IonPage, IonSearchbar, IonSelect, IonSelectOption, IonThumbnail, IonTitle, IonToolbar, alertController} from "@ionic/vue";
+import { DxpShopifyImg, translate } from "@hotwax/dxp-components";
 import { arrowUndoOutline, checkboxOutline, timerOutline, businessOutline, cloudUploadOutline, globeOutline} from "ionicons/icons"
 import { mapGetters, useStore } from "vuex";
 import { DateTime } from 'luxon';
-import { jsonToCsv, showToast } from '@/utils';
+import { showToast } from '@/utils';
 import { UploadService } from "@/services/UploadService";
 import { hasError } from "@/adapter";
 import logger from "@/logger";
 import { UtilService } from '@/services/UtilService'
+import emitter from "@/event-bus";
+import { useRouter } from "vue-router";
 
 
 export default defineComponent({
@@ -134,6 +128,7 @@ export default defineComponent({
     IonCheckbox,
     IonChip,
     IonContent,
+    IonDatetime,
     IonFab,
     IonFabButton,
     IonHeader,
@@ -142,6 +137,7 @@ export default defineComponent({
     IonItem,
     IonLabel,
     IonList,
+    IonModal,
     IonPage,
     IonSearchbar,
     IonSelect,
@@ -179,9 +175,12 @@ export default defineComponent({
     this.getFilteredRestockItems();
     this.restockName = this.schedule.restockName
     this.selectedProductStoreId = this.schedule.productStoreId;
-    this.selectedShopifyShopId =  this.schedule.shopId,
+    this.selectedShopifyShopId = this.schedule.shopId
     this.scheduledTime = this.schedule.scheduledTime;
-    this.fetchShopifyShops(this.selectedProductStoreId);
+
+    if(this.selectedProductStoreId) {
+      this.fetchShopifyShops(this.selectedProductStoreId);
+    }
   },
   // async beforeRouteLeave(to) { 
   //   if(to.path === "/login" ) return;
@@ -215,7 +214,7 @@ export default defineComponent({
   methods: {
     getFilteredRestockItems() {
       const filteredItems = {};
-      
+
       this.restockItems.map((item) => {
         if(filteredItems[item.externalFacilityId]) filteredItems[item.externalFacilityId].push(item)
         else filteredItems[item.externalFacilityId] = [item];
@@ -243,14 +242,13 @@ export default defineComponent({
       }
       this.schedule.scheduledTime = setTime;
     },
-    async save(){
-
+    async save() {
       if(!this.selectedProductStoreId) {
-        showToast(translate("Please select product store."));
+        showToast(translate("Please select product store"));
         return;
       }
 
-      if(!this.selectedProductStoreId) {
+      if(!this.selectedShopifyShopId) {
         showToast(translate("Please select shopify shop"));
         return;
       }
@@ -291,24 +289,28 @@ export default defineComponent({
             {
               text: translate("Upload"),
               handler: async () => {
-                try{
+                emitter.emit("presentLoader")
+                try {
                   const resp = await UploadService.createIncomingShipment(uploadData)
                   if(!hasError(resp) && resp.data.shipmentId) {
-                    this.store.dispatch("stock/scheduleService", { params: {
-                      shipmentId: resp.data.shipmentId,
-                      shopId: this.selectedShopifyShopId
-                    },
-                    restockName: this.restockName,
-                    scheduledTime: this.scheduledTime,
-                    productStoreId: this.selectedProductStoreId
-                   }) 
+                    await this.store.dispatch("stock/scheduleService", { 
+                      params: {
+                        shipmentId: resp.data.shipmentId,
+                        shopId: this.selectedShopifyShopId,
+                        productStoreId: this.selectedProductStoreId
+                      },
+                      restockName: this.restockName,
+                      scheduledTime: this.scheduledTime,
+                    })
                   } else {
                     throw resp.data;
                   }
                 } catch(err) {
-                  showToast(translate("Failed to create shipment"))
-                  console.error(err)
+                  showToast(translate("Failed to schedule job"))
+                  logger.error('Failed to create shipment', err)
                 }
+                emitter.emit("dismissLoader")
+                this.router.push('/scheduled-restock')
               }
             },
           ],
@@ -376,9 +378,13 @@ export default defineComponent({
       }
       this.shopifyShops = shopifyShops
     },
+    getDateTime(time) {
+      return DateTime.fromMillis(time).toISO()
+    },
   },
   setup() {
     const store = useStore();
+    const router = useRouter();
 
     return {
       translate,
@@ -389,7 +395,8 @@ export default defineComponent({
       store,
       cloudUploadOutline,
       DateTime,
-      globeOutline
+      globeOutline,
+      router
     }
   }
 })
@@ -436,4 +443,4 @@ export default defineComponent({
     padding: 0;
   }
 }
-</style>
+</style>
\ No newline at end of file