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

Jump to bottom

magento/magento2#12396: Total Amount cart rule without tax #21288

Merged
merged 5 commits into from
Mar 20, 2019
Merged

magento/magento2#12396: Total Amount cart rule without tax #21288

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
6ae859a
magento/magento2#12396: Total Amount cart rule without tax
AleksLi Feb 17, 2019
c25656b
Merge remote-tracking branch 'mainline/2.3-develop' into MC-12396-sub…
nmalevanec Mar 12, 2019
23ed015
Fix functional tests.
nmalevanec Mar 15, 2019
e9389ee
Merge branch '2.3-develop-mainline' into MC-12396-subtotal-excl-tax
nmalevanec Mar 15, 2019
571f055
Fix functional tests.
nmalevanec Mar 15, 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
1 change: 1 addition & 0 deletions app/code/Magento/SalesRule/Model/Rule/Condition/Address.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,7 @@ public function __construct(
public function loadAttributeOptions()
{
$attributes = [
'base_subtotal_with_discount' => __('Subtotal (Excl. Tax)'),
Copy link
Contributor

Choose a reason for hiding this comment

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

Are you sure that the base_subtotal_with_discount is the Subtotal Excluding Tax?
Its name (and usage in the code) makes me think that it is not.
Maybe I am wrong, can you help me understand?
Thanks!

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'm pretty sure that that's the correct subtotal to apply a coupon. I've taken it from the collect method which is always running. All that data in any case will be in the Quote.

'base_subtotal' => __('Subtotal'),
'total_qty' => __('Total Items Quantity'),
'weight' => __('Total Weight'),
Expand Down
19 changes: 16 additions & 3 deletions dev/tests/functional/lib/Magento/Mtf/Client/Element/ConditionsElement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -195,6 +195,13 @@ class ConditionsElement extends SimpleElement
*/
protected $exception;

/**
* Condition option text selector.
*
* @var string
*/
private $conditionOptionTextSelector = '//option[normalize-space(text())="%s"]';

/**
* @inheritdoc
*/
Expand Down Expand Up @@ -282,10 +289,16 @@ protected function addCondition($type, ElementInterface $context)
$count = 0;

do {
$newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();

try {
$newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select')->setValue($type);
$specificType = $newCondition->find(
sprintf($this->conditionOptionTextSelector, $type),
Locator::SELECTOR_XPATH
)->isPresent();
$newCondition->find($this->addNew, Locator::SELECTOR_XPATH)->click();
$condition = $specificType
? $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'selectcondition')
: $newCondition->find($this->typeNew, Locator::SELECTOR_XPATH, 'select');
$condition->setValue($type);
$isSetType = true;
} catch (\PHPUnit_Extensions_Selenium2TestCase_WebDriverException $e) {
$isSetType = false;
Expand Down
20 changes: 20 additions & 0 deletions dev/tests/functional/lib/Magento/Mtf/Client/Element/SelectconditionElement.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
<?php
/**
* Copyright © Magento, Inc. All rights reserved.
* See COPYING.txt for license details.
*/

declare(strict_types=1);

namespace Magento\Mtf\Client\Element;

/**
* @inheritdoc
*/
class SelectconditionElement extends SelectElement
{
/**
* @inheritdoc
*/
protected $optionByValue = './/option[normalize-space(.)=%s]';
}