Change label field to name

BitBagCommerce · Feb 6, 2018 · 62c4dfa · 62c4dfa
1 parent 1719a23
commit 62c4dfa
Show file tree

Hide file tree

Showing 5 changed files with 5 additions and 7 deletions.
diff --git a/src/Context/ShippingGatewayContext.php b/src/Context/ShippingGatewayContext.php
@@ -99,7 +99,7 @@ public function getCode(): ?string
     public function getLabelByCode(?string $code): ?string
     {
         foreach ($this->shippingGateways as $shippingGatewayCode => $shippingGatewayLabel) {
-            if ($shippingGatewayCode === $code) {
+            if ($code === $shippingGatewayCode) {
                 return $shippingGatewayLabel;
             }
         }

diff --git a/src/Resources/config/grids/bitbag_shipping_gateway.yml b/src/Resources/config/grids/bitbag_shipping_gateway.yml
@@ -12,10 +12,10 @@ sylius_grid:
                     type: string
                     label: sylius.ui.code
                     sortable: code
-                label:
+                name:
                     type: string
-                    label: bitbag.ui.label
-                    sortable: label
+                    label: sylius.ui.name
+                    sortable: name
             filters:
                 search:
                     type: string

diff --git a/src/Resources/translations/messages.en.yml b/src/Resources/translations/messages.en.yml
@@ -1,7 +1,6 @@
 bitbag:
     ui:
         shipping_gateways: Shipping gateways
-        label: Name
         create_shipping_gateway: Create shipping gateway
         manage_shipping_gateways: Manage shipping gateways
         choose_shipping_method: Choose shipping method

diff --git a/src/Resources/translations/messages.pl.yml b/src/Resources/translations/messages.pl.yml
@@ -1,7 +1,6 @@
 bitbag:
     ui:
         shipping_gateways: Bramy dostawców
-        label: Nazwa
         create_shipping_gateway: Stwórz bramę dostawcy
         manage_shipping_gateways: Zarządzaj bramami dostawców
         choose_shipping_method: Wybierz metodę wysyłki

diff --git a/tests/Behat/Context/Setup/ShippingGatewayContext.php b/tests/Behat/Context/Setup/ShippingGatewayContext.php
@@ -96,7 +96,7 @@ public function thereIsARegisteredShippingGatewayForThisShippingMethod($code, $n
 
         $shippingGateway->addShippingMethod($shippingMethod);
         $shippingGateway->setCode($code);
-        $shippingGateway->setLabel($name);
+        $shippingGateway->setName($name);
         $shippingGateway->setConfig(['iban' => '123', 'address' => 'foo bar']);
 
         $this->sharedStorage->set('shipping_gateway', $shippingGateway);