Reports correct sum with currencies and label #3937
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
fcaraballo
commented
Jan 20, 2016
fcaraballo
commented
| Q | A |
|---|---|
| Bug fix? | yes |
| New feature? | no |
| BC breaks? | no |
| Deprecations? | no |
| Fixed tickets | #3715 |
| License | MIT |
| Doc PR | no |
- Added field exchange_rate to sylius_order in order to save the exchange rate for the time the order was placed
- Updated query for reports in order to count check the exchange rate (o.total * o.exchange_rate)
- Behat for reports feature "Getting the correct sum with exchange rate"
- Table label: if there's a base currency it will show it. For e.g. TOTAL SUM IN GBP
- Created method for getting the channel base currency (getBaseCurrency)
- Behats and PHPSpec updated
| @@ -52,4 +52,4 @@ function it_sets_currency_on_order( | |||
|
|
|||
| $this->processOrderCurrency($event); | |||
| } | |||
| } | |||
| } | |||
fcaraballo
force-pushed
the
order-exchange-rate
branch
from
dc44db5
to
611aa37
Compare
|
Updated for review |
| @@ -28,7 +28,7 @@ class SalesTotalDataFetcher extends TimePeriod | |||
| private $orderRepository; | |||
|
|
|||
| /** | |||
| * @param OrderRepositoryInterface $orderRepository | |||
| * @param OrderRepositoryInterface $orderRepository | |||
|
Updated for review |
|
@fcaraballo Could you rebase, please? :) Thanks! |
fcaraballo
force-pushed
the
order-exchange-rate
branch
2 times, most recently
from
1989ed7
to
ed2427a
Compare
| @@ -148,7 +148,16 @@ public function thereAreOrders(TableNode $table) | |||
|
|
|||
| $this->createPayment($order, $paymentMethod); | |||
|
|
|||
| $order->setCurrency('EUR'); | |||
| if (isset($data['currency']) && '' !== trim($data['currency'])) { | |||
There was a problem hiding this comment.
Why you need to check and add trim?
$currency = isset($data['currency']) ? trim($data['currency']) : 'EUR';
$order->setCurrency($currency);Should be enough?
fcaraballo
force-pushed
the
order-exchange-rate
branch
2 times, most recently
from
86c3895
to
8cea3fd
Compare
pjedrzejewski
pushed a commit
that referenced
this pull request
Jan 27, 2016
Reports correct sum with currencies and label
|
Thanks Fernando! 👍 |
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.