Merge pull request #2339 from graphcommerce-org/feature/GCOM-1460

Feature/gcom 1460

.changeset/tiny-plums-pay.md

@@ -0,0 +1,6 @@
+---
+'@graphcommerce/magento-graphcms': minor
+'@graphcommerce/magento-customer': minor
+---
+
+Show actual order status from the backend, improve order state logic

examples/magento-graphcms/locales/de.po

@@ -21,10 +21,6 @@ msgstr "Dadurch werden alle Ihre Daten einschließlich Bestellverlauf und gespei
 msgid "I understand that my account will be deleted and this can not be undone."
 msgstr "Mir ist bewusst, dass mein Konto gelöscht wird und dies nicht rückgängig gemacht werden kann."
 
-#. js-lingui-generated-id
-msgid "Orders"
-msgstr "Bestellungen"
-
 #. js-lingui-generated-id
 msgid "Newletter"
 msgstr "Newsletter"
@@ -37,14 +33,14 @@ msgstr "Alle Produkte durchsuchen..."
 msgid "We couldn't find any results"
 msgstr "Wir konnten keine Ergebnisse finden"
 
-#. js-lingui-generated-id
-msgid "Name"
-msgstr "Name"
-
 #. js-lingui-generated-id
 msgid "Shipping method"
 msgstr "Versandart"
 
+#. js-lingui-generated-id
+msgid "Name"
+msgstr "Name"
+
 #. js-lingui-generated-id
 msgid "I understand that my order will be canceled and this can not be undone."
 msgstr "Ich verstehe, dass meine Bestellung storniert wird und dies nicht rückgängig gemacht werden kann."
@@ -161,6 +157,10 @@ msgstr "Warenkorb ({0})"
 msgid "Categories"
 msgstr "Kategorien"
 
+#. js-lingui-generated-id
+msgid "Order #{orderNumber}"
+msgstr "Bestellung #{orderNumber}"
+
 msgid "Change"
 msgstr "Ändern"
 
@@ -368,10 +368,6 @@ msgstr "Passwort vergessen?"
 msgid "Free"
 msgstr "Kostenlos"
 
-#. js-lingui-generated-id
-msgid "Order #{orderNumber} not found"
-msgstr "Bestellung #{orderNumber} nicht gefunden"
-
 msgid "Grand total"
 msgstr "Gesamtsumme"
 
@@ -893,10 +889,6 @@ msgstr "Verfasst von {nickname}"
 msgid "Written {0} reviews"
 msgstr "Bewertungen geschrieben: {0}"
 
-#. js-lingui-generated-id
-msgid "Are you sure you want to cancel your order? This action is not reversable."
-msgstr "Sind Sie sicher, dass Sie Ihre Bestellung stornieren möchten? Diese Aktion ist nicht umkehrbar."
-
 msgid "You are reviewing {0}"
 msgstr "Sie bewerten {0}"
 
@@ -942,27 +934,6 @@ msgstr "Ihr Warenkorb ist leer"
 msgid "Your comparelist is empty"
 msgstr "Ihre Vergleichsliste ist leer"
 
-msgid "Your order has been canceled"
-msgstr "Ihre Bestellung wurde storniert"
-
-msgid "Your order has been invoiced"
-msgstr "Ihre Bestellung wurde in Rechnung gestellt"
-
-msgid "Your order has been partially processed"
-msgstr "Ihre Bestellung wurde teilweise bearbeitet"
-
-msgid "Your order has been refunded"
-msgstr "Ihre Bestellung wurde zurückerstattet"
-
-msgid "Your order has been returned"
-msgstr "Ihre Bestellung wurde zurückgesendet"
-
-msgid "Your order is being processed"
-msgstr "Ihre Bestellung wird bearbeitet"
-
-msgid "Your order is on its way!"
-msgstr "Deine Bestellung ist unterwegs!"
-
 msgid "Your session is expired"
 msgstr "Ihre Sitzung ist abgelaufen"
 
@@ -992,13 +963,14 @@ msgstr "Zurück zur Startseite"
 msgid "Add to Cart"
 msgstr "In den Warenkorb"
 
-msgid "canceled"
-msgstr "abgebrochen"
-
 #. js-lingui-generated-id
 msgid "Shipping address"
 msgstr "Lieferadresse"
 
+#. js-lingui-generated-id
+msgid "Order status: {status}"
+msgstr "Status der Bestellung: {status}"
+
 #. js-lingui-generated-id
 msgid "Shipping Note"
 msgstr "Lieferschein"
@@ -1007,32 +979,21 @@ msgstr "Lieferschein"
 msgid "Your message has been received, we will contact you as soon as we can"
 msgstr "Wir haben Ihre Nachricht erhalten und werden Sie so schnell wie möglich kontaktieren."
 
-#. js-lingui-generated-id
-msgid "Order #{orderNumber}"
-msgstr "Bestellung #{orderNumber}"
-
 #. js-lingui-generated-id
 msgid "Invalid phone number"
 msgstr "Ungültige Telefonnummer"
 
-#. js-lingui-generated-id
-msgid "Submit"
-msgstr "Einreichen"
-
 #. js-lingui-generated-id
 msgid "Billing address"
 msgstr "Rechnungsadresse"
 
 #. js-lingui-generated-id
-msgid "Order date"
-msgstr "Datum der Bestellung"
+msgid "Submit"
+msgstr "Einreichen"
 
 #. js-lingui-generated-id
-msgid "Back"
-msgstr "Zurück"
-
-msgid "invoiced"
-msgstr "in Rechnung gestellt"
+msgid "Order date"
+msgstr "Datum der Bestellung"
 
 #. js-lingui-generated-id
 msgid "Contact"
@@ -1064,33 +1025,10 @@ msgstr "Auftrag erhalten"
 msgid "one product"
 msgstr "ein Produkt"
 
-#. js-lingui-generated-id
-msgid "Cancel order #{orderNumber}"
-msgstr "Bestellung #{orderNumber} stornieren"
-
-msgid "partially processed"
-msgstr "teilweise bearbeitet"
-
-msgid "processed"
-msgstr "bearbeitet"
-
-#. js-lingui-generated-id
-msgid "Order #{orderNumber} can not be canceled"
-msgstr "Bestellung #{orderNumber} kann nicht storniert werden"
-
-msgid "refunded"
-msgstr "erstattet"
-
-msgid "returned"
-msgstr "zurückgesandt"
-
 #. js-lingui-generated-id
 msgid "Order not found"
 msgstr "Bestellung nicht gefunden"
 
-msgid "shipped"
-msgstr "versandt"
-
 #. js-lingui-generated-id
 msgid "Cancel order"
 msgstr "Bestellung stornieren"

examples/magento-graphcms/locales/en.po

@@ -21,10 +21,6 @@ msgstr "Doing so will remove all your data including order history and saved shi
 msgid "I understand that my account will be deleted and this can not be undone."
 msgstr "I understand that my account will be deleted and this can not be undone."
 
-#. js-lingui-generated-id
-msgid "Orders"
-msgstr "Orders"
-
 #. js-lingui-generated-id
 msgid "Newletter"
 msgstr "Newletter"
@@ -37,14 +33,14 @@ msgstr "Search all products..."
 msgid "We couldn't find any results"
 msgstr "We couldn't find any results"
 
-#. js-lingui-generated-id
-msgid "Name"
-msgstr "Name"
-
 #. js-lingui-generated-id
 msgid "Shipping method"
 msgstr "Shipping method"
 
+#. js-lingui-generated-id
+msgid "Name"
+msgstr "Name"
+
 #. js-lingui-generated-id
 msgid "I understand that my order will be canceled and this can not be undone."
 msgstr "I understand that my order will be canceled and this can not be undone."
@@ -161,6 +157,10 @@ msgstr "Cart ({0})"
 msgid "Categories"
 msgstr "Categories"
 
+#. js-lingui-generated-id
+msgid "Order #{orderNumber}"
+msgstr "Order #{orderNumber}"
+
 msgid "Change"
 msgstr "Change"
 
@@ -368,10 +368,6 @@ msgstr "Forgot your password?"
 msgid "Free"
 msgstr "Free"
 
-#. js-lingui-generated-id
-msgid "Order #{orderNumber} not found"
-msgstr "Order #{orderNumber} not found"
-
 msgid "Grand total"
 msgstr "Grand total"
 
@@ -893,10 +889,6 @@ msgstr "Written by {nickname}"
 msgid "Written {0} reviews"
 msgstr "Written {0} reviews"
 
-#. js-lingui-generated-id
-msgid "Are you sure you want to cancel your order? This action is not reversable."
-msgstr "Are you sure you want to cancel your order? This action is not reversable."
-
 msgid "You are reviewing {0}"
 msgstr "You are reviewing {0}"
 
@@ -942,27 +934,6 @@ msgstr "Your cart is empty"
 msgid "Your comparelist is empty"
 msgstr "Your comparelist is empty"
 
-msgid "Your order has been canceled"
-msgstr "Your order has been canceled"
-
-msgid "Your order has been invoiced"
-msgstr "Your order has been invoiced"
-
-msgid "Your order has been partially processed"
-msgstr "Your order has been partially processed"
-
-msgid "Your order has been refunded"
-msgstr "Your order has been refunded"
-
-msgid "Your order has been returned"
-msgstr "Your order has been returned"
-
-msgid "Your order is being processed"
-msgstr "Your order is being processed"
-
-msgid "Your order is on its way!"
-msgstr "Your order is on its way!"
-
 msgid "Your session is expired"
 msgstr "Your session is expired"
 
@@ -992,13 +963,14 @@ msgstr "Return to home"
 msgid "Add to Cart"
 msgstr "Add to Cart"
 
-msgid "canceled"
-msgstr "canceled"
-
 #. js-lingui-generated-id
 msgid "Shipping address"
 msgstr "Shipping address"
 
+#. js-lingui-generated-id
+msgid "Order status: {status}"
+msgstr "Order status: {status}"
+
 #. js-lingui-generated-id
 msgid "Shipping Note"
 msgstr "Shipping Note"
@@ -1007,32 +979,21 @@ msgstr "Shipping Note"
 msgid "Your message has been received, we will contact you as soon as we can"
 msgstr "Your message has been received, we will contact you as soon as we can"
 
-#. js-lingui-generated-id
-msgid "Order #{orderNumber}"
-msgstr "Order #{orderNumber}"
-
 #. js-lingui-generated-id
 msgid "Invalid phone number"
 msgstr "Invalid phone number"
 
-#. js-lingui-generated-id
-msgid "Submit"
-msgstr "Submit"
-
 #. js-lingui-generated-id
 msgid "Billing address"
 msgstr "Billing address"
 
 #. js-lingui-generated-id
-msgid "Order date"
-msgstr "Order date"
+msgid "Submit"
+msgstr "Submit"
 
 #. js-lingui-generated-id
-msgid "Back"
-msgstr "Back"
-
-msgid "invoiced"
-msgstr "invoiced"
+msgid "Order date"
+msgstr "Order date"
 
 #. js-lingui-generated-id
 msgid "Contact"
@@ -1064,33 +1025,10 @@ msgstr "Get order"
 msgid "one product"
 msgstr "one product"
 
-#. js-lingui-generated-id
-msgid "Cancel order #{orderNumber}"
-msgstr "Cancel order #{orderNumber}"
-
-msgid "partially processed"
-msgstr "partially processed"
-
-msgid "processed"
-msgstr "processed"
-
-#. js-lingui-generated-id
-msgid "Order #{orderNumber} can not be canceled"
-msgstr "Order #{orderNumber} can not be canceled"
-
-msgid "refunded"
-msgstr "refunded"
-
-msgid "returned"
-msgstr "returned"
-
 #. js-lingui-generated-id
 msgid "Order not found"
 msgstr "Order not found"
 
-msgid "shipped"
-msgstr "shipped"
-
 #. js-lingui-generated-id
 msgid "Cancel order"
 msgstr "Cancel order"