Merge pull request #778 from amansinghbais/#749

Improved: displaying invoicing facilty on the order invoicing card (#749)
hotwax · Sep 24, 2024 · 8411101 · 8411101
2 parents 1a8cc04 + 101c4b9
commit 8411101
Show file tree

Hide file tree

Showing 4 changed files with 15 additions and 1 deletion.
diff --git a/src/locales/en.json b/src/locales/en.json
@@ -257,6 +257,7 @@
   "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.": "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.",
   "Import shipped orders": "Import shipped orders",
   "In Progress": "In Progress",
+  "Invoicing facility": "Invoicing facility",
   "Key": "Key",
   "Kit": "Kit",
   "Language": "Language",

diff --git a/src/locales/es.json b/src/locales/es.json
@@ -253,6 +253,7 @@
   "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.": "Importa los detalles de los pedidos enviados desde un sistema externo basado en códigos de seguimiento. Los pedidos que tienen códigos de seguimiento se enviarán automáticamente al final del día.",
   "Import shipped orders": "Importar pedidos enviados",
   "In Progress": "En Curso",
+  "Invoicing facility": "Invoicing facility",
   "Key": "Clave",
   "Kit": "Kit",
   "Language": "Lenguaje",

diff --git a/src/locales/ja.json b/src/locales/ja.json
@@ -257,6 +257,7 @@
   "Import shipped order details from an external system based on tracking codes. Orders that have tracking codes will automatically be shipped at the end of the day.": "追跡コードに基づいて外部システムから出荷済み注文の詳細をインポートします。追跡コードのある注文は、日末に自動的に出荷されます。",
   "Import shipped orders": "出荷済み注文をインポート",
   "In Progress": "進行中",
+  "Invoicing facility": "Invoicing facility",
   "Key": "キー",
   "Language": "言語",
   "Last 7 days": "過去7日間",

diff --git a/src/views/OrderDetail.vue b/src/views/OrderDetail.vue
@@ -293,6 +293,13 @@
               </ion-card-title>
             </ion-card-header>
 
+            <ion-item v-if="orderInvoicingInfo.invoicingFacility?.facilityId">
+              <ion-label>
+                {{ orderInvoicingInfo.invoicingFacility?.facilityName ? orderInvoicingInfo.invoicingFacility.facilityName : orderInvoicingInfo.invoicingFacility.facilityId }}
+                <p>{{ translate("Invoicing facility") }}</p>
+              </ion-label>
+            </ion-item>
+
             <ion-item v-if="orderInvoicingInfo.invoicingConfirmationDate">
               <ion-label>
                 <p class="overline">{{ getInvoicingConfirmationDate(orderInvoicingInfo.invoicingConfirmationDate) }}</p>
@@ -1528,12 +1535,16 @@ export default defineComponent({
         if(!hasError(resp) && resp.data?.response?.docs?.length) {
           const response = resp.data.response.docs[0];
 
+          const request = Object.keys(response.request_txt_en).length ? JSON.parse(response.request_txt_en) : {}
+          const invoicingFacility = this.userProfile.facilities.find((facility: any) => facility.facilityId === request.InvoicingStore)
+
           orderInvoicingInfo = {
             id: response.id,
             createdDate: response.createdDate_dt,
             response : Object.keys(response.response_txt_en).length ? JSON.parse(response.response_txt_en) : {},
             status: response.status_txt_en,
-            statusCode: response.statusCode_txt_en
+            statusCode: response.statusCode_txt_en,
+            invoicingFacility
           }
 
           const params = {