Merge pull request #465 from hotwax/#463

Improved: Displayed badge for kit (#463).
hotwax · Nov 19, 2024 · 2f10ec2 · 2f10ec2
2 parents c54ae7d + 7ebaf06
commit 2f10ec2
Showing 1 changed file with 13 additions and 7 deletions.
diff --git a/src/components/ProductListItem.vue b/src/components/ProductListItem.vue
@@ -6,14 +6,10 @@
     <ion-label class="ion-text-wrap">
       <h2>{{ getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) ? getProductIdentificationValue(productIdentificationPref.primaryId, getProduct(item.productId)) : getProduct(item.productId).productName }}</h2>
       <p class="ion-text-wrap">{{ getProductIdentificationValue(productIdentificationPref.secondaryId, getProduct(item.productId)) }}</p>
+      <ion-badge color="dark" v-if="isKit(item)">{{ translate("Kit") }}</ion-badge>
     </ion-label>
     <!-- Only show stock if its not a ship to store order -->
-    <div slot="end" v-if="!isShipToStoreOrder">
-      <ion-button v-if="isKit(item)" fill="clear" size="small" @click.stop="fetchKitComponents(item)">
-        <ion-icon v-if="showKitComponents" color="medium" slot="icon-only" :icon="chevronUpOutline"/>
-        <ion-icon v-else color="medium" slot="icon-only" :icon="listOutline"/>
-      </ion-button>
-
+    <div class="show-kit-components" slot="end" v-if="!isShipToStoreOrder">
       <ion-spinner v-if="isFetchingStock" color="medium" name="crescent" />
       <div v-else-if="getProductStock(item.productId).quantityOnHandTotal >= 0" class="atp-info">
         <ion-note slot="end"> {{ translate("on hand", { count: getProductStock(item.productId).quantityOnHandTotal ?? '0' }) }} </ion-note>
@@ -24,6 +20,12 @@
       <ion-button v-else fill="clear" @click.stop="fetchProductStock(item.productId)">
         <ion-icon color="medium" slot="icon-only" :icon="cubeOutline" />
       </ion-button>
+
+      <ion-button v-if="isKit(item)" fill="clear" size="small" @click.stop="fetchKitComponents(item)">
+        <ion-icon v-if="showKitComponents" color="medium" slot="icon-only" :icon="chevronUpOutline"/>
+        <ion-icon v-else color="medium" slot="icon-only" :icon="listOutline"/>
+      </ion-button>
+
     </div>  
   </ion-item>
 
@@ -52,7 +54,7 @@
 
 <script lang="ts">
 import { computed, defineComponent } from "vue";
-import { IonButton, IonCard, IonIcon, IonItem, IonLabel, IonNote, IonSkeletonText, IonSpinner, IonThumbnail, popoverController } from "@ionic/vue";
+import { IonBadge, IonButton, IonCard, IonIcon, IonItem, IonLabel, IonNote, IonSkeletonText, IonSpinner, IonThumbnail, popoverController } from "@ionic/vue";
 import { mapGetters, useStore } from 'vuex';
 import { getProductIdentificationValue, DxpShopifyImg, translate, useProductIdentificationStore } from '@hotwax/dxp-components'
 import { chevronUpOutline, cubeOutline, informationCircleOutline, listOutline } from 'ionicons/icons'
@@ -62,6 +64,7 @@ import { isKit } from '@/utils/order'
 export default defineComponent({
   name: "ProductListItem",
   components: {
+    IonBadge,
     IonButton,
     IonCard,
     IonIcon,
@@ -140,4 +143,7 @@ ion-thumbnail > img {
   align-items: center; 
   flex-direction: row; 
 }
+.show-kit-components {
+  justify-items: end;
+}
 </style>