Fixed shipment flow

elcodi · Jun 13, 2015 · 43e018a · 43e018a
1 parent 8169309
commit 43e018a
Show file tree

Hide file tree

Showing 12 changed files with 55 additions and 34 deletions.
diff --git a/features/workflow/payment.feature b/features/workflow/payment.feature
@@ -43,15 +43,15 @@ Feature: Test payment
     And I should see "$17.62"
     And I go to "/my-orders"
     And I should see "Paid"
-    And I should see "Not shipped"
+    And I should see "Preparing"
     And I go to "/admin/orders"
     And the page contains a "order-1" test attribute
     And I should see "$17.62"
     And I should see "Paid"
-    And I should see "Not shipped"
+    And I should see "Preparing"
     And I go to "/admin/order/1"
     And I should see "$5.41"
     And I should see "$12.21"
     And I should see "$17.62"
     And I should see "Paid"
-    And I should see "Not shipped"
+    And I should see "Preparing"
diff --git a/src/Elcodi/Admin/CartBundle/Builder/OrdersNotShippedBuilder.php b/src/Elcodi/Admin/CartBundle/Builder/OrdersNotShippedBuilder.php
@@ -71,7 +71,7 @@ private function getNonShippedOrdersCount()
     {
         $notShippedOrders = $this
             ->orderRepository
-            ->getNotShippedOrders();
+            ->getOrdersToPrepare();
 
         return count($notShippedOrders);
     }

diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.ca.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.ca.yml
@@ -558,7 +558,12 @@ admin:
             shipping: Entrega
         transition:
             refund: Reemborsar
-            ship:   Enviar
+            order ready: Comanda llesta
+            picked up on store: Recollida a la tenda
+            picked up by carrier: Recollida per el transportista
+            delivered: Entregada
+            cancel: Cancel·lar
+            return: Retornar
 
     page:
         single:   Pàgina

diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.de.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.de.yml
@@ -481,7 +481,6 @@ admin:
             shipping: Versand
         transition:
             refund: Rückerstattung
-            ship:   Versenden
 
     page:
         single:   Seite

diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.en.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.en.yml
@@ -558,7 +558,12 @@ admin:
             shipping: Shipping
         transition:
             refund: Refund
-            ship:   Ship
+            order ready: Order ready
+            picked up on store: Picked on store
+            picked up by carrier: Picked by carrier
+            delivered: Delivered
+            cancel: Cancel
+            return: Return
 
     page:
         single:   Page

diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.es.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.es.yml
@@ -558,7 +558,12 @@ admin:
             shipping: Entrega
         transition:
             refund: Reembolsar
-            ship:   Enviar
+            order ready: Pedido listo
+            picked up on store: Recogido en tienda
+            picked up by carrier: Recogido por el transportista
+            delivered: Entregado
+            cancel: Cancelar
+            return: Devolver
 
     page:
         single:   Página

diff --git a/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.fr.yml b/src/Elcodi/Admin/CoreBundle/Resources/translations/messages.fr.yml
@@ -463,7 +463,6 @@ admin:
             shipping: Livraison
         transition:
             refund: Remboursement
-            ship:   Livraison
 
     page:
         single:   Page

diff --git a/src/Elcodi/Common/CommonBundle/Resources/translations/messages.ca.yml b/src/Elcodi/Common/CommonBundle/Resources/translations/messages.ca.yml
@@ -1,10 +1,14 @@
 common:
     order:
         states:
-            title:       Historial
-            initial:     Comanda nova
-            unpaid:      Sense pagar
-            refunded:    Reemborsat
-            shipped:     Enviat
-            not shipped: Sense enviar
-            paid:        Pagat
+            title:                  Historial
+            initial:                Comanda nova
+            unpaid:                 Sense pagar
+            paid:                   Pagat
+            refunded:               Reemborsat
+            preparing:              En preparació
+            processed:              Processat
+            in delivery:            En entrega
+            delivered:              Entregat
+            cancelled:              Cancel·lat
+            returned:               Retornat
diff --git a/src/Elcodi/Common/CommonBundle/Resources/translations/messages.de.yml b/src/Elcodi/Common/CommonBundle/Resources/translations/messages.de.yml
@@ -5,6 +5,4 @@ common:
             initial:     Neue Bestellung
             unpaid:      Unbezahlt
             refunded:    Zurückerstattet
-            shipped:     Versendet
-            not shipped: Nicht versendet
             paid:        Bezahlt
diff --git a/src/Elcodi/Common/CommonBundle/Resources/translations/messages.en.yml b/src/Elcodi/Common/CommonBundle/Resources/translations/messages.en.yml
@@ -1,10 +1,14 @@
 common:
     order:
         states:
-            title:       History
-            initial:     New order
-            unpaid:      Unpaid
-            refunded:    Refunded
-            shipped:     Shipped
-            not shipped: Not shipped
-            paid:        Paid
+            title:                  History
+            initial:                New order
+            unpaid:                 Unpaid
+            paid:                   Paid
+            refunded:               Refunded
+            preparing:              Preparing
+            processed:              Processed
+            in delivery:            In delivery
+            delivered:              Delivered
+            cancelled:              Cancelled
+            returned:               Returned
diff --git a/src/Elcodi/Common/CommonBundle/Resources/translations/messages.es.yml b/src/Elcodi/Common/CommonBundle/Resources/translations/messages.es.yml
@@ -1,10 +1,14 @@
 common:
     order:
         states:
-            title:       Historial
-            initial:     Nuevo pedido
-            unpaid:      Sin pagar
-            refunded:    Reembolsado
-            shipped:     Enviado
-            not shipped: Sin enviar
-            paid:        Pagado
+            title:                  Historial
+            initial:                Nuevo pedido
+            unpaid:                 Sin pagar
+            paid:                   Pagado
+            refunded:               Reembolsado
+            preparing:              En preparación
+            processed:              Processado
+            in delivery:            En entrega
+            delivered:              Entregado
+            cancelled:              Cancelado
+            returned:               Devuelto
diff --git a/src/Elcodi/Common/CommonBundle/Resources/translations/messages.fr.yml b/src/Elcodi/Common/CommonBundle/Resources/translations/messages.fr.yml
@@ -5,6 +5,4 @@ common:
             initial:     Nouvelle commande
             unpaid:      Non payée
             refunded:    Remboursée
-            shipped:     Livrée
-            not shipped: Non livrée
             paid:        Payée