Skip to content

Commit

Permalink
Merge pull request #865 from R-Sourabh/#678-Regenerate-Shipping-Label…
Browse files Browse the repository at this point in the history
…-spinner

Improved: enable ion-spinner on 'Regenerate Shipping Label' Action in Completed Tab & upgrade the @hotwax/app-theme version(#678)
  • Loading branch information
ymaheshwari1 authored Dec 9, 2024
2 parents 195b920 + 0d9cf7f commit 17926aa
Show file tree
Hide file tree
Showing 3 changed files with 9 additions and 10 deletions.
8 changes: 4 additions & 4 deletions package-lock.json

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

2 changes: 1 addition & 1 deletion package.json
Original file line number Diff line number Diff line change
Expand Up @@ -19,7 +19,7 @@
"@capacitor/core": "^2.4.7",
"@casl/ability": "^6.0.0",
"@hotwax/app-version-info": "^1.0.0",
"@hotwax/apps-theme": "^1.2.6",
"@hotwax/apps-theme": "^1.2.8",
"@hotwax/dxp-components": "^1.16.0",
"@hotwax/oms-api": "^1.16.0",
"@ionic/core": "^7.6.0",
Expand Down
9 changes: 4 additions & 5 deletions src/views/Completed.vue
Original file line number Diff line number Diff line change
Expand Up @@ -44,7 +44,7 @@
</div>
<div class="results">
<ion-button :disabled="isShipNowDisabled || !hasAnyPackedShipment() || hasAnyMissingInfo() || (hasAnyShipmentTrackingInfoMissing() && !hasPermission(Actions.APP_FORCE_SHIP_ORDER))" expand="block" class="bulk-action desktop-only" fill="outline" size="large" @click="bulkShipOrders()">{{ translate("Ship") }}</ion-button>
<ion-card class="order" v-for="(order, index) in getCompletedOrders()" :key="index">
<ion-card class="order" v-for="(order, index) in completedOrdersList" :key="index">
<div class="order-header">
<div class="order-primary-info">
<ion-label>
Expand Down Expand Up @@ -256,7 +256,8 @@ export default defineComponent({
shipmentMethods: [] as Array<any>,
carrierPartyIds: [] as Array<any>,
searchedQuery: '',
isScrollingEnabled: false
isScrollingEnabled: false,
completedOrdersList: [] as any
}
},
computed: {
Expand All @@ -275,6 +276,7 @@ export default defineComponent({
async mounted() {
await Promise.all([this.initialiseOrderQuery(), this.fetchShipmentMethods(), this.fetchCarrierPartyIds()]);
emitter.on('updateOrderQuery', this.updateOrderQuery)
this.completedOrdersList = JSON.parse(JSON.stringify(this?.completedOrders.list)).slice(0, (this.completedOrders.query.viewIndex + 1) * (process.env.VUE_APP_VIEW_SIZE as any));
},
unmounted() {
this.store.dispatch('order/clearCompletedOrders')
Expand Down Expand Up @@ -305,9 +307,6 @@ export default defineComponent({
const updatedItem = updatedOrder.items.find((item: any) => item.orderItemSeqId === orderItem.orderItemSeqId)
updatedItem.showKitComponents = orderItem.showKitComponents ? false : true
},
getCompletedOrders() {
return JSON.parse(JSON.stringify(this.completedOrders.list)).slice(0, (this.completedOrders.query.viewIndex + 1) * (process.env.VUE_APP_VIEW_SIZE as any));
},
enableScrolling() {
const parentElement = (this as any).$refs.contentRef.$el
const scrollEl = parentElement.shadowRoot.querySelector("main[part='scroll']")
Expand Down

0 comments on commit 17926aa

Please sign in to comment.