Merge pull request #37 from bashu22tiwari/#1xx2h84

Improved code to get orderName if it is present and removed the code for order Identification (1xx2h84)
hotwax · Jan 6, 2022 · 668a80d · 668a80d
2 parents 9a51855 + 16ddea4
commit 668a80d
Show file tree

Hide file tree

Showing 4 changed files with 7 additions and 10 deletions.
diff --git a/.env b/.env
@@ -4,7 +4,6 @@ VUE_APP_RESOURCE_URL=
 VUE_APP_I18N_LOCALE=en
 VUE_APP_I18N_FALLBACK_LOCALE=en
 VUE_APP_VIEW_SIZE=10
-VUE_APP_ORD_IDENT_TYPE_ID=SHOPIFY_ORD_NAME
 VUE_APP_CUST_LOYALTY_OPTIONS={"LoyaltyCustomer":"Pass", "LoyaltyPlusOrder":"Pass +"}
 VUE_APP_POLL_TIME=10000
 VUE_APP_ORDER_FILTERS=["orderTypeId: SALES_ORDER", "facilityId:PRE_ORDER_PARKING OR facilityId:BACKORDER_PARKING", "orderStatusId: ORDER_APPROVED", "!orderItemStatusId: ITEM_CANCELLED" ]

diff --git a/changelogs/unreleased/-1xx2h84.yml b/changelogs/unreleased/-1xx2h84.yml
@@ -0,0 +1,6 @@
+---
+title: Improved code to get orderName if present and removed the code for order Identification
+ticket_id: "#1xx2h84"
+merge_request: 37
+author: Bashu Tiwari
+type: changed
diff --git a/src/views/orders.vue b/src/views/orders.vue
@@ -94,19 +94,13 @@
             <div class="order-id">
               <ion-item lines="none">
                 <ion-label>
-                  <h1>{{ order.doclist.docs[0].orderId }}</h1>
+                  <h1>{{ order.doclist.docs[0].orderName ? order.doclist.docs[0].orderName : order.doclist.docs[0].orderId }}</h1>
                   <p>{{ order.doclist.docs[0].customerPartyName }}</p>
                 </ion-label>
               </ion-item>
             </div>
 
             <div class="order-tags">
-              <!-- TODO Fix this. We need to call same filter twice -->
-              <ion-chip @click="copyToClipboard($filters.getOrderIdentificationId(order.doclist.docs[0].orderIdentifications, orderIdentificationTypeId))"  outline v-if="$filters.getOrderIdentificationId(order.doclist.docs[0].orderIdentifications, orderIdentificationTypeId)">
-                <ion-icon :icon="pricetag" />
-                <ion-label>{{ $filters.getOrderIdentificationId(order.doclist.docs[0].orderIdentifications, orderIdentificationTypeId) }}</ion-label>
-              </ion-chip>
-
               <ion-chip outline v-if="$filters.getCustomerLoyalty(order.doclist.docs[0].orderNotes, cusotmerLoyaltyOptions)">
                 <ion-icon :icon="ribbon" />
                 <ion-label>{{ $filters.getCustomerLoyalty(order.doclist.docs[0].orderNotes, cusotmerLoyaltyOptions) }}</ion-label>
@@ -264,7 +258,6 @@ export default defineComponent({
   },
   data() {
     return {
-      orderIdentificationTypeId: process.env.VUE_APP_ORD_IDENT_TYPE_ID,
       cusotmerLoyaltyOptions : JSON.parse(process.env?.VUE_APP_CUST_LOYALTY_OPTIONS),
     }
   },

diff --git a/src/views/products.vue b/src/views/products.vue
@@ -99,7 +99,6 @@ export default defineComponent({
   data() {
     return {
       queryString: '',
-      orderIdentificationTypeId: process.env.VUE_APP_ORD_IDENT_TYPE_ID,
       orderedAfter: '',
       orderedBefore: '',
       selectedItems: [] as any,