瀏覽代碼

feat(admin-ui): Display payment errors in OrderDetail view

Michael Bromley 4 年之前
父節點
當前提交
cf31cbf3e5

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

@@ -1,49 +1,49 @@
 {
-  "generatedOn": "2021-04-08T11:34:06.531Z",
-  "lastCommit": "f97cd4fcf3f1467ae6274dde2f664088c5eb82ff",
+  "generatedOn": "2021-04-08T14:39:29.656Z",
+  "lastCommit": "ce147dc13e139be6d734016f43f7abeed9fac8d9",
   "translationStatus": {
     "cs": {
-      "tokenCount": 772,
+      "tokenCount": 773,
       "translatedCount": 753,
-      "percentage": 98
+      "percentage": 97
     },
     "de": {
-      "tokenCount": 772,
+      "tokenCount": 773,
       "translatedCount": 731,
       "percentage": 95
     },
     "en": {
-      "tokenCount": 772,
-      "translatedCount": 771,
+      "tokenCount": 773,
+      "translatedCount": 772,
       "percentage": 100
     },
     "es": {
-      "tokenCount": 772,
+      "tokenCount": 773,
       "translatedCount": 456,
       "percentage": 59
     },
     "fr": {
-      "tokenCount": 772,
+      "tokenCount": 773,
       "translatedCount": 690,
       "percentage": 89
     },
     "pl": {
-      "tokenCount": 772,
+      "tokenCount": 773,
       "translatedCount": 549,
       "percentage": 71
     },
     "pt_BR": {
-      "tokenCount": 772,
+      "tokenCount": 773,
       "translatedCount": 749,
       "percentage": 97
     },
     "zh_Hans": {
-      "tokenCount": 772,
+      "tokenCount": 773,
       "translatedCount": 531,
       "percentage": 69
     },
     "zh_Hant": {
-      "tokenCount": 772,
+      "tokenCount": 773,
       "translatedCount": 531,
       "percentage": 69
     }

+ 1 - 1
packages/admin-ui/src/lib/core/src/common/generated-types.ts

@@ -5815,7 +5815,7 @@ export type OrderDetailFragment = (
     & OrderAddressFragment
   )>, payments?: Maybe<Array<(
     { __typename?: 'Payment' }
-    & Pick<Payment, 'id' | 'createdAt' | 'transactionId' | 'amount' | 'method' | 'state' | 'nextStates' | 'metadata'>
+    & Pick<Payment, 'id' | 'createdAt' | 'transactionId' | 'amount' | 'method' | 'state' | 'nextStates' | 'errorMessage' | 'metadata'>
     & { refunds: Array<(
       { __typename?: 'Refund' }
       & Pick<Refund, 'id' | 'createdAt' | 'state' | 'items' | 'adjustment' | 'total' | 'paymentId' | 'reason' | 'transactionId' | 'method' | 'metadata'>

+ 1 - 0
packages/admin-ui/src/lib/core/src/data/definitions/order-definitions.ts

@@ -186,6 +186,7 @@ export const ORDER_DETAIL_FRAGMENT = gql`
             method
             state
             nextStates
+            errorMessage
             metadata
             refunds {
                 id

+ 4 - 1
packages/admin-ui/src/lib/order/src/components/order-payment-card/order-payment-card.component.html

@@ -1,6 +1,9 @@
 <div class="card">
     <div class="card-header payment-header">
-        <div>{{ 'order.payment' | translate }} #{{ payment.transactionId }}</div>
+        <div>
+            {{ 'order.payment' | translate }}
+            <ng-container *ngIf="payment.transactionId">#{{ payment.transactionId }}</ng-container>
+        </div>
         <div class="payment-state">
             <vdr-payment-state-label [state]="payment.state"></vdr-payment-state-label>
         </div>

+ 4 - 1
packages/admin-ui/src/lib/order/src/components/payment-detail/payment-detail.component.html

@@ -4,7 +4,10 @@
 <vdr-labeled-data [label]="'order.amount' | translate">
     {{ payment.amount | localeCurrency: currencyCode }}
 </vdr-labeled-data>
-<vdr-labeled-data [label]="'order.transaction-id' | translate">
+<vdr-labeled-data *ngIf="payment.errorMessage" [label]="'order.error-message' | translate">
+    {{ payment.errorMessage }}
+</vdr-labeled-data>
+<vdr-labeled-data *ngIf="payment.transactionId" [label]="'order.transaction-id' | translate">
     {{ payment.transactionId }}
 </vdr-labeled-data>
 <vdr-labeled-data [label]="'order.payment-metadata' | translate">

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

@@ -596,6 +596,7 @@
     "customer": "Zákazník",
     "edit-billing-address": "Upravit fakturační adresu",
     "edit-shipping-address": "Upravit dodací adresu",
+    "error-message": "",
     "filter-custom": "Vlastní",
     "filter-preset-active": "Aktivní",
     "filter-preset-completed": "Uzavřené",

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

@@ -596,6 +596,7 @@
     "customer": "Kunde",
     "edit-billing-address": "Rechnungsadresse bearbeiten",
     "edit-shipping-address": "Versandadresse bearbeiten",
+    "error-message": "",
     "filter-custom": "Benutzerdefiniert",
     "filter-preset-active": "Aktiv",
     "filter-preset-completed": "Abgeschlossen",

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

@@ -596,6 +596,7 @@
     "customer": "Customer",
     "edit-billing-address": "Edit billing address",
     "edit-shipping-address": "Edit shipping address",
+    "error-message": "Error message",
     "filter-custom": "Custom",
     "filter-preset-active": "Active",
     "filter-preset-completed": "Completed",

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

@@ -596,6 +596,7 @@
     "customer": "Cliente",
     "edit-billing-address": "",
     "edit-shipping-address": "",
+    "error-message": "",
     "filter-custom": "",
     "filter-preset-active": "",
     "filter-preset-completed": "",

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

@@ -596,6 +596,7 @@
     "customer": "Client",
     "edit-billing-address": "",
     "edit-shipping-address": "",
+    "error-message": "",
     "filter-custom": "Personnalisé",
     "filter-preset-active": "Active",
     "filter-preset-completed": "Terminée",

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

@@ -596,6 +596,7 @@
     "customer": "Klient",
     "edit-billing-address": "",
     "edit-shipping-address": "",
+    "error-message": "",
     "filter-custom": "",
     "filter-preset-active": "",
     "filter-preset-completed": "",

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

@@ -596,6 +596,7 @@
     "customer": "Cliente",
     "edit-billing-address": "Editar endereço de fatura",
     "edit-shipping-address": "Editar endereço de envio",
+    "error-message": "",
     "filter-custom": "Customizar",
     "filter-preset-active": "Ativo",
     "filter-preset-completed": "Concluído",

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

@@ -596,6 +596,7 @@
     "customer": "客户",
     "edit-billing-address": "",
     "edit-shipping-address": "",
+    "error-message": "",
     "filter-custom": "",
     "filter-preset-active": "",
     "filter-preset-completed": "",

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

@@ -596,6 +596,7 @@
     "customer": "客户",
     "edit-billing-address": "",
     "edit-shipping-address": "",
+    "error-message": "",
     "filter-custom": "",
     "filter-preset-active": "",
     "filter-preset-completed": "",