feat(admin-ui): Display original quantity after order has been modified

vendure-ecommerce · Sep 27, 2023 · a36c6e0 · a36c6e0
1 parent 8452300
commit a36c6e0
Show file tree

Hide file tree

Showing 21 changed files with 173 additions and 139 deletions.
diff --git a/packages/admin-ui/i18n-coverage.json b/packages/admin-ui/i18n-coverage.json
@@ -1,81 +1,81 @@
 {
-  "generatedOn": "2023-09-26T12:56:03.801Z",
-  "lastCommit": "fee995c967c5487e979e374802f651ce3120db6d",
+  "generatedOn": "2023-09-26T14:59:13.502Z",
+  "lastCommit": "8452300ac7407d04794507cee99cf4436e4fce71",
   "translationStatus": {
     "ar": {
-      "tokenCount": 760,
-      "translatedCount": 757,
+      "tokenCount": 761,
+      "translatedCount": 760,
       "percentage": 100
     },
     "cs": {
-      "tokenCount": 760,
-      "translatedCount": 564,
-      "percentage": 74
+      "tokenCount": 761,
+      "translatedCount": 570,
+      "percentage": 75
     },
     "de": {
-      "tokenCount": 760,
-      "translatedCount": 757,
+      "tokenCount": 761,
+      "translatedCount": 760,
       "percentage": 100
     },
     "en": {
-      "tokenCount": 760,
-      "translatedCount": 757,
+      "tokenCount": 761,
+      "translatedCount": 760,
       "percentage": 100
     },
     "es": {
-      "tokenCount": 760,
-      "translatedCount": 757,
+      "tokenCount": 761,
+      "translatedCount": 760,
       "percentage": 100
     },
     "fr": {
-      "tokenCount": 760,
-      "translatedCount": 753,
+      "tokenCount": 761,
+      "translatedCount": 757,
       "percentage": 99
     },
     "he": {
-      "tokenCount": 760,
-      "translatedCount": 757,
+      "tokenCount": 761,
+      "translatedCount": 760,
       "percentage": 100
     },
     "it": {
-      "tokenCount": 760,
-      "translatedCount": 756,
-      "percentage": 99
+      "tokenCount": 761,
+      "translatedCount": 759,
+      "percentage": 100
     },
     "pl": {
-      "tokenCount": 760,
+      "tokenCount": 761,
       "translatedCount": 399,
-      "percentage": 53
+      "percentage": 52
     },
     "pt_BR": {
-      "tokenCount": 760,
-      "translatedCount": 756,
-      "percentage": 99
+      "tokenCount": 761,
+      "translatedCount": 759,
+      "percentage": 100
     },
     "pt_PT": {
-      "tokenCount": 760,
-      "translatedCount": 598,
-      "percentage": 79
+      "tokenCount": 761,
+      "translatedCount": 608,
+      "percentage": 80
     },
     "ru": {
-      "tokenCount": 760,
-      "translatedCount": 757,
+      "tokenCount": 761,
+      "translatedCount": 760,
       "percentage": 100
     },
     "uk": {
-      "tokenCount": 760,
-      "translatedCount": 588,
-      "percentage": 77
+      "tokenCount": 761,
+      "translatedCount": 595,
+      "percentage": 78
     },
     "zh_Hans": {
-      "tokenCount": 760,
-      "translatedCount": 534,
-      "percentage": 70
+      "tokenCount": 761,
+      "translatedCount": 540,
+      "percentage": 71
     },
     "zh_Hant": {
-      "tokenCount": 760,
-      "translatedCount": 380,
-      "percentage": 50
+      "tokenCount": 761,
+      "translatedCount": 386,
+      "percentage": 51
     }
   }
 }
diff --git a/packages/admin-ui/src/lib/core/src/common/generated-types.ts b/packages/admin-ui/src/lib/core/src/common/generated-types.ts
diff --git a/packages/admin-ui/src/lib/core/src/data/definitions/order-definitions.ts b/packages/admin-ui/src/lib/core/src/data/definitions/order-definitions.ts
@@ -148,6 +148,7 @@ export const ORDER_LINE_FRAGMENT = gql`
         proratedUnitPrice
         proratedUnitPriceWithTax
         quantity
+        orderPlacedQuantity
         linePrice
         lineTax
         linePriceWithTax

diff --git a/packages/admin-ui/src/lib/order/src/components/order-table/order-table-mixin.scss b/packages/admin-ui/src/lib/order/src/components/order-table/order-table-mixin.scss
@@ -68,4 +68,9 @@
         font-size: var(--font-size-xs);
         margin-inline-end: 2px;
     }
+    .order-placed-quantity {
+        text-decoration: line-through;
+        color: var(--color-text-300);
+        margin-inline-end: 2px;
+    }
 }
diff --git a/packages/admin-ui/src/lib/order/src/components/order-table/order-table.component.html b/packages/admin-ui/src/lib/order/src/components/order-table/order-table.component.html
@@ -37,7 +37,16 @@
     <vdr-dt2-column [heading]="'order.quantity' | translate" id="quantity" [optional]="false">
         <ng-template let-line="item">
             <ng-container *ngIf="!isDraft; else draft">
-                {{ line.quantity }}
+                <div class="flex">
+                    <div
+                        *ngIf="line.orderPlacedQuantity && line.quantity !== line.orderPlacedQuantity"
+                        class="order-placed-quantity"
+                        [title]="'order.original-quantity-at-checkout' | translate"
+                    >
+                        {{ line.orderPlacedQuantity }}
+                    </div>
+                    <div>{{ line.quantity }}</div>
+                </div>
             </ng-container>
             <ng-template #draft>
                 <div class="flex">
@@ -62,7 +71,10 @@
             ></vdr-line-fulfillment>
         </ng-template>
     </vdr-dt2-column>
-    <vdr-dt2-custom-field-column *ngFor="let customField of orderLineCustomFields" [customField]="customField"/>
+    <vdr-dt2-custom-field-column
+        *ngFor="let customField of orderLineCustomFields"
+        [customField]="customField"
+    />
     <vdr-order-total-column [heading]="'order.total' | translate" id="total" [optional]="false">
         <ng-template let-line="item">
             <div class="unit-price">
@@ -81,7 +93,7 @@
                         <div class="line-promotion" *ngFor="let discount of discounts">
                             <a class="promotion-name" [routerLink]="getPromotionLink(discount)">{{
                                 discount.description
-                                }}</a>
+                            }}</a>
                             <div class="promotion-amount">
                                 {{ discount.amountWithTax | localeCurrency : order.currencyCode }}
                                 <div class="net-price" [title]="'order.net-price' | translate">

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/ar.json b/packages/admin-ui/src/lib/static/i18n-messages/ar.json
@@ -616,6 +616,7 @@
     "order-type-regular": "عادي",
     "order-type-seller": "تاجر",
     "orders": "طلبيات",
+    "original-quantity-at-checkout": "الكمية الأصلية عند الخروج",
     "payment": "قسط",
     "payment-amount": "مبلغ الدفع",
     "payment-metadata": "بيانات تعريف الدفع",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/cs.json b/packages/admin-ui/src/lib/static/i18n-messages/cs.json
@@ -616,6 +616,7 @@
     "order-type-regular": "",
     "order-type-seller": "",
     "orders": "",
+    "original-quantity-at-checkout": "Původní množství při pokladně",
     "payment": "Platba",
     "payment-amount": "Částka platby",
     "payment-metadata": "Data platby",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/de.json b/packages/admin-ui/src/lib/static/i18n-messages/de.json
@@ -616,6 +616,7 @@
     "order-type-regular": "Standard",
     "order-type-seller": "Verkäufer",
     "orders": "Bestellungen",
+    "original-quantity-at-checkout": "Ursprüngliche Menge beim Checkout",
     "payment": "Zahlung",
     "payment-amount": "Zahlungsbetrag",
     "payment-metadata": "Metadaten zur Bezahlung",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/en.json b/packages/admin-ui/src/lib/static/i18n-messages/en.json
@@ -616,6 +616,7 @@
     "order-type-regular": "Regular",
     "order-type-seller": "Seller",
     "orders": "Orders",
+    "original-quantity-at-checkout": "Original quantity at checkout",
     "payment": "Payment",
     "payment-amount": "Payment amount",
     "payment-metadata": "Payment metadata",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/es.json b/packages/admin-ui/src/lib/static/i18n-messages/es.json
@@ -616,6 +616,7 @@
     "order-type-regular": "Regular",
     "order-type-seller": "Vendedor",
     "orders": "Pedidos",
+    "original-quantity-at-checkout": "Cantidad original en la compra",
     "payment": "Pago",
     "payment-amount": "Importe del pago",
     "payment-metadata": "Metadatos de pago",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/fr.json b/packages/admin-ui/src/lib/static/i18n-messages/fr.json
@@ -616,6 +616,7 @@
     "order-type-regular": "Normal",
     "order-type-seller": "Vendeur",
     "orders": "Commandes",
+    "original-quantity-at-checkout": "Quantité d'origine au moment du paiement",
     "payment": "Paiement",
     "payment-amount": "Montant à payer",
     "payment-metadata": "Métadonnées de paiement",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/he.json b/packages/admin-ui/src/lib/static/i18n-messages/he.json
@@ -616,6 +616,7 @@
     "order-type-regular": "רגיל",
     "order-type-seller": "מוכר",
     "orders": "הזמנות",
+    "original-quantity-at-checkout": "כמות המקורית בתקלוט",
     "payment": "תשלום",
     "payment-amount": "סכום תשלום",
     "payment-metadata": "מטה נתונים של התשלום",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/it.json b/packages/admin-ui/src/lib/static/i18n-messages/it.json
@@ -616,6 +616,7 @@
     "order-type-regular": "Regolare",
     "order-type-seller": "Venditore",
     "orders": "Ordini",
+    "original-quantity-at-checkout": "Quantità originale al checkout",
     "payment": "Pagamento",
     "payment-amount": "Importo pagamento",
     "payment-metadata": "Metadati pagamento",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pl.json b/packages/admin-ui/src/lib/static/i18n-messages/pl.json
@@ -616,6 +616,7 @@
     "order-type-regular": "",
     "order-type-seller": "",
     "orders": "",
+    "original-quantity-at-checkout": "Oryginalna ilość przy kasie",
     "payment": "Płatność",
     "payment-amount": "Wartość płatności",
     "payment-metadata": "Metadane płatności",
@@ -791,4 +792,4 @@
     "job-state-pending": "Oczekujące",
     "job-state-running": "Uruchomione"
   }
-}
+}
diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json b/packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json
@@ -616,6 +616,7 @@
     "order-type-regular": "Regular",
     "order-type-seller": "Vendedor",
     "orders": "Pedidos",
+    "original-quantity-at-checkout": "Quantidade original no checkout",
     "payment": "Pagamento",
     "payment-amount": "Valor do pagamento",
     "payment-metadata": "Dados do pagamento",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json b/packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json
@@ -616,6 +616,7 @@
     "order-type-regular": "",
     "order-type-seller": "",
     "orders": "",
+    "original-quantity-at-checkout": "Quantidade original no checkout",
     "payment": "Pagamento",
     "payment-amount": "Valor do pagamento",
     "payment-metadata": "Dados do pagamento",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/ru.json b/packages/admin-ui/src/lib/static/i18n-messages/ru.json
@@ -616,6 +616,7 @@
     "order-type-regular": "Обычный",
     "order-type-seller": "Продавец",
     "orders": "Заказы",
+    "original-quantity-at-checkout": "Исходное количество при оформлении заказа",
     "payment": "Оплата",
     "payment-amount": "Сумма к оплате",
     "payment-metadata": "Метаданные платежа",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/uk.json b/packages/admin-ui/src/lib/static/i18n-messages/uk.json
@@ -616,6 +616,7 @@
     "order-type-regular": "",
     "order-type-seller": "",
     "orders": "",
+    "original-quantity-at-checkout": "Початкова кількість при оформленні замовлення",
     "payment": "Оплата",
     "payment-amount": "Сума до оплати",
     "payment-metadata": "Метадані платежу",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json
@@ -616,6 +616,7 @@
     "order-type-regular": "",
     "order-type-seller": "",
     "orders": "",
+    "original-quantity-at-checkout": "结账时的原始数量",
     "payment": "付款信息",
     "payment-amount": "付款金额",
     "payment-metadata": "付款元数据",

diff --git a/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json b/packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json
@@ -616,6 +616,7 @@
     "order-type-regular": "",
     "order-type-seller": "",
     "orders": "",
+    "original-quantity-at-checkout": "結帳時的原始數量",
     "payment": "付款信息",
     "payment-amount": "付款金額",
     "payment-metadata": "付款元數據",

diff --git a/packages/core/src/api/schema/common/order.type.graphql b/packages/core/src/api/schema/common/order.type.graphql
@@ -154,6 +154,7 @@ type OrderLine implements Node {
     proratedUnitPrice: Money!
     "The proratedUnitPrice including tax"
     proratedUnitPriceWithTax: Money!
+    "The quantity of items purchased"
     quantity: Int!
     "The quantity at the time the Order was placed"
     orderPlacedQuantity: Int!