Skip to content

Commit 5a722b5

Browse files
SeruyVSeruyV
committed
Merge remote-tracking branch 'origin/MAGETWO-94348' into 2.2-develop-pr72
2 parents 4e82a61 + ec41a07 commit 5a722b5

File tree

17 files changed

+250
-66
lines changed

17 files changed

+250
-66
lines changed

‎app/code/Magento/Bundle/Test/Mftf/ActionGroup/BundleProductsOnAdminActionGroup.xml

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -51,4 +51,14 @@
5151
<actionGroup name="CreateBundleProductForTwoSimpleProductsWithRadioTypeOptions" extends="CreateBundleProductForTwoSimpleProducts">
5252
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="Radio Buttons" after="fillOptionTitle" stepKey="selectInputType"/>
5353
</actionGroup>
54+
55+
<actionGroup name="CreateBundleProductForOneSimpleProductsWithRadioTypeOption" extends="CreateBundleProductForTwoSimpleProducts">
56+
<remove keyForRemoval="clickOnFiltersButton2"/>
57+
<remove keyForRemoval="clearFilters2"/>
58+
<remove keyForRemoval="fillNameFilter2"/>
59+
<remove keyForRemoval="applyFilters2"/>
60+
<remove keyForRemoval="selectSecondSimple"/>
61+
<remove keyForRemoval="fillDefaultQuantityForSecondProduct"/>
62+
<selectOption selector="{{AdminProductFormBundleSection.bundleOptionXInputType('0')}}" userInput="Radio Buttons" after="fillOptionTitle" stepKey="selectInputType"/>
63+
</actionGroup>
5464
</actionGroups>

‎app/code/Magento/Bundle/Test/Mftf/Section/AdminProductFormBundleSection.xml

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,5 +16,8 @@
1616
<element name="addProductsToOption" type="button" selector="[data-index='modal_set']" timeout="30"/>
1717
<element name="bundleOptionXProductYQuantity" type="input" selector="[name='bundle_options[bundle_options][{{x}}][bundle_selections][{{y}}][selection_qty]']" parameterized="true"/>
1818
<element name="bundledItems" type="block" selector="[data-index=bundle-items]"/>
19+
<element name="priceTypeSwitcher" type="button" selector="div[data-index='price_type'] div[data-role='switcher']" timeout="30"/>
20+
<element name="bundleSelectionPriceType" type="select" selector="bundle_options[bundle_options][0][bundle_selections][0][selection_price_type]"/>
21+
<element name="bundleSelectionPriceValue" type="input" selector="bundle_options[bundle_options][0][bundle_selections][0][selection_price_value]"/>
1922
</section>
2023
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Section/CheckoutPaymentSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<element name="billingAddressSameAsShipping" type="checkbox" selector=".payment-method._active [name='billing-address-same-as-shipping']"/>
4343
<element name="orderSummaryTotal" type="text" selector="tr.grand.totals span.price" />
4444
<element name="checkPaymentMethodByName" type="radio" selector="//div[@id='checkout-payment-method-load']//div[contains(., '{{paymentName}}')]/..//input[@type='radio']" parameterized="true"/>
45+
<element name="orderSummaryShippingTotal" type="text" selector=".totals.shipping.excl span.price"/>
4546
<element name="noPaymentMethods" type="text" selector=".no-quotes-block"/>
4647
</section>
4748
</sections>

‎app/code/Magento/Checkout/Test/Mftf/Test/StorefrontGuestCheckoutTestWithRestrictedCountriesForPaymentTest.xml

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -29,8 +29,8 @@
2929
<after>
3030
<deleteData createDataKey="createCategory" stepKey="deleteCategory"/>
3131
<deleteData createDataKey="createProduct" stepKey="deleteProduct"/>
32-
<magentoCLI command="config:set payment/checkmo/allowspecific" arguments="0" stepKey="unsetAllowSpecificCountiesValue"/>
33-
<magentoCLI command="config:set payment/checkmo/specificcountry" arguments="''" stepKey="unsetSpecificCountryValue" />
32+
<magentoCLI command="config:set payment/checkmo/allowspecific 0" stepKey="unsetAllowSpecificCountiesValue"/>
33+
<magentoCLI command="config:set payment/checkmo/specificcountry ''" stepKey="unsetSpecificCountryValue" />
3434
</after>
3535

3636
<!-- Add product to cart -->

‎app/code/Magento/Sales/etc/webapi.xml

Lines changed: 45 additions & 45 deletions
Original file line numberDiff line numberDiff line change
@@ -10,271 +10,271 @@
1010
<route url="/V1/orders/:id" method="GET">
1111
<service class="Magento\Sales\Api\OrderRepositoryInterface" method="get"/>
1212
<resources>
13-
<resource ref="Magento_Sales::sales" />
13+
<resource ref="Magento_Sales::actions_view" />
1414
</resources>
1515
</route>
1616
<route url="/V1/orders" method="GET">
1717
<service class="Magento\Sales\Api\OrderRepositoryInterface" method="getList"/>
1818
<resources>
19-
<resource ref="Magento_Sales::sales" />
19+
<resource ref="Magento_Sales::actions_view" />
2020
</resources>
2121
</route>
2222
<route url="/V1/orders/:id/statuses" method="GET">
2323
<service class="Magento\Sales\Api\OrderManagementInterface" method="getStatus"/>
2424
<resources>
25-
<resource ref="Magento_Sales::sales" />
25+
<resource ref="Magento_Sales::actions_view" />
2626
</resources>
2727
</route>
2828
<route url="/V1/orders/:id/cancel" method="POST">
2929
<service class="Magento\Sales\Api\OrderManagementInterface" method="cancel"/>
3030
<resources>
31-
<resource ref="Magento_Sales::sales" />
31+
<resource ref="Magento_Sales::cancel" />
3232
</resources>
3333
</route>
3434
<route url="/V1/orders/:id/emails" method="POST">
3535
<service class="Magento\Sales\Api\OrderManagementInterface" method="notify"/>
3636
<resources>
37-
<resource ref="Magento_Sales::sales" />
37+
<resource ref="Magento_Sales::emails" />
3838
</resources>
3939
</route>
4040
<route url="/V1/orders/:id/hold" method="POST">
4141
<service class="Magento\Sales\Api\OrderManagementInterface" method="hold"/>
4242
<resources>
43-
<resource ref="Magento_Sales::sales" />
43+
<resource ref="Magento_Sales::hold" />
4444
</resources>
4545
</route>
4646
<route url="/V1/orders/:id/unhold" method="POST">
4747
<service class="Magento\Sales\Api\OrderManagementInterface" method="unHold"/>
4848
<resources>
49-
<resource ref="Magento_Sales::sales" />
49+
<resource ref="Magento_Sales::unhold" />
5050
</resources>
5151
</route>
5252
<route url="/V1/orders/:id/comments" method="POST">
5353
<service class="Magento\Sales\Api\OrderManagementInterface" method="addComment"/>
5454
<resources>
55-
<resource ref="Magento_Sales::sales" />
55+
<resource ref="Magento_Sales::comment" />
5656
</resources>
5757
</route>
5858
<route url="/V1/orders/:id/comments" method="GET">
5959
<service class="Magento\Sales\Api\OrderManagementInterface" method="getCommentsList"/>
6060
<resources>
61-
<resource ref="Magento_Sales::sales" />
61+
<resource ref="Magento_Sales::actions_view" />
6262
</resources>
6363
</route>
6464
<route url="/V1/orders/create" method="PUT">
6565
<service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
6666
<resources>
67-
<resource ref="Magento_Sales::sales" />
67+
<resource ref="Magento_Sales::create" />
6868
</resources>
6969
</route>
7070
<route url="/V1/orders/:parent_id" method="PUT">
7171
<service class="Magento\Sales\Api\OrderAddressRepositoryInterface" method="save"/>
7272
<resources>
73-
<resource ref="Magento_Sales::sales" />
73+
<resource ref="Magento_Sales::create" />
7474
</resources>
7575
</route>
7676
<route url="/V1/orders/items/:id" method="GET">
7777
<service class="Magento\Sales\Api\OrderItemRepositoryInterface" method="get"/>
7878
<resources>
79-
<resource ref="Magento_Sales::sales" />
79+
<resource ref="Magento_Sales::actions_view" />
8080
</resources>
8181
</route>
8282
<route url="/V1/orders/items" method="GET">
8383
<service class="Magento\Sales\Api\OrderItemRepositoryInterface" method="getList"/>
8484
<resources>
85-
<resource ref="Magento_Sales::sales" />
85+
<resource ref="Magento_Sales::actions_view" />
8686
</resources>
8787
</route>
8888
<route url="/V1/invoices/:id" method="GET">
8989
<service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="get"/>
9090
<resources>
91-
<resource ref="Magento_Sales::sales" />
91+
<resource ref="Magento_Sales::sales_invoice" />
9292
</resources>
9393
</route>
9494
<route url="/V1/invoices" method="GET">
9595
<service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="getList"/>
9696
<resources>
97-
<resource ref="Magento_Sales::sales" />
97+
<resource ref="Magento_Sales::sales_invoice" />
9898
</resources>
9999
</route>
100100
<route url="/V1/invoices/:id/comments" method="GET">
101101
<service class="Magento\Sales\Api\InvoiceManagementInterface" method="getCommentsList"/>
102102
<resources>
103-
<resource ref="Magento_Sales::sales" />
103+
<resource ref="Magento_Sales::sales_invoice" />
104104
</resources>
105105
</route>
106106
<route url="/V1/invoices/:id/emails" method="POST">
107107
<service class="Magento\Sales\Api\InvoiceManagementInterface" method="notify"/>
108108
<resources>
109-
<resource ref="Magento_Sales::sales" />
109+
<resource ref="Magento_Sales::sales_invoice" />
110110
</resources>
111111
</route>
112112
<route url="/V1/invoices/:id/void" method="POST">
113113
<service class="Magento\Sales\Api\InvoiceManagementInterface" method="setVoid"/>
114114
<resources>
115-
<resource ref="Magento_Sales::sales" />
115+
<resource ref="Magento_Sales::sales_invoice" />
116116
</resources>
117117
</route>
118118
<route url="/V1/invoices/:id/capture" method="POST">
119119
<service class="Magento\Sales\Api\InvoiceManagementInterface" method="setCapture"/>
120120
<resources>
121-
<resource ref="Magento_Sales::sales" />
121+
<resource ref="Magento_Sales::sales_invoice" />
122122
</resources>
123123
</route>
124124
<route url="/V1/invoices/comments" method="POST">
125125
<service class="Magento\Sales\Api\InvoiceCommentRepositoryInterface" method="save"/>
126126
<resources>
127-
<resource ref="Magento_Sales::sales" />
127+
<resource ref="Magento_Sales::sales_invoice" />
128128
</resources>
129129
</route>
130130
<route url="/V1/invoices/" method="POST">
131131
<service class="Magento\Sales\Api\InvoiceRepositoryInterface" method="save"/>
132132
<resources>
133-
<resource ref="Magento_Sales::sales" />
133+
<resource ref="Magento_Sales::sales_invoice" />
134134
</resources>
135135
</route>
136136
<route url="/V1/invoice/:invoiceId/refund" method="POST">
137137
<service class="Magento\Sales\Api\RefundInvoiceInterface" method="execute"/>
138138
<resources>
139-
<resource ref="Magento_Sales::sales" />
139+
<resource ref="Magento_Sales::sales_invoice" />
140140
</resources>
141141
</route>
142142
<route url="/V1/creditmemo/:id/comments" method="GET">
143143
<service class="Magento\Sales\Api\CreditmemoManagementInterface" method="getCommentsList"/>
144144
<resources>
145-
<resource ref="Magento_Sales::sales" />
145+
<resource ref="Magento_Sales::sales_creditmemo" />
146146
</resources>
147147
</route>
148148
<route url="/V1/creditmemos" method="GET">
149149
<service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="getList"/>
150150
<resources>
151-
<resource ref="Magento_Sales::sales" />
151+
<resource ref="Magento_Sales::sales_creditmemo" />
152152
</resources>
153153
</route>
154154
<route url="/V1/creditmemo/:id" method="GET">
155155
<service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="get"/>
156156
<resources>
157-
<resource ref="Magento_Sales::sales" />
157+
<resource ref="Magento_Sales::sales_creditmemo" />
158158
</resources>
159159
</route>
160160
<route url="/V1/creditmemo/:id" method="PUT">
161161
<service class="Magento\Sales\Api\CreditmemoManagementInterface" method="cancel"/>
162162
<resources>
163-
<resource ref="Magento_Sales::sales" />
163+
<resource ref="Magento_Sales::sales_creditmemo" />
164164
</resources>
165165
</route>
166166
<route url="/V1/creditmemo/:id/emails" method="POST">
167167
<service class="Magento\Sales\Api\CreditmemoManagementInterface" method="notify"/>
168168
<resources>
169-
<resource ref="Magento_Sales::sales" />
169+
<resource ref="Magento_Sales::sales_creditmemo" />
170170
</resources>
171171
</route>
172172
<route url="/V1/creditmemo/refund" method="POST">
173173
<service class="Magento\Sales\Api\CreditmemoManagementInterface" method="refund"/>
174174
<resources>
175-
<resource ref="Magento_Sales::sales" />
175+
<resource ref="Magento_Sales::sales_creditmemo" />
176176
</resources>
177177
</route>
178178
<route url="/V1/creditmemo/:id/comments" method="POST">
179179
<service class="Magento\Sales\Api\CreditmemoCommentRepositoryInterface" method="save"/>
180180
<resources>
181-
<resource ref="Magento_Sales::sales" />
181+
<resource ref="Magento_Sales::sales_creditmemo" />
182182
</resources>
183183
</route>
184184
<route url="/V1/creditmemo" method="POST">
185185
<service class="Magento\Sales\Api\CreditmemoRepositoryInterface" method="save"/>
186186
<resources>
187-
<resource ref="Magento_Sales::sales" />
187+
<resource ref="Magento_Sales::sales_creditmemo" />
188188
</resources>
189189
</route>
190190
<route url="/V1/order/:orderId/refund" method="POST">
191191
<service class="Magento\Sales\Api\RefundOrderInterface" method="execute"/>
192192
<resources>
193-
<resource ref="Magento_Sales::sales" />
193+
<resource ref="Magento_Sales::creditmemo" />
194194
</resources>
195195
</route>
196196
<route url="/V1/shipment/:id" method="GET">
197197
<service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="get"/>
198198
<resources>
199-
<resource ref="Magento_Sales::sales" />
199+
<resource ref="Magento_Sales::shipment" />
200200
</resources>
201201
</route>
202202
<route url="/V1/shipments" method="GET">
203203
<service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="getList"/>
204204
<resources>
205-
<resource ref="Magento_Sales::sales" />
205+
<resource ref="Magento_Sales::shipment" />
206206
</resources>
207207
</route>
208208
<route url="/V1/shipment/:id/comments" method="GET">
209209
<service class="Magento\Sales\Api\ShipmentManagementInterface" method="getCommentsList"/>
210210
<resources>
211-
<resource ref="Magento_Sales::sales" />
211+
<resource ref="Magento_Sales::shipment" />
212212
</resources>
213213
</route>
214214
<route url="/V1/shipment/:id/comments" method="POST">
215215
<service class="Magento\Sales\Api\ShipmentCommentRepositoryInterface" method="save"/>
216216
<resources>
217-
<resource ref="Magento_Sales::sales" />
217+
<resource ref="Magento_Sales::shipment" />
218218
</resources>
219219
</route>
220220
<route url="/V1/shipment/:id/emails" method="POST">
221221
<service class="Magento\Sales\Api\ShipmentManagementInterface" method="notify"/>
222222
<resources>
223-
<resource ref="Magento_Sales::sales" />
223+
<resource ref="Magento_Sales::shipment" />
224224
</resources>
225225
</route>
226226
<route url="/V1/shipment/track" method="POST">
227227
<service class="Magento\Sales\Api\ShipmentTrackRepositoryInterface" method="save"/>
228228
<resources>
229-
<resource ref="Magento_Sales::sales" />
229+
<resource ref="Magento_Sales::shipment" />
230230
</resources>
231231
</route>
232232
<route url="/V1/shipment/track/:id" method="DELETE">
233233
<service class="Magento\Sales\Api\ShipmentTrackRepositoryInterface" method="deleteById"/>
234234
<resources>
235-
<resource ref="Magento_Sales::sales" />
235+
<resource ref="Magento_Sales::shipment" />
236236
</resources>
237237
</route>
238238
<route url="/V1/shipment/" method="POST">
239239
<service class="Magento\Sales\Api\ShipmentRepositoryInterface" method="save"/>
240240
<resources>
241-
<resource ref="Magento_Sales::sales" />
241+
<resource ref="Magento_Sales::shipment" />
242242
</resources>
243243
</route>
244244
<route url="/V1/shipment/:id/label" method="GET">
245245
<service class="Magento\Sales\Api\ShipmentManagementInterface" method="getLabel"/>
246246
<resources>
247-
<resource ref="Magento_Sales::sales" />
247+
<resource ref="Magento_Sales::shipment" />
248248
</resources>
249249
</route>
250250
<route url="/V1/order/:orderId/ship" method="POST">
251251
<service class="Magento\Sales\Api\ShipOrderInterface" method="execute"/>
252252
<resources>
253-
<resource ref="Magento_Sales::sales" />
253+
<resource ref="Magento_Sales::ship" />
254254
</resources>
255255
</route>
256256
<route url="/V1/orders/" method="POST">
257257
<service class="Magento\Sales\Api\OrderRepositoryInterface" method="save"/>
258258
<resources>
259-
<resource ref="Magento_Sales::sales" />
259+
<resource ref="Magento_Sales::create" />
260260
</resources>
261261
</route>
262262
<route url="/V1/transactions/:id" method="GET">
263263
<service class="Magento\Sales\Api\TransactionRepositoryInterface" method="get"/>
264264
<resources>
265-
<resource ref="Magento_Sales::sales" />
265+
<resource ref="Magento_Sales::transactions_fetch" />
266266
</resources>
267267
</route>
268268
<route url="/V1/transactions" method="GET">
269269
<service class="Magento\Sales\Api\TransactionRepositoryInterface" method="getList"/>
270270
<resources>
271-
<resource ref="Magento_Sales::sales" />
271+
<resource ref="Magento_Sales::transactions_fetch" />
272272
</resources>
273273
</route>
274274
<route url="/V1/order/:orderId/invoice" method="POST">
275275
<service class="Magento\Sales\Api\InvoiceOrderInterface" method="execute"/>
276276
<resources>
277-
<resource ref="Magento_Sales::sales" />
277+
<resource ref="Magento_Sales::invoice" />
278278
</resources>
279279
</route>
280280
</routes>

‎app/code/Magento/SalesRule/Model/Rule/Condition/Product/Subselect.php

Lines changed: 7 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,9 @@
55
*/
66
namespace Magento\SalesRule\Model\Rule\Condition\Product;
77

8+
/**
9+
* Subselect conditions for product.
10+
*/
811
class Subselect extends \Magento\SalesRule\Model\Rule\Condition\Product\Combine
912
{
1013
/**
@@ -161,9 +164,12 @@ public function validate(\Magento\Framework\Model\AbstractModel $model)
161164
}
162165
}
163166
if ($hasValidChild || parent::validate($item)) {
164-
$total += (($hasValidChild && $useChildrenTotal) ? $childrenAttrTotal : $item->getData($attr));
167+
$total += ($hasValidChild && $useChildrenTotal)
168+
? $childrenAttrTotal * $item->getQty()
169+
: $item->getData($attr);
165170
}
166171
}
172+
167173
return $this->validateAttribute($total);
168174
}
169175
}

0 commit comments

Comments
 (0)