Review fixes

features/order/placing_an_order/adding_notes_for_customer_service.feature

@@ -9,7 +9,7 @@ Feature: Adding a note to order
         And the store has a product "PHP T-Shirt" priced at "$19.99"
         And the store ships everywhere for free
         And the store allows paying offline
-        And the store has customer service account identified by "sylius@example.com"
+        And there is an administrator identified by "sylius@example.com"
         And there is a customer account "customer@example.com" identified by "sylius"
         And I am logged in as "customer@example.com"
 

src/Sylius/Behat/Context/Setup/UserContext.php

@@ -143,7 +143,7 @@ public function hisAccountWasDeleted()
     }
 
     /**
-     * @Given the store has customer service account identified by :email
+     * @Given there is an administrator identified by :email
      */
     public function theStoreHasCustomerServiceAccountIdentifiedBy($email)
     {

src/Sylius/Behat/Context/Transform/CustomerContext.php

@@ -43,7 +43,6 @@ public function __construct(CustomerRepositoryInterface $customerRepository, Fac
 
     /**
      * @Transform :customer
-     * @Transform /^made by "[^"]+"$/
      */
     public function getOrCreateCustomerByEmail($email)
     {

src/Sylius/Behat/Page/Admin/Order/ShowPage.php

@@ -17,7 +17,6 @@
 use Sylius\Behat\Service\Accessor\TableAccessorInterface;
 use Sylius\Component\Core\Model\OrderInterface;
 use Symfony\Component\Routing\RouterInterface;
-use Webmozart\Assert\Assert;
 
 /**
  * @author Łukasz Chruściel <lukasz.chrusciel@lakion.com>
@@ -333,20 +332,19 @@ public function deleteOrder()
     /**
      * {@inheritdoc}
      */
-    public function getRouteName()
+    public function hasNote($note)
     {
-        return 'sylius_admin_order_show';
+        $orderNotesElement = $this->getElement('order_notes');
+
+        return $orderNotesElement->getText() === $note;
     }
 
     /**
      * {@inheritdoc}
      */
-    public function hasNote($note)
+    public function getRouteName()
     {
-        $orderNotesElement = $this->getElement('order_notes');
-        Assert::notNull($orderNotesElement, 'Cannot find order notes');
-
-        return $orderNotesElement->getText() === $note;
+        return 'sylius_admin_order_show';
     }
 
     /**

src/Sylius/Bundle/AdminBundle/Resources/views/Order/Show/_notes.html.twig

@@ -1,4 +1,4 @@
-{% if order.notes is defined and order.notes is not null %}
+{% if order.notes is not null %}
     <h4 class="ui top attached styled header">
         {{ 'sylius.ui.notes'|trans }}
     </h4>

src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/SummaryNoteType.php → src/Sylius/Bundle/CoreBundle/Form/Type/Checkout/SummaryType.php

@@ -17,7 +17,7 @@
 /**
  * @author Arkadiusz Krakowiak <arkadiusz.krakowiak@lakion.com>
  */
-class SummaryNoteType extends AbstractResourceType
+class SummaryType extends AbstractResourceType
 {
     /**
      * {@inheritdoc}
@@ -35,6 +35,6 @@ public function buildForm(FormBuilderInterface $builder, array $options)
      */
     public function getName()
     {
-        return 'sylius_checkout_summary_note';
+        return 'sylius_checkout_summary';
     }
 }

src/Sylius/Bundle/CoreBundle/Resources/config/form.xml

@@ -24,7 +24,7 @@
         <parameter key="sylius.checkout_form.shipping.class">Sylius\Bundle\CoreBundle\Form\Type\Checkout\ShippingStepType</parameter>
         <parameter key="sylius.checkout_form.shop_addressing.class">Sylius\Bundle\CoreBundle\Form\Type\Checkout\AddressingType</parameter>
         <parameter key="sylius.checkout_form.shop_shipping.class">Sylius\Bundle\CoreBundle\Form\Type\Checkout\ShippingType</parameter>
-        <parameter key="sylius.checkout_form.summary_note.class">Sylius\Bundle\CoreBundle\Form\Type\Checkout\SummaryNoteType</parameter>
+        <parameter key="sylius.checkout_form.summary.class">Sylius\Bundle\CoreBundle\Form\Type\Checkout\SummaryType</parameter>
 
         <parameter key="sylius.form.type.image.class">Sylius\Bundle\CoreBundle\Form\Type\ImageType</parameter>
         <parameter key="sylius.form.type.list.class">Sylius\Bundle\CoreBundle\Form\Type\ListType</parameter>
@@ -94,9 +94,9 @@
             </argument>
             <tag name="form.type" alias="sylius_checkout_payment_step" />
         </service>
-        <service id="sylius_checkout_form.summary_note" class="%sylius.checkout_form.summary_note.class%">
+        <service id="sylius_checkout_form.summary" class="%sylius.checkout_form.summary.class%">
             <argument>%sylius.model.cart.class%</argument>
-            <tag name="form.type" alias="sylius_checkout_summary_note" />
+            <tag name="form.type" alias="sylius_checkout_summary" />
         </service>
 
         <service id="sylius.form.type.cart" class="%sylius.form.type.cart.class%">

src/Sylius/Bundle/CoreBundle/spec/Form/Type/Checkout/SummaryNoteTypeSpec.php → src/Sylius/Bundle/CoreBundle/spec/Form/Type/Checkout/SummaryTypeSpec.php

@@ -13,16 +13,16 @@
 
 use PhpSpec\ObjectBehavior;
 use Prophecy\Argument;
-use Sylius\Bundle\CoreBundle\Form\Type\Checkout\SummaryNoteType;
+use Sylius\Bundle\CoreBundle\Form\Type\Checkout\SummaryType;
 use Sylius\Bundle\ResourceBundle\Form\Type\AbstractResourceType;
 use Symfony\Component\Form\FormBuilderInterface;
 
 /**
- * @mixin SummaryNoteType
+ * @mixin SummaryType
  * 
  * @author Arkadiusz Krakowiak <arkadiusz.krakowiak@lakion.com>
  */
-class SummaryNoteTypeSpec extends ObjectBehavior
+class SummaryTypeSpec extends ObjectBehavior
 {
     function let()
     {
@@ -31,7 +31,7 @@ function let()
 
     function it_is_initializable()
     {
-        $this->shouldHaveType('Sylius\Bundle\CoreBundle\Form\Type\Checkout\SummaryNoteType');
+        $this->shouldHaveType('Sylius\Bundle\CoreBundle\Form\Type\Checkout\SummaryType');
     }
 
     function it_is_a_resource_form_type()
@@ -48,6 +48,6 @@ function it_builds_form(FormBuilderInterface $builder)
 
     function it_has_name()
     {
-        $this->getName()->shouldReturn('sylius_checkout_summary_note');
+        $this->getName()->shouldReturn('sylius_checkout_summary');
     }
 }

src/Sylius/Bundle/ShopBundle/Resources/config/routing/checkout.yml

@@ -84,4 +84,4 @@ sylius_shop_checkout_summary:
                 transition: create
             redirect: sylius_shop_homepage
             form:
-                type: sylius_checkout_summary_note
+                type: sylius_checkout_summary

src/Sylius/Component/Order/spec/Model/OrderSpec.php

@@ -486,4 +486,10 @@ function it_should_be_able_to_clear_items(OrderItemInterface $item)
         $this->clearItems();
         $this->shouldBeEmpty();
     }
+
+    function it_has_notes()
+    {
+        $this->setNotes('something squishy');
+        $this->getNotes()->shouldReturn('something squishy');
+    }
 }