Browse Source

Merge branch 'master' into next

Michael Bromley 5 years ago
parent
commit
f0cd67c00b

+ 4 - 0
packages/admin-ui/src/lib/core/src/shared/pipes/state-i18n-token.pipe.ts

@@ -14,11 +14,15 @@ export class StateI18nTokenPipe implements PipeTransform {
         PartiallyShipped: _('state.partially-shipped'),
         PartiallyShipped: _('state.partially-shipped'),
         Shipped: _('state.shipped'),
         Shipped: _('state.shipped'),
         PartiallyDelivered: _('state.partially-delivered'),
         PartiallyDelivered: _('state.partially-delivered'),
+        Authorized: _('state.authorized'),
         Delivered: _('state.delivered'),
         Delivered: _('state.delivered'),
         Cancelled: _('state.cancelled'),
         Cancelled: _('state.cancelled'),
         Pending: _('state.pending'),
         Pending: _('state.pending'),
         Settled: _('state.settled'),
         Settled: _('state.settled'),
         Failed: _('state.failed'),
         Failed: _('state.failed'),
+        Error: _('state.error'),
+        Created: _('state.created'),
+        Declined: _('state.declined'),
     };
     };
     transform<T extends unknown>(value: T): T {
     transform<T extends unknown>(value: T): T {
         if (typeof value === 'string') {
         if (typeof value === 'string') {

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

@@ -683,11 +683,14 @@
   },
   },
   "state": {
   "state": {
     "adding-items": "Košík",
     "adding-items": "Košík",
-    "all-orders": "",
+    "all-orders": "Všechny objednávky",
     "arranging-payment": "Zřizování platby",
     "arranging-payment": "Zřizování platby",
+    "authorized": "Autorizováno",
     "cancelled": "Zrušeno",
     "cancelled": "Zrušeno",
-    "created": "",
+    "created": "Vytvořeno",
+    "declined": "Odmítnuto",
     "delivered": "Doručeno",
     "delivered": "Doručeno",
+    "error": "Chyba",
     "failed": "Selhalo",
     "failed": "Selhalo",
     "partially-delivered": "Částečně doručeno",
     "partially-delivered": "Částečně doručeno",
     "partially-shipped": "Částečně expedováno",
     "partially-shipped": "Částečně expedováno",
@@ -715,4 +718,4 @@
     "job-result": "Výsledek úlohy",
     "job-result": "Výsledek úlohy",
     "job-state": "Stav úlohy"
     "job-state": "Stav úlohy"
   }
   }
-}
+}

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

@@ -685,9 +685,12 @@
     "adding-items": "Adding items",
     "adding-items": "Adding items",
     "all-orders": "All order states",
     "all-orders": "All order states",
     "arranging-payment": "Arranging payment",
     "arranging-payment": "Arranging payment",
+    "authorized": "Authorized",
     "cancelled": "Cancelled",
     "cancelled": "Cancelled",
     "created": "Created",
     "created": "Created",
+    "declined": "Declined",
     "delivered": "Delivered",
     "delivered": "Delivered",
+    "error": "Error",
     "failed": "Failed",
     "failed": "Failed",
     "partially-delivered": "Partially delivered",
     "partially-delivered": "Partially delivered",
     "partially-shipped": "Partially shipped",
     "partially-shipped": "Partially shipped",

+ 1 - 0
packages/core/src/service/index.ts

@@ -36,4 +36,5 @@ export * from './services/tax-category.service';
 export * from './services/tax-rate.service';
 export * from './services/tax-rate.service';
 export * from './services/user.service';
 export * from './services/user.service';
 export * from './services/zone.service';
 export * from './services/zone.service';
+export * from './services/history.service';
 export * from './transaction/transactional-connection';
 export * from './transaction/transactional-connection';