[CatalogPromotions] Manage rules and actions from UI #13052
There are no files selected for viewing
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -13,7 +13,9 @@ | |
|
|
||
| namespace Sylius\Behat\Element\Admin\CatalogPromotion; | ||
|
|
||
| use Behat\Mink\Element\NodeElement; | ||
| use FriendsOfBehat\PageObjectExtension\Element\Element; | ||
| use Webmozart\Assert\Assert; | ||
|
|
||
| final class FormElement extends Element implements FormElementInterface | ||
| { | ||
|
|
@@ -42,18 +44,83 @@ public function uncheckChannel(string $channelName): void | |
| $this->getDocument()->uncheckField($channelName); | ||
| } | ||
|
|
||
| public function addRule(): void | ||
| { | ||
| $this->addCollectionElement('rules', 'add_rule_button'); | ||
| } | ||
|
|
||
| public function addAction(): void | ||
| { | ||
| $this->addCollectionElement('actions', 'add_action_button'); | ||
| } | ||
|
|
||
| public function chooseLastRuleVariants(array $variantCodes): void | ||
| { | ||
| $lastRule = $this->getElement('last_rule'); | ||
|
|
||
| $lastRule->find('css', 'input[type="hidden"]')->setValue(implode(',', $variantCodes)); | ||
| } | ||
|
|
||
| public function specifyLastActionDiscount(string $discount): void | ||
| { | ||
| $lastAction = $this->getElement('last_action'); | ||
|
|
||
| $lastAction->find('css', 'input')->setValue($discount); | ||
| } | ||
|
|
||
| public function getFieldValueInLocale(string $field, string $localeCode): string | ||
| { | ||
| return $this->getElement($field, ['%localeCode%' => $localeCode])->getValue(); | ||
| } | ||
|
|
||
| public function getLastRuleVariantCodes(): array | ||
| { | ||
| $lastRule = $this->getElement('last_rule'); | ||
|
|
||
| return explode(',', $lastRule->find('css', 'input[type="hidden"]')->getValue()); | ||
| } | ||
|
|
||
| public function getLastActionDiscount(): string | ||
| { | ||
| $lastAction = $this->getElement('last_action'); | ||
|
|
||
| return $lastAction->find('css', 'input')->getValue(); | ||
| } | ||
|
|
||
| protected function getDefinedElements(): array | ||
| { | ||
| return array_merge(parent::getDefinedElements(), [ | ||
| 'actions' => '#actions', | ||
| 'add_action_button' => '#actions [data-form-collection="add"]', | ||
| 'add_rule_button' => '#rules [data-form-collection="add"]', | ||
| 'channel' => '#sylius_catalog_promotion_code', | ||
| 'description' => '#sylius_catalog_promotion_translations_%localeCode%_description', | ||
| 'label' => '#sylius_catalog_promotion_translations_%localeCode%_label', | ||
| 'last_action' => '#actions [data-form-collection="item"]:last-child', | ||
| 'last_rule' => '#rules [data-form-collection="item"]:last-child', | ||
| 'name' => '#sylius_catalog_promotion_name', | ||
| 'rules' => '#rules', | ||
| ]); | ||
| } | ||
|
|
||
| private function addCollectionElement(string $collectionElement, string $buttonElement): void | ||
| { | ||
| $count = count($this->getCollectionItems($collectionElement)); | ||
|
|
||
| $this->getElement($buttonElement)->click(); | ||
|
|
||
| $this->getDocument()->waitFor(5, function () use ($count, $collectionElement) { | ||
| return $count + 1 === count($this->getCollectionItems($collectionElement)); | ||
| }); | ||
| } | ||
|
|
||
| /** @return NodeElement[] */ | ||
| private function getCollectionItems(string $collection): array | ||
| { | ||
| $items = $this->getElement($collection)->findAll('css', 'div[data-form-collection="item"]'); | ||
|
|
||
| Assert::isArray($items); | ||
|
|
||
| return $items; | ||
| } | ||
| } | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -25,5 +25,17 @@ public function checkChannel(string $channelName): void; | |
|
|
||
| public function uncheckChannel(string $channelName): void; | ||
|
|
||
| public function addRule(): void; | ||
|
|
||
| public function addAction(): void; | ||
|
|
||
| public function chooseLastRuleVariants(array $variantCodes): void; | ||
|
|
||
| public function specifyLastActionDiscount(string $discount): void; | ||
|
|
||
| public function getFieldValueInLocale(string $field, string $localeCode): string; | ||
|
|
||
| public function getLastRuleVariantCodes(): array; | ||
|
|
||
| public function getLastActionDiscount(): string; | ||
| } | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -50,6 +50,7 @@ | |
| <argument type="service" id="sylius.behat.page.admin.catalog_promotion.create" /> | ||
| <argument type="service" id="sylius.behat.page.admin.catalog_promotion.update" /> | ||
| <argument type="service" id="Sylius\Behat\Element\Admin\CatalogPromotion\FormElement" /> | ||
| <argument type="service" id="sylius.behat.shared_storage" /> | ||
| </service> | ||
|
|
||
| <service id="sylius.behat.context.ui.admin.managing_channels" class="Sylius\Behat\Context\Ui\Admin\ManagingChannelsContext"> | ||
|
|
||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -23,6 +23,21 @@ sylius_admin_ajax_product_variants_by_phrase: | |
| locale: expr:service('sylius.context.locale').getLocaleCode() | ||
| productCode: $productCode | ||
|
|
||
| sylius_admin_ajax_all_product_variants_by_phrase: | ||
| path: /search-all | ||
| methods: [GET] | ||
| defaults: | ||
| _controller: sylius.controller.product_variant:indexAction | ||
| _format: json | ||
| _sylius: | ||
| serialization_groups: [Autocomplete] | ||
| permission: true | ||
| repository: | ||
| method: findByPhrase | ||
| arguments: | ||
| phrase: $phrase | ||
| locale: expr:service('sylius.context.locale').getLocaleCode() | ||
|
|
||
| sylius_admin_ajax_product_variants_by_codes: | ||
| path: / | ||
| methods: [GET] | ||
|
|
@@ -35,3 +50,16 @@ sylius_admin_ajax_product_variants_by_codes: | |
| repository: | ||
| method: findByCodesAndProductCode | ||
| arguments: [$code, $productCode] | ||
|
|
||
| sylius_admin_ajax_all_product_variants_by_codes: | ||
| path: /all | ||
| methods: [GET] | ||
| defaults: | ||
| _controller: sylius.controller.product_variant:indexAction | ||
| _format: json | ||
| _sylius: | ||
| serialization_groups: [Autocomplete] | ||
| permission: true | ||
| repository: | ||
| method: findByCodes | ||
| arguments: [$code] | ||
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,11 +1,23 @@ | ||
| {% from '@SyliusAdmin/Macro/translationForm.html.twig' import translationForm %} | ||
|
|
||
| {% form_theme form '@SyliusAdmin/CatalogPromotion/theme.html.twig' %} | ||
|
|
||
| <div class="ui two column stackable grid"> | ||
| {{ form_errors(form) }} | ||
| <div class="column"> | ||
| <div class="ui segment"> | ||
| {{ form_row(form.code) }} | ||
| {{ form_row(form.name) }} | ||
| {{ form_row(form.channels) }} | ||
| </div> | ||
| <div class="ui segment" id="rules"> | ||
| {{ form_row(form.rules) }} | ||
| </div> | ||
| <div class="ui segment" id="actions"> | ||
| {{ form_row(form.actions) }} | ||
| </div> | ||
| </div> | ||
| <div class="column"> | ||
| {{ translationForm(form.translations) }} | ||
| </div> | ||
| </div> |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,6 @@ | ||
| {% extends '@SyliusAdmin/Form/theme.html.twig' %} | ||
|
|
||
| {% block sylius_catalog_promotion_rule_widget %} | ||
| {{ form_row(form.type) }} | ||
| {{ form_row(form.configuration, {'remote_url': path('sylius_admin_ajax_all_product_variants_by_phrase'), 'remote_criteria_type': 'contains', 'remote_criteria_name': 'phrase', 'load_edit_url': path('sylius_admin_ajax_all_product_variants_by_codes')}) }} | ||
| {% endblock %} |
This file contains hidden or 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
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,55 @@ | ||
| <?php | ||
|
|
||
| /* | ||
| * This file is part of the Sylius package. | ||
| * | ||
| * (c) Paweł Jędrzejewski | ||
| * | ||
| * For the full copyright and license information, please view the LICENSE | ||
| * file that was distributed with this source code. | ||
| */ | ||
|
|
||
| declare(strict_types=1); | ||
|
|
||
| namespace Sylius\Bundle\CoreBundle\Form\DataTransformer; | ||
|
|
||
| use Doctrine\Common\Collections\ArrayCollection; | ||
| use Doctrine\Common\Collections\Collection; | ||
| use Sylius\Component\Core\Model\ProductVariantInterface; | ||
| use Sylius\Component\Core\Model\TaxonInterface; | ||
| use Sylius\Component\Core\Repository\ProductVariantRepositoryInterface; | ||
| use Sylius\Component\Taxonomy\Repository\TaxonRepositoryInterface; | ||
| use Symfony\Component\Form\DataTransformerInterface; | ||
| use Webmozart\Assert\Assert; | ||
|
|
||
| final class ProductVariantsToCodesTransformer implements DataTransformerInterface | ||
| { | ||
| private ProductVariantRepositoryInterface $productVariantRepository; | ||
|
|
||
| public function __construct(ProductVariantRepositoryInterface $productVariantRepository) | ||
| { | ||
| $this->productVariantRepository = $productVariantRepository; | ||
| } | ||
|
|
||
| /** @throws \InvalidArgumentException */ | ||
| public function transform($value): Collection | ||
| { | ||
| Assert::nullOrIsArray($value); | ||
|
|
||
| if (empty($value)) { | ||
| return new ArrayCollection(); | ||
| } | ||
|
|
||
| return new ArrayCollection($this->productVariantRepository->findBy(['code' => $value])); | ||
| } | ||
|
|
||
| /** @throws \InvalidArgumentException */ | ||
| public function reverseTransform($productVariants): array | ||
| { | ||
| Assert::isInstanceOf($productVariants, Collection::class); | ||
|
|
||
| return array_map(function (ProductVariantInterface $productVariant) { | ||
| return $productVariant->getCode(); | ||
| }, $productVariants->toArray()); | ||
| } | ||
| } |
Oops, something went wrong.
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.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.