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.

Sign up for GitHub

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][Promotion] Fix removing taxon used in promotion rule #10365

Merged
merged 8 commits into from
May 13, 2019
+626 −50
Merged

[Admin][Promotion] Fix removing taxon used in promotion rule #10365

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
8 commits
Select commit Hold shift + click to select a range
31ebf1b
[Admin][Promotion] Add scenarios for accessing a promotion with a rul…
GSadee May 8, 2019
42b957e
[Admin][Promotion] Remove deleted taxon from existing promotion rules
GSadee May 8, 2019
4083502
[Promotion] Fixes after PR review
GSadee May 9, 2019
ed2d9a1
[Promotion] Split update rule configuration after deleting taxon to s…
GSadee May 10, 2019
fd1d220
[Behat] Add info type to notification checker
GSadee May 10, 2019
060e969
[Admin] Add flash to taxon deletion listener
GSadee May 10, 2019
1e82d3c
Add variadics to taxon deletion listener
GSadee May 10, 2019
93cd924
Fixes after PR review
GSadee May 12, 2019
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
Prev Previous commit
Next Next commit
[Promotion] Fixes after PR review
  • Loading branch information
@GSadee
GSadee committed May 10, 2019
commit 40835021b7d17508fb03dbac6c968746186b2830
21 changes: 16 additions & 5 deletions src/Sylius/Behat/Context/Ui/Admin/ManagingPromotionsContext.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -213,10 +213,13 @@ public function iSpecifyThatThisActionShouldBeAppliedToItemsFromCategory($taxonN
}

/**
* @When /^I add the "([^"]+)" action configured with a percentage value of (?:|-)([^"]+)% for ("[^"]+" channel)$/
* @When /^I add the "([^"]+)" action configured with a percentage value of (?:|-)([^"]+)% for ("[^"]+") channel$/
*/
public function iAddTheActionConfiguredWithAPercentageValueForChannel($actionType, $percentage = null, $channelName)
{
public function iAddTheActionConfiguredWithAPercentageValueForChannel(
string $actionType,
string $percentage = null,
string $channelName
): void {
$this->createPage->addAction($actionType);
$this->createPage->fillActionOptionForChannel($channelName, 'Percentage', $percentage);
}
Expand Down Expand Up @@ -408,7 +411,6 @@ public function thePromotionShouldBeApplicableForTheChannel(PromotionInterface $
/**
* @Given I want to modify a :promotion promotion
* @Given /^I want to modify (this promotion)$/
* @Then I should be able to modify a :promotion promotion
*/
public function iWantToModifyAPromotion(PromotionInterface $promotion)
{
Expand Down Expand Up @@ -617,12 +619,22 @@ public function thePromotionsShouldHavePriority(PromotionInterface $promotion, i
Assert::same($this->updatePage->getPriority(), $priority);
}

/**
* @Then I should be able to modify a :promotion promotion
*/
public function iShouldBeAbleToModifyAPromotion(PromotionInterface $promotion): void
{
$this->iWantToModifyAPromotion($promotion);
$this->updatePage->saveChanges();
}

/**
* @Then the :promotion promotion should have :ruleName rule configured
*/
public function thePromotionShouldHaveRuleConfigured(PromotionInterface $promotion, string $ruleName): void
{
$this->iWantToModifyAPromotion($promotion);
GSadee marked this conversation as resolved.
Show resolved Hide resolved
$this->updatePage->saveChanges();

Assert::true($this->updatePage->hasRule($ruleName));
}
Expand All @@ -637,7 +649,6 @@ public function thePromotionShouldNotHaveAnyRuleConfigured(PromotionInterface $p
Assert::false($this->updatePage->hasAnyRule());
}


/**
* @param string $element
* @param string $expectedMessage
Expand Down
9 changes: 1 addition & 8 deletions src/Sylius/Bundle/CoreBundle/EventListener/TaxonDeletionListener.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -55,14 +55,7 @@ private function resolveHasTaxonRules(string $taxonCode): void
foreach ($promotionRules as $promotionRule) {
$configuration = $promotionRule->getConfiguration();
if (in_array($taxonCode, $configuration['taxons'])) {
GSadee marked this conversation as resolved.
Show resolved Hide resolved
$taxons = array_filter(
$configuration['taxons'],
function (string $code) use ($taxonCode) {
return $taxonCode !== $code;
}
);

$configuration['taxons'] = array_values($taxons);
$configuration['taxons'] = array_values(array_diff($configuration['taxons'], [$taxonCode]));
$promotionRule->setConfiguration($configuration);
}
}
Expand Down