Skip to content

Commit e25c66b

Browse files
author
Michael Logvin
committed
MAGETWO-46695: Bundle ProductOptionRepositoryInterface saves option without price (price type Fixed)
1 parent 368ddf1 commit e25c66b

File tree

3 files changed

+44
-44
lines changed

3 files changed

+44
-44
lines changed

‎app/code/Magento/Bundle/Controller/Adminhtml/Product/Initialization/Helper/Plugin/Bundle.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -108,6 +108,8 @@ public function afterInitialize(
108108
foreach ($bundleLinks[$key] as $linkData) {
109109
if (!(bool)$linkData['delete']) {
110110
$link = $this->linkFactory->create(['data' => $linkData]);
111+
$link->setPrice($linkData['selection_price_value']);
112+
$link->setPriceType($linkData['selection_price_type']);
111113
$linkProduct = $this->productRepository->getById($linkData['product_id']);
112114
$link->setSku($linkProduct->getSku());
113115
$link->setQty($linkData['selection_qty']);

‎dev/tests/functional/tests/app/Magento/Bundle/Test/TestCase/CreateBundleProductEntityTest.xml

Lines changed: 20 additions & 21 deletions
Original file line numberDiff line numberDiff line change
@@ -300,27 +300,26 @@
300300
<data name="product/data/checkout_data/dataset" xsi:type="string">bundle_default</data>
301301
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
302302
</variation>
303-
<!-- Must be reverted after fix https://jira.corp.x.com/browse/MAGETWO-46695 -->
304-
<!--<variation name="CreateBundleProductEntityTestVariation15" summary="Create Bundle (fixed) Product and Assign it to Category" ticketId="MAGETWO-12622">-->
305-
<!--<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>-->
306-
<!--<data name="product/data/name" xsi:type="string">Bundle Fixed %isolation%</data>-->
307-
<!--<data name="product/data/sku_type" xsi:type="string">Fixed</data>-->
308-
<!--<data name="product/data/sku" xsi:type="string">sku_bundle_fixed_%isolation%</data>-->
309-
<!--<data name="product/data/price_type" xsi:type="string">Fixed</data>-->
310-
<!--<data name="product/data/price/value" xsi:type="string">100</data>-->
311-
<!--<data name="product/data/price/dataset" xsi:type="string">fixed-100</data>-->
312-
<!--<data name="product/data/tax_class_id/dataset" xsi:type="string">taxable_goods</data>-->
313-
<!--<data name="product/data/weight_type" xsi:type="string">Fixed</data>-->
314-
<!--<data name="product/data/weight" xsi:type="string">1</data>-->
315-
<!--<data name="product/data/category" xsi:type="string">category_%isolation%</data>-->
316-
<!--<data name="product/data/shipment_type" xsi:type="string">Together</data>-->
317-
<!--<data name="product/data/bundle_selections/dataset" xsi:type="string">two_options_with_fixed_and_percent_prices</data>-->
318-
<!--<data name="tag" xsi:type="string">test_type:acceptance_test</data>-->
319-
<!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />-->
320-
<!--<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />-->
321-
<!--<constraint name="Magento\Bundle\Test\Constraint\AssertBundleInCategory" />-->
322-
<!--<constraint name="Magento\Bundle\Test\Constraint\AssertBundleProductPage" />-->
323-
<!--</variation>-->
303+
<variation name="CreateBundleProductEntityTestVariation15" summary="Create Bundle (fixed) Product and Assign it to Category" ticketId="MAGETWO-12622">
304+
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
305+
<data name="product/data/name" xsi:type="string">Bundle Fixed %isolation%</data>
306+
<data name="product/data/sku_type" xsi:type="string">Fixed</data>
307+
<data name="product/data/sku" xsi:type="string">sku_bundle_fixed_%isolation%</data>
308+
<data name="product/data/price_type" xsi:type="string">Fixed</data>
309+
<data name="product/data/price/value" xsi:type="string">100</data>
310+
<data name="product/data/price/dataset" xsi:type="string">fixed-100</data>
311+
<data name="product/data/tax_class_id/dataset" xsi:type="string">taxable_goods</data>
312+
<data name="product/data/weight_type" xsi:type="string">Fixed</data>
313+
<data name="product/data/weight" xsi:type="string">1</data>
314+
<data name="product/data/category" xsi:type="string">category_%isolation%</data>
315+
<data name="product/data/shipment_type" xsi:type="string">Together</data>
316+
<data name="product/data/bundle_selections/dataset" xsi:type="string">two_options_with_fixed_and_percent_prices</data>
317+
<data name="tag" xsi:type="string">test_type:acceptance_test</data>
318+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductSaveMessage" />
319+
<constraint name="Magento\Catalog\Test\Constraint\AssertProductInGrid" />
320+
<constraint name="Magento\Bundle\Test\Constraint\AssertBundleInCategory" />
321+
<constraint name="Magento\Bundle\Test\Constraint\AssertBundleProductPage" />
322+
</variation>
324323
<variation name="CreateBundleProductEntityTestVariation16" summary="Create Bundle (dynamic) Product and Assign it to the Category" ticketId="MAGETWO-12702">
325324
<data name="product/data/url_key" xsi:type="string">bundle-product-%isolation%</data>
326325
<data name="product/data/name" xsi:type="string">Bundle Dynamic %isolation%</data>

‎dev/tests/functional/tests/app/Magento/Checkout/Test/TestCase/OnePageCheckoutTest.xml

Lines changed: 22 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -87,28 +87,27 @@
8787
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
8888
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal"/>
8989
</variation>
90-
<!-- Must be reverted after fix https://jira.corp.x.com/browse/MAGETWO-46695 -->
91-
<!--<variation name="OnePageCheckoutTestVariation5" summary="Guest Checkout using Check/Money Order and Free Shipping with Prices/Taxes Verifications" ticketId="MAGETWO-12412">-->
92-
<!--<data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>-->
93-
<!--<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>-->
94-
<!--<data name="checkoutMethod" xsi:type="string">guest</data>-->
95-
<!--<data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>-->
96-
<!--<data name="shipping/shipping_service" xsi:type="string">Free Shipping</data>-->
97-
<!--<data name="shipping/shipping_method" xsi:type="string">Free</data>-->
98-
<!--<data name="prices" xsi:type="array">-->
99-
<!--<item name="grandTotal" xsi:type="string">130.98</item>-->
100-
<!--</data>-->
101-
<!--<data name="cart/data/subtotal" xsi:type="string">121.00</data>-->
102-
<!--<data name="cart/data/tax_amount" xsi:type="string">9.98</data>-->
103-
<!--<data name="cart/data/shipping_amount" xsi:type="string">0.00</data>-->
104-
<!--<data name="cart/data/grand_total" xsi:type="string">130.98</data>-->
105-
<!--<data name="billingCheckboxState" xsi:type="string">Yes</data>-->
106-
<!--<data name="payment/method" xsi:type="string">checkmo</data>-->
107-
<!--<data name="configData" xsi:type="string">checkmo, freeshipping_minimum_order_amount_100</data>-->
108-
<!--<data name="tag" xsi:type="string">test_type:acceptance_test</data>-->
109-
<!--<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>-->
110-
<!--<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />-->
111-
<!--<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal"/>-->
112-
<!--</variation>-->
90+
<variation name="OnePageCheckoutTestVariation5" summary="Guest Checkout using Check/Money Order and Free Shipping with Prices/Taxes Verifications" ticketId="MAGETWO-12412">
91+
<data name="products" xsi:type="string">catalogProductSimple::product_10_dollar, configurableProduct::with_one_option, bundleProduct::bundle_fixed_100_dollar_product</data>
92+
<data name="taxRule" xsi:type="string">us_ca_ny_rule</data>
93+
<data name="checkoutMethod" xsi:type="string">guest</data>
94+
<data name="shippingAddress/dataset" xsi:type="string">US_address_1</data>
95+
<data name="shipping/shipping_service" xsi:type="string">Free Shipping</data>
96+
<data name="shipping/shipping_method" xsi:type="string">Free</data>
97+
<data name="prices" xsi:type="array">
98+
<item name="grandTotal" xsi:type="string">130.98</item>
99+
</data>
100+
<data name="cart/data/subtotal" xsi:type="string">121.00</data>
101+
<data name="cart/data/tax_amount" xsi:type="string">9.98</data>
102+
<data name="cart/data/shipping_amount" xsi:type="string">0.00</data>
103+
<data name="cart/data/grand_total" xsi:type="string">130.98</data>
104+
<data name="billingCheckboxState" xsi:type="string">Yes</data>
105+
<data name="payment/method" xsi:type="string">checkmo</data>
106+
<data name="configData" xsi:type="string">checkmo, freeshipping_minimum_order_amount_100</data>
107+
<data name="tag" xsi:type="string">test_type:acceptance_test</data>
108+
<constraint name="Magento\Checkout\Test\Constraint\AssertOrderSuccessPlacedMessage"/>
109+
<constraint name="Magento\Checkout\Test\Constraint\AssertMinicartEmpty" />
110+
<constraint name="Magento\Sales\Test\Constraint\AssertOrderGrandTotal"/>
111+
</variation>
113112
</testCase>
114113
</config>

0 commit comments

Comments
 (0)