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

[Behat][Promotion] Fixed discount promotion scenarios vol 2 #4208

Conversation

Zales0123
Copy link
Member

Q A
Bug fix? no
New feature? yes
BC breaks? no
Deprecations? no
Fixed tickets
License MIT
Doc PR

Based on previous #4199.
Two last scenarios in these feature implemented, also some changes in code to fit them.

@Zales0123 Zales0123 changed the title Fixed discount promotion scenarios vol 2 [Behat][Promotion] Fixed discount promotion scenarios vol 2 Feb 18, 2016
@Zales0123 Zales0123 force-pushed the fixed-discount-promotion-scenarios-vol-2 branch from 449d0c4 to 29f68ad Compare February 18, 2016 10:54
@michalmarcinkowski michalmarcinkowski added the Enhancement Minor issues and PRs improving the current solutions (optimizations, typo fixes, etc.). label Feb 18, 2016
@michalmarcinkowski
Copy link
Contributor

We need a rebase here.

@Zales0123 Zales0123 force-pushed the fixed-discount-promotion-scenarios-vol-2 branch from 29f68ad to 1ac9d3d Compare February 19, 2016 08:53
@Zales0123
Copy link
Member Author

Rebase done, but we should definitely wait for merging #4223 😄

@Zales0123 Zales0123 force-pushed the fixed-discount-promotion-scenarios-vol-2 branch 3 times, most recently from 66741ce to e7ba3e5 Compare February 19, 2016 14:06
*/
private function calculateAdjustmentAmount($promotionSubjectTotal, $targetPromotionAmount)
{
return ($promotionSubjectTotal < $targetPromotionAmount) ? -$promotionSubjectTotal : -$targetPromotionAmount;
Copy link
Contributor

Choose a reason for hiding this comment

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

-1 * min($promotionSubjectTotal, $targetPromotionAmount), wdyt? :D

Copy link
Member Author

Choose a reason for hiding this comment

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

👍

@Zales0123 Zales0123 force-pushed the fixed-discount-promotion-scenarios-vol-2 branch from 89414a0 to c6314af Compare February 22, 2016 06:28
michalmarcinkowski added a commit that referenced this pull request Feb 22, 2016
…arios-vol-2

[Behat][Promotion] Fixed discount promotion scenarios vol 2
@michalmarcinkowski michalmarcinkowski merged commit a3de2be into Sylius:master Feb 22, 2016
@michalmarcinkowski
Copy link
Contributor

👍

@Zales0123 Zales0123 deleted the fixed-discount-promotion-scenarios-vol-2 branch October 28, 2016 13:43
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment
Labels
Enhancement Minor issues and PRs improving the current solutions (optimizations, typo fixes, etc.).
Projects
None yet
Development

Successfully merging this pull request may close these issues.

3 participants