Răsfoiți Sursa

feat(admin-ui): Allow filtering order list by type

Michael Bromley 2 ani în urmă
părinte
comite
a291be04dd

+ 20 - 20
packages/admin-ui/i18n-coverage.json

@@ -1,69 +1,69 @@
 {
-  "generatedOn": "2023-06-05T19:19:39.286Z",
-  "lastCommit": "f90b244160d4bfe8f4c00c69f2ec6d69de5861df",
+  "generatedOn": "2023-06-06T07:37:21.339Z",
+  "lastCommit": "4baaa39cfb2747b23b2382e48b00b6f5248421dc",
   "translationStatus": {
     "cs": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 544,
       "percentage": 74
     },
     "de": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 527,
       "percentage": 72
     },
     "en": {
-      "tokenCount": 731,
-      "translatedCount": 730,
+      "tokenCount": 734,
+      "translatedCount": 731,
       "percentage": 100
     },
     "es": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 569,
       "percentage": 78
     },
     "fr": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 564,
       "percentage": 77
     },
     "it": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 568,
-      "percentage": 78
+      "percentage": 77
     },
     "pl": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 378,
-      "percentage": 52
+      "percentage": 51
     },
     "pt_BR": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 542,
       "percentage": 74
     },
     "pt_PT": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 577,
       "percentage": 79
     },
     "ru": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 567,
-      "percentage": 78
+      "percentage": 77
     },
     "uk": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 567,
-      "percentage": 78
+      "percentage": 77
     },
     "zh_Hans": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 513,
       "percentage": 70
     },
     "zh_Hant": {
-      "tokenCount": 731,
+      "tokenCount": 734,
       "translatedCount": 358,
       "percentage": 49
     }

+ 3 - 1
packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.html

@@ -59,7 +59,9 @@
     </vdr-dt2-column>
     <vdr-dt2-column [heading]="'order.order-type' | translate" [hiddenByDefault]="true">
         <ng-template let-order="item">
-            <vdr-chip>{{ order.type }}</vdr-chip>
+            <vdr-chip *ngIf="order.type === OrderType.Regular">{{ 'order.order-type-regular' | translate }}</vdr-chip>
+            <vdr-chip *ngIf="order.type === OrderType.Aggregate">{{ 'order.order-type-aggregate' | translate }}</vdr-chip>
+            <vdr-chip *ngIf="order.type === OrderType.Seller">{{ 'order.order-type-seller' | translate }}</vdr-chip>
         </ng-template>
     </vdr-dt2-column>
     <vdr-dt2-column [heading]="'order.state' | translate" [sort]="sorts.get('state')">

+ 14 - 3
packages/admin-ui/src/lib/order/src/components/order-list/order-list.component.ts

@@ -23,6 +23,7 @@ export class OrderListComponent
     implements OnInit
 {
     orderStates = this.serverConfigService.getOrderProcessStates().map(item => item.name);
+    readonly OrderType = OrderType;
     readonly customFields = this.getCustomFieldConfig('Order');
     readonly filters = this.createFilterCollection()
         .addDateFilters()
@@ -47,6 +48,19 @@ export class OrderListComponent
             label: _('order.state'),
             filterField: 'state',
         })
+        .addFilter({
+            name: 'type',
+            type: {
+                kind: 'select',
+                options: [
+                    { value: OrderType.Regular, label: _('order.order-type-regular') },
+                    { value: OrderType.Aggregate, label: _('order.order-type-aggregate') },
+                    { value: OrderType.Seller, label: _('order.order-type-seller') },
+                ],
+            },
+            label: _('order.order-type'),
+            filterField: 'type',
+        })
         .addFilter({
             name: 'orderPlacedAt',
             type: { kind: 'dateRange' },
@@ -116,9 +130,6 @@ export class OrderListComponent
         if (this.activeChannelIsDefaultChannel) {
             filterInput = {
                 ...(filterInput ?? {}),
-                type: {
-                    notEq: OrderType.Seller,
-                },
             };
         }
         if (searchTerm) {

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/cs.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "Přehled stavu objednávky",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "Platba",
     "payment-amount": "Částka platby",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/de.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "Zahlung",
     "payment-amount": "Zahlungsbetrag",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/en.json

@@ -591,6 +591,9 @@
     "order-is-empty": "Order is empty",
     "order-state-diagram": "Order state diagram",
     "order-type": "Order type",
+    "order-type-aggregate": "Aggregate",
+    "order-type-regular": "Regular",
+    "order-type-seller": "Seller",
     "orders": "Orders",
     "payment": "Payment",
     "payment-amount": "Payment amount",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/es.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "Diagrama de estado de los pedidos",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "Pago",
     "payment-amount": "Importe del pago",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/fr.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "Diagramme des états de la commande",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "paiement",
     "payment-amount": "Montant à payer",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/it.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "Diagramma di stato dell'ordine",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "Pagamento",
     "payment-amount": "Importo pagamento",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/pl.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "Płatność",
     "payment-amount": "Wartość płatności",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/pt_BR.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "Diagrama do estado do pedido",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "Pagamento",
     "payment-amount": "Valor do pagamento",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/pt_PT.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "Diagrama do estado da encomenda",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "Pagamento",
     "payment-amount": "Valor do pagamento",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/ru.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "Диаграмма состояния заказа",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "Оплата",
     "payment-amount": "Сумма к оплате",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/uk.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "Діаграма стану замовлення",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "Оплата",
     "payment-amount": "Сума до оплати",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/zh_Hans.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "付款信息",
     "payment-amount": "付款金额",

+ 3 - 0
packages/admin-ui/src/lib/static/i18n-messages/zh_Hant.json

@@ -591,6 +591,9 @@
     "order-is-empty": "",
     "order-state-diagram": "",
     "order-type": "",
+    "order-type-aggregate": "",
+    "order-type-regular": "",
+    "order-type-seller": "",
     "orders": "",
     "payment": "付款信息",
     "payment-amount": "付款金額",