Skip to content
Open
Show file tree
Hide file tree
Changes from 1 commit
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 6 additions & 4 deletions src/components/TransferOrderItem.vue
Original file line number Diff line number Diff line change
Expand Up @@ -52,7 +52,7 @@
</ion-chip>
</div>

<div class="to-item-history" v-else>
<div class="to-item-history" v-else-if="!router.currentRoute.value.path.includes('/create-transfer-order/')">
<ion-chip outline @click="item.shippedQuantity && shippedHistory(item.productId)">
<ion-icon :icon="checkmarkDone"/>
<ion-label> {{ item.shippedQuantity || 0 }} {{ translate("shipped") }} </ion-label>
Expand All @@ -63,9 +63,11 @@
<ion-label>{{ item.orderedQuantity }} {{ translate("ordered") }}</ion-label>
</div>

<ion-item v-if="router.currentRoute.value.path.includes('/create-transfer-order/')" class="qty-qoh" lines="none">
<ion-label>{{ item.qoh != null ? item.qoh : '-' }} {{ translate("Qoh") }}</ion-label>
<ion-icon data-testid="remove-item-btn" slot="end" color="danger" :icon="removeCircleOutline" @click="removeOrderItem(item)" />
<ion-item v-if="router.currentRoute.value.path.includes('/create-transfer-order/')" class="ion-no-padding qty-qoh" lines="none">
<ion-label>{{ item.qoh != null ? item.qoh : 0 }} {{ translate("Qoh") }}</ion-label>
<ion-button fill="clear" size="default" color="medium" @click="removeOrderItem(item)">
<ion-icon data-testid="remove-item-btn" slot="icon-only" color="danger" :icon="removeCircleOutline" />
</ion-button>
</ion-item>
</div>
</ion-card>
Expand All @@ -85,7 +87,7 @@
modalController,
popoverController,
} from '@ionic/vue';
import { computed, defineComponent, onMounted } from 'vue';

Check warning on line 90 in src/components/TransferOrderItem.vue

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (18.x)

'onMounted' is defined but never used

Check warning on line 90 in src/components/TransferOrderItem.vue

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (20.x)

'onMounted' is defined but never used
import { add, caretDownOutline, checkmarkDone, closeCircleOutline, barcodeOutline, removeCircleOutline } from 'ionicons/icons';
import { mapGetters, useStore } from "vuex";
import { getProductIdentificationValue, DxpShopifyImg, translate, useProductIdentificationStore } from '@hotwax/dxp-components';
Expand Down Expand Up @@ -200,7 +202,7 @@
markPickedQuantityTouched() {
(this as any).$refs.pickedQuantity.$el.classList.add('ion-touched');
},
getErrorText(item: any) {

Check warning on line 205 in src/components/TransferOrderItem.vue

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (18.x)

'item' is defined but never used

Check warning on line 205 in src/components/TransferOrderItem.vue

View workflow job for this annotation

GitHub Actions / call-workflow-in-another-repo / reusable_workflow_job (20.x)

'item' is defined but never used
const path = this.router.currentRoute.value.path;
return path.includes('/create-transfer-order')
? translate("Please enter valid item quantity.")
Expand Down
12 changes: 6 additions & 6 deletions src/views/CreateTransferOrder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -55,8 +55,8 @@
</ion-item>
<!-- product found after scan (reads from searchedProduct) -->
<ion-item lines="none" v-if="searchedProduct.productId">
<ion-thumbnail>
<DxpShopifyImg :src="getProduct(searchedProduct.productId)?.mainImageUrl || searchedProduct.mainImageUrl" />
<ion-thumbnail slot="start">
<DxpShopifyImg :src="getProduct(searchedProduct.productId)?.mainImageUrl || searchedProduct.mainImageUrl" :key="getProduct(searchedProduct.productId)?.mainImageUrl || searchedProduct.mainImageUrl" />
</ion-thumbnail>
<ion-label>
{{ getProductIdentificationValue(barcodeIdentifier, getProduct(searchedProduct.productId)) }}
Expand All @@ -82,7 +82,7 @@

<!-- scanner not focused -->
<ion-item lines="none" v-else-if="!isScanningEnabled">
<ion-thumbnail>
<ion-thumbnail slot="start">
<DxpShopifyImg/>
</ion-thumbnail>
<ion-label>
Expand All @@ -98,7 +98,7 @@

<!-- default / idle state -->
<ion-item lines="none" v-else>
<ion-thumbnail>
<ion-thumbnail slot="start">
<DxpShopifyImg/>
</ion-thumbnail>
<ion-label>
Expand All @@ -122,8 +122,8 @@
<!-- result found -->
<ion-list lines="none" v-else-if="searchedProduct.productId">
<ion-item>
<ion-thumbnail>
<DxpShopifyImg :product="searchedProduct" />
<ion-thumbnail slot="start">
<DxpShopifyImg :src="searchedProduct.mainImageUrl" :key="searchedProduct.mainImageUrl" />
</ion-thumbnail>
<ion-label>
{{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(searchedProduct.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(searchedProduct.productId)) : getProduct(searchedProduct.productId)?.internalName }}
Expand Down
8 changes: 5 additions & 3 deletions src/views/ShipTransferOrder.vue
Original file line number Diff line number Diff line change
Expand Up @@ -26,8 +26,8 @@
<ion-list>
<ion-list-header>{{ translate("Items") }}</ion-list-header>
<ion-item v-for="item in shipmentItems" :key="item.shipmentItemSeqId">
<ion-thumbnail>
<DxpShopifyImg size="small" :src="getProduct(item.productId).mainImageUrl"/>
<ion-thumbnail slot="start">
<DxpShopifyImg size="small" :src="getProduct(item.productId).mainImageUrl" :key="getProduct(item.productId).mainImageUrl"/>
</ion-thumbnail>
<ion-label>
{{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : getProduct(item.productId)?.internalName }}
Expand Down Expand Up @@ -62,7 +62,9 @@
<!-- <p>estimated delivery date</p> -->
</ion-label>
<ion-note slot="end" class="ion-margin">{{ shipmentDetails.trackingIdNumber }}</ion-note>
<ion-icon data-testid="tracking-code-link" slot="end" :icon="openOutline" @click="redirectToTrackingUrl()"/>
<ion-button fill="clear" size="default" color="medium" @click="redirectToTrackingUrl()">
<ion-icon data-testid="tracking-code-link" slot="icon-only" :icon="openOutline" />
</ion-button>
</ion-item>
<ion-card-content>
<ion-button data-testid="reprint-label-btn" fill="outline" color="primary" @click="printShippingLabel">
Expand Down
Loading