Skip to content

Commit 1cd8257

Browse files
🔃 [EngCom] Public Pull Requests - 2.2-develop
Accepted Public Pull Requests: - magento-engcom/magento2ce#1186: #12993: Type error in Cart/Totals [Forwardport for public PR#9647] (by @p-bystritsky) - #12406: Issue/12342/js test driver removal (by @KarlDeux) Fixed GitHub Issues: - #12819: CartTotalRepository cannot handle extension attributes in quote addresses in 2.2.2 (reported by @marius-bica) has been fixed in magento-engcom/magento2ce#1186 by @p-bystritsky in 2.2-develop branch Related commits: 1. 69cad44 2. dc64138 - #12993: Type error in Cart/Totals (reported by @andrewhowdencom) has been fixed in magento-engcom/magento2ce#1186 by @p-bystritsky in 2.2-develop branch Related commits: 1. 69cad44 2. dc64138 - #12342: JSTestDriver removal (reported by @ishakhsuvarov) has been fixed in #12406 by @KarlDeux in 2.2-develop branch Related commits: 1. 2abaf8c 2. 1691621 3. ea56695 4. 126a1e3 5. b3fedbc 6. 0117f86 7. 3a907c2 8. 821bdaa 9. 2846c78 10. f4712cd 11. f0a1877 12. 5e785eb 13. 64bf208 14. 8595da6 15. 2adf9e8 16. 9b28fe2 17. 4127a8c 18. 6366f83 19. c98720f 20. de225a9 21. 9f14822 22. ad90a47 23. 35a1aca 24. 36cfa45 25. b1b001a 26. b716482 27. c5a1722 28. 40e6981 29. 2fff734 30. e510801 31. a667b63 32. 574daf5 33. faed0c5 34. ac8aa21 35. fa69aa5 36. 64f9c6d
2 parents 78028f0 + b641bf8 commit 1cd8257

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

47 files changed

+3223
-3805
lines changed

app/code/Magento/Quote/Model/Cart/CartTotalRepository.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,6 +10,7 @@
1010
use Magento\Quote\Api\CartTotalRepositoryInterface;
1111
use Magento\Catalog\Helper\Product\ConfigurationPool;
1212
use Magento\Framework\Api\DataObjectHelper;
13+
use Magento\Framework\Api\ExtensibleDataInterface;
1314
use Magento\Quote\Model\Cart\Totals\ItemConverter;
1415
use Magento\Quote\Api\CouponManagementInterface;
1516

@@ -94,6 +95,7 @@ public function get($cartId)
9495
$addressTotalsData = $quote->getShippingAddress()->getData();
9596
$addressTotals = $quote->getShippingAddress()->getTotals();
9697
}
98+
unset($addressTotalsData[ExtensibleDataInterface::EXTENSION_ATTRIBUTES_KEY]);
9799

98100
/** @var \Magento\Quote\Api\Data\TotalsInterface $quoteTotals */
99101
$quoteTotals = $this->totalsFactory->create();

dev/tests/js/JsTestDriver/testsuite/mage/accordion/accordion.js

Lines changed: 0 additions & 57 deletions
This file was deleted.

dev/tests/js/JsTestDriver/testsuite/mage/accordion/index.html

Lines changed: 0 additions & 31 deletions
This file was deleted.

dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-qunit.js

Lines changed: 0 additions & 77 deletions
This file was deleted.

dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar-test.js

Lines changed: 0 additions & 102 deletions
This file was deleted.

dev/tests/js/JsTestDriver/testsuite/mage/calendar/calendar.html

Lines changed: 0 additions & 31 deletions
This file was deleted.

dev/tests/js/JsTestDriver/testsuite/mage/calendar/date-range-test.js

Lines changed: 0 additions & 63 deletions
This file was deleted.

dev/tests/js/JsTestDriver/testsuite/mage/collapsible/content.html

Lines changed: 0 additions & 14 deletions
This file was deleted.

0 commit comments

Comments
 (0)