Skip to content

Commit 6513948

Browse files
author
Prabhu Ram
committed
MC-19254: Implement the schema changes
- removed sales-rule dependency from quote-graphql
1 parent c7b6d57 commit 6513948

File tree

3 files changed

+5
-36
lines changed

3 files changed

+5
-36
lines changed

app/code/Magento/QuoteGraphQl/Model/Cart/DiscountAggregator.php

Lines changed: 3 additions & 31 deletions
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,6 @@
77

88
namespace Magento\QuoteGraphQl\Model\Cart;
99

10-
use Magento\SalesRule\Model\Rule\Action\Discount\DataFactory;
1110
use Magento\Quote\Model\Quote;
1211

1312
/**
@@ -17,20 +16,6 @@
1716
*/
1817
class DiscountAggregator
1918
{
20-
/**
21-
* @var DataFactory
22-
*/
23-
private $discountFactory;
24-
25-
/**
26-
* @param DataFactory|null $discountDataFactory
27-
*/
28-
public function __construct(
29-
DataFactory $discountDataFactory
30-
) {
31-
$this->discountFactory = $discountDataFactory;
32-
}
33-
3419
/**
3520
* Aggregate Discount per rule
3621
*
@@ -50,24 +35,11 @@ public function aggregateDiscountPerRule(
5035
$discount = $value['discount'];
5136
$rule = $value['rule'];
5237
if (isset($discountPerRule[$key])) {
53-
/* @var \Magento\SalesRule\Model\Rule\Action\Discount\Data $ruleDiscount */
54-
$ruleDiscount = $this->discountFactory->create();
55-
/* @var \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData */
56-
$discountData = $discountPerRule[$key]['discount'];
57-
$ruleDiscount->setAmount($discountData->getAmount()+$discount->getAmount());
58-
$ruleDiscount->setBaseAmount($discountData->getBaseAmount()+$discount->getBaseAmount());
59-
$ruleDiscount->setOriginalAmount(
60-
$discountData->getOriginalAmount()+$discount->getOriginalAmount()
61-
);
62-
$ruleDiscount->setBaseOriginalAmount(
63-
$discountData->getBaseOriginalAmount()+$discount->getBaseOriginalAmount()
64-
);
65-
$discountPerRule[$key]['discount'] = $ruleDiscount;
66-
$discountPerRule[$key]['rule'] = $rule;
38+
$discountPerRule[$key]['discount'] += $discount->getAmount();
6739
} else {
68-
$discountPerRule[$key]['discount'] = $discount;
69-
$discountPerRule[$key]['rule'] = $rule;
40+
$discountPerRule[$key]['discount'] = $discount->getAmount();
7041
}
42+
$discountPerRule[$key]['rule'] = $rule;
7143
}
7244
}
7345
}

app/code/Magento/QuoteGraphQl/Model/Resolver/Discounts.php

Lines changed: 1 addition & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -60,12 +60,10 @@ private function getDiscountValues(Quote $quote)
6060
foreach ($totalDiscounts as $value) {
6161
$discount = [];
6262
$amount = [];
63-
/* @var \Magento\SalesRule\Model\Rule\Action\Discount\Data $discountData */
64-
$discountData = $value['discount'];
6563
/* @var \Magento\SalesRule\Model\Rule $rule*/
6664
$rule = $value['rule'];
6765
$discount['label'] = $rule->getStoreLabel($quote->getStore()) ?: __('Discount');
68-
$amount['value'] = $discountData->getAmount();
66+
$amount['value'] = $value['discount'];
6967
$amount['currency'] = $quote->getQuoteCurrencyCode();
7068
$discount['amount'] = $amount;
7169
$discountValues[] = $discount;

app/code/Magento/QuoteGraphQl/composer.json

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -13,8 +13,7 @@
1313
"magento/module-customer-graph-ql": "*",
1414
"magento/module-sales": "*",
1515
"magento/module-directory": "*",
16-
"magento/module-graph-ql": "*",
17-
"magento/module-sales-rule": "*"
16+
"magento/module-graph-ql": "*"
1817
},
1918
"suggest": {
2019
"magento/module-graph-ql-cache": "*"

0 commit comments

Comments
 (0)