Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

[Admin][Order] Add order notes #5319

Merged
merged 2 commits into from
Jun 24, 2016
Merged

Conversation

Arminek
Copy link
Contributor

@Arminek Arminek commented Jun 22, 2016

Q A
Bug fix? no
New feature? yes
BC breaks? no
License MIT

@Arminek Arminek changed the title [Admin][Order] Add order notes [WIP][Admin][Order] Add order notes Jun 22, 2016
@pjedrzejewski pjedrzejewski added New Feature Shop ShopBundle related issues and PRs. labels Jun 22, 2016
@pjedrzejewski
Copy link
Member

@Arminek There is a field additionalInformation on the order already...

@pjedrzejewski
Copy link
Member

@Arminek We could rename it to notes indeed.

<div class="ui attached segment" id="sylius-order-notes">
{{ order.notes }}
</div>
{% endif %}
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Missing blank line

@Arminek Arminek force-pushed the order-notes branch 2 times, most recently from b9900bc to ea324af Compare June 22, 2016 20:40
@Arminek Arminek changed the title [WIP][Admin][Order] Add order notes [Admin][Order] Add order notes Jun 22, 2016
@Arminek Arminek force-pushed the order-notes branch 3 times, most recently from 6318c0e to 76aae77 Compare June 23, 2016 08:51
@@ -134,6 +142,7 @@ protected function getDefinedElements()
'items_table' => '#items table',
'product_row' => 'tbody tr:contains("%name%")',
'order_total' => 'td:contains("Total")',
'extra_notes' =>'#sylius_checkout_summary_notes',
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Why not just notes? Add I would keep alphabetical order ;)

@@ -43,6 +43,7 @@ public function __construct(CustomerRepositoryInterface $customerRepository, Fac

/**
* @Transform :customer
* @Transform /^made by "[^"]+"$/
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This should only getCustomerByEmail and never create a customer. Add second method to this context.

/**
* @Given there is an administrator identified by :email
*/
public function theStoreHasCustomerServiceAccountIdentifiedBy($email)
Copy link
Member

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Please change customer service to administrator in shared storage and method name too.

@pjedrzejewski pjedrzejewski merged commit faaec3b into Sylius:master Jun 24, 2016
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Shop ShopBundle related issues and PRs.
Projects
None yet
Development

Successfully merging this pull request may close these issues.

None yet

5 participants