Skip to content

Commit 58ff359

Browse files
slavvkaslavvka
committed
Merge remote-tracking branch 'mainline/2.2-develop' into MAGETWO-97585-2.2
2 parents fac79df + 5368d41 commit 58ff359

File tree

81 files changed

+2546
-425
lines changed

Some content is hidden

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

81 files changed

+2546
-425
lines changed

‎app/code/Magento/Backend/Block/Widget/Grid/Massaction/AbstractMassaction.php

Lines changed: 14 additions & 15 deletions
Original file line numberDiff line numberDiff line change
@@ -281,24 +281,23 @@ public function getGridIdsJson()
281281
if (!$this->getUseSelectAll()) {
282282
return '';
283283
}
284-
/** @var \Magento\Framework\Data\Collection $allIdsCollection */
285-
$allIdsCollection = clone $this->getParentBlock()->getCollection();
286284

287-
if ($this->getMassactionIdField()) {
288-
$massActionIdField = $this->getMassactionIdField();
285+
/** @var \Magento\Framework\Model\ResourceModel\Db\Collection\AbstractCollection $collection */
286+
$collection = clone $this->getParentBlock()->getCollection();
287+
288+
if ($collection instanceof AbstractDb) {
289+
$idsSelect = clone $collection->getSelect();
290+
$idsSelect->reset(\Magento\Framework\DB\Select::ORDER);
291+
$idsSelect->reset(\Magento\Framework\DB\Select::LIMIT_COUNT);
292+
$idsSelect->reset(\Magento\Framework\DB\Select::LIMIT_OFFSET);
293+
$idsSelect->reset(\Magento\Framework\DB\Select::COLUMNS);
294+
$idsSelect->columns($this->getMassactionIdField(), 'main_table');
295+
$idList = $collection->getConnection()->fetchCol($idsSelect);
289296
} else {
290-
$massActionIdField = $this->getParentBlock()->getMassactionIdField();
297+
$idList = $collection->setPageSize(0)->getColumnValues($this->getMassactionIdField());
291298
}
292-
if ($allIdsCollection instanceof AbstractDb) {
293-
$allIdsCollection->getSelect()->limit();
294-
$allIdsCollection->clear();
295-
}
296-
297-
$gridIds = $allIdsCollection->setPageSize(0)->getColumnValues($massActionIdField);
298-
if (!empty($gridIds)) {
299-
return join(",", $gridIds);
300-
}
301-
return '';
299+
300+
return implode(',', $idList);
302301
}
303302

304303
/**

‎app/code/Magento/Backend/Test/Mftf/Section/AdminPopupModalSection.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,5 +10,6 @@
1010
<section name="AdminPopupModalSection">
1111
<element name="message" type="text" selector="aside.modal-popup .modal-content .popup-window-content"/>
1212
<element name="ok" type="button" selector="//span[contains(text(),'Ok')]/ancestor::button"/>
13+
<element name="confirm" type="button" selector="//aside[contains(@class, 'modal-popup')]//footer/button[normalize-space(.)='Confirm']" timeout="30"/>
1314
</section>
1415
</sections>

‎app/code/Magento/Backend/Test/Unit/Block/Widget/Grid/MassactionTest.php

Lines changed: 0 additions & 56 deletions
Original file line numberDiff line numberDiff line change
@@ -269,62 +269,6 @@ public function testGetGridIdsJsonWithoutUseSelectAll()
269269
$this->assertEmpty($this->_block->getGridIdsJson());
270270
}
271271

272-
/**
273-
* @param array $items
274-
* @param string $result
275-
*
276-
* @dataProvider dataProviderGetGridIdsJsonWithUseSelectAll
277-
*/
278-
public function testGetGridIdsJsonWithUseSelectAll(array $items, $result)
279-
{
280-
$this->_block->setUseSelectAll(true);
281-
282-
if ($this->_block->getMassactionIdField()) {
283-
$massActionIdField = $this->_block->getMassactionIdField();
284-
} else {
285-
$massActionIdField = $this->_block->getParentBlock()->getMassactionIdField();
286-
}
287-
288-
$collectionMock = $this->getMockBuilder(\Magento\Framework\Data\Collection::class)
289-
->disableOriginalConstructor()
290-
->getMock();
291-
292-
$this->_gridMock->expects($this->once())
293-
->method('getCollection')
294-
->willReturn($collectionMock);
295-
$collectionMock->expects($this->once())
296-
->method('setPageSize')
297-
->with(0)
298-
->willReturnSelf();
299-
$collectionMock->expects($this->once())
300-
->method('getColumnValues')
301-
->with($massActionIdField)
302-
->willReturn($items);
303-
304-
$this->assertEquals($result, $this->_block->getGridIdsJson());
305-
}
306-
307-
/**
308-
* @return array
309-
*/
310-
public function dataProviderGetGridIdsJsonWithUseSelectAll()
311-
{
312-
return [
313-
[
314-
[],
315-
'',
316-
],
317-
[
318-
[1],
319-
'1',
320-
],
321-
[
322-
[1, 2, 3],
323-
'1,2,3',
324-
],
325-
];
326-
}
327-
328272
/**
329273
* @param string $itemId
330274
* @param array|\Magento\Framework\DataObject $item

‎app/code/Magento/Braintree/Model/Multishipping/PlaceOrder.php

Lines changed: 177 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,177 @@
1+
<?php
2+
/**
3+
* Copyright © Magento, Inc. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
declare(strict_types=1);
7+
8+
namespace Magento\Braintree\Model\Multishipping;
9+
10+
use Magento\Braintree\Gateway\Command\GetPaymentNonceCommand;
11+
use Magento\Braintree\Model\Ui\ConfigProvider;
12+
use Magento\Braintree\Observer\DataAssignObserver;
13+
use Magento\Braintree\Model\Ui\PayPal\ConfigProvider as PaypalConfigProvider;
14+
use Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderInterface;
15+
use Magento\Sales\Api\Data\OrderInterface;
16+
use Magento\Sales\Api\Data\OrderPaymentExtensionInterface;
17+
use Magento\Sales\Api\Data\OrderPaymentExtensionInterfaceFactory;
18+
use Magento\Sales\Api\Data\OrderPaymentInterface;
19+
use Magento\Sales\Api\OrderManagementInterface;
20+
use Magento\Vault\Api\Data\PaymentTokenInterface;
21+
22+
/**
23+
* Order payments processing for multishipping checkout flow.
24+
*
25+
* @SuppressWarnings(PHPMD.CouplingBetweenObjects)
26+
*/
27+
class PlaceOrder implements PlaceOrderInterface
28+
{
29+
/**
30+
* @var OrderManagementInterface
31+
*/
32+
private $orderManagement;
33+
34+
/**
35+
* @var OrderPaymentExtensionInterfaceFactory
36+
*/
37+
private $paymentExtensionFactory;
38+
39+
/**
40+
* @var GetPaymentNonceCommand
41+
*/
42+
private $getPaymentNonceCommand;
43+
44+
/**
45+
* @param OrderManagementInterface $orderManagement
46+
* @param OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory
47+
* @param GetPaymentNonceCommand $getPaymentNonceCommand
48+
*/
49+
public function __construct(
50+
OrderManagementInterface $orderManagement,
51+
OrderPaymentExtensionInterfaceFactory $paymentExtensionFactory,
52+
GetPaymentNonceCommand $getPaymentNonceCommand
53+
) {
54+
$this->orderManagement = $orderManagement;
55+
$this->paymentExtensionFactory = $paymentExtensionFactory;
56+
$this->getPaymentNonceCommand = $getPaymentNonceCommand;
57+
}
58+
59+
/**
60+
* @inheritdoc
61+
*/
62+
public function place(array $orderList): array
63+
{
64+
if (empty($orderList)) {
65+
return [];
66+
}
67+
68+
$errorList = [];
69+
$firstOrder = $this->orderManagement->place(array_shift($orderList));
70+
// get payment token from first placed order
71+
$paymentToken = $this->getPaymentToken($firstOrder);
72+
73+
foreach ($orderList as $order) {
74+
try {
75+
/** @var OrderInterface $order */
76+
$orderPayment = $order->getPayment();
77+
$this->setVaultPayment($orderPayment, $paymentToken);
78+
$this->orderManagement->place($order);
79+
} catch (\Exception $e) {
80+
$incrementId = $order->getIncrementId();
81+
$errorList[$incrementId] = $e;
82+
}
83+
}
84+
85+
return $errorList;
86+
}
87+
88+
/**
89+
* Sets vault payment method.
90+
*
91+
* @param OrderPaymentInterface $orderPayment
92+
* @param PaymentTokenInterface $paymentToken
93+
* @return void
94+
*/
95+
private function setVaultPayment(OrderPaymentInterface $orderPayment, PaymentTokenInterface $paymentToken)
96+
{
97+
$vaultMethod = $this->getVaultPaymentMethod(
98+
$orderPayment->getMethod()
99+
);
100+
$orderPayment->setMethod($vaultMethod);
101+
102+
$publicHash = $paymentToken->getPublicHash();
103+
$customerId = $paymentToken->getCustomerId();
104+
$result = $this->getPaymentNonceCommand->execute(
105+
['public_hash' => $publicHash, 'customer_id' => $customerId]
106+
)
107+
->get();
108+
109+
$orderPayment->setAdditionalInformation(
110+
DataAssignObserver::PAYMENT_METHOD_NONCE,
111+
$result['paymentMethodNonce']
112+
);
113+
$orderPayment->setAdditionalInformation(
114+
PaymentTokenInterface::PUBLIC_HASH,
115+
$publicHash
116+
);
117+
$orderPayment->setAdditionalInformation(
118+
PaymentTokenInterface::CUSTOMER_ID,
119+
$customerId
120+
);
121+
}
122+
123+
/**
124+
* Returns vault payment method.
125+
*
126+
* For placing sequence of orders, we need to replace the original method on the vault method.
127+
*
128+
* @param string $method
129+
* @return string
130+
*/
131+
private function getVaultPaymentMethod(string $method): string
132+
{
133+
$vaultPaymentMap = [
134+
ConfigProvider::CODE => ConfigProvider::CC_VAULT_CODE,
135+
PaypalConfigProvider::PAYPAL_CODE => PaypalConfigProvider::PAYPAL_VAULT_CODE
136+
];
137+
138+
return $vaultPaymentMap[$method] ?? $method;
139+
}
140+
141+
/**
142+
* Returns payment token.
143+
*
144+
* @param OrderInterface $order
145+
* @return PaymentTokenInterface
146+
* @throws \BadMethodCallException
147+
*/
148+
private function getPaymentToken(OrderInterface $order): PaymentTokenInterface
149+
{
150+
$orderPayment = $order->getPayment();
151+
$extensionAttributes = $this->getExtensionAttributes($orderPayment);
152+
$paymentToken = $extensionAttributes->getVaultPaymentToken();
153+
154+
if ($paymentToken === null) {
155+
throw new \BadMethodCallException('Vault Payment Token should be defined for placed order payment.');
156+
}
157+
158+
return $paymentToken;
159+
}
160+
161+
/**
162+
* Gets payment extension attributes.
163+
*
164+
* @param OrderPaymentInterface $payment
165+
* @return OrderPaymentExtensionInterface
166+
*/
167+
private function getExtensionAttributes(OrderPaymentInterface $payment): OrderPaymentExtensionInterface
168+
{
169+
$extensionAttributes = $payment->getExtensionAttributes();
170+
if (null === $extensionAttributes) {
171+
$extensionAttributes = $this->paymentExtensionFactory->create();
172+
$payment->setExtensionAttributes($extensionAttributes);
173+
}
174+
175+
return $extensionAttributes;
176+
}
177+
}

‎app/code/Magento/Braintree/composer.json

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@
1818
"magento/module-quote": "101.0.*",
1919
"magento/module-paypal": "100.2.*",
2020
"magento/module-ui": "101.0.*",
21+
"magento/module-multishipping": "100.2.*",
2122
"braintree/braintree_php": "3.28.0"
2223
},
2324
"suggest": {

‎app/code/Magento/Braintree/etc/config.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -42,6 +42,7 @@
4242
<paymentInfoKeys>cc_type,cc_number,avsPostalCodeResponseCode,avsStreetAddressResponseCode,cvvResponseCode,processorAuthorizationCode,processorResponseCode,processorResponseText,liabilityShifted,liabilityShiftPossible,riskDataId,riskDataDecision</paymentInfoKeys>
4343
<avs_ems_adapter>Magento\Braintree\Model\AvsEmsCodeMapper</avs_ems_adapter>
4444
<cvv_ems_adapter>Magento\Braintree\Model\CvvEmsCodeMapper</cvv_ems_adapter>
45+
<group>braintree_group</group>
4546
</braintree>
4647
<braintree_paypal>
4748
<model>BraintreePayPalFacade</model>
@@ -67,6 +68,7 @@
6768
<privateInfoKeys>processorResponseCode,processorResponseText,paymentId</privateInfoKeys>
6869
<paymentInfoKeys>processorResponseCode,processorResponseText,paymentId,payerEmail</paymentInfoKeys>
6970
<supported_locales>en_US,en_GB,en_AU,da_DK,fr_FR,fr_CA,de_DE,zh_HK,it_IT,nl_NL,no_NO,pl_PL,es_ES,sv_SE,tr_TR,pt_BR,ja_JP,id_ID,ko_KR,pt_PT,ru_RU,th_TH,zh_CN,zh_TW</supported_locales>
71+
<group>braintree_group</group>
7072
</braintree_paypal>
7173
<braintree_cc_vault>
7274
<model>BraintreeCreditCardVaultFacade</model>
@@ -76,6 +78,7 @@
7678
<tokenFormat>Magento\Braintree\Model\InstantPurchase\CreditCard\TokenFormatter</tokenFormat>
7779
<additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
7880
</instant_purchase>
81+
<group>braintree_group</group>
7982
</braintree_cc_vault>
8083
<braintree_paypal_vault>
8184
<model>BraintreePayPalVaultFacade</model>
@@ -85,6 +88,7 @@
8588
<tokenFormat>Magento\Braintree\Model\InstantPurchase\PayPal\TokenFormatter</tokenFormat>
8689
<additionalInformation>Magento\Braintree\Model\InstantPurchase\PaymentAdditionalInformationProvider</additionalInformation>
8790
</instant_purchase>
91+
<group>braintree_group</group>
8892
</braintree_paypal_vault>
8993
</payment>
9094
</default>

‎app/code/Magento/Braintree/etc/frontend/di.xml

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -61,4 +61,12 @@
6161
<argument name="resolver" xsi:type="object">Magento\Braintree\Model\LocaleResolver</argument>
6262
</arguments>
6363
</type>
64+
<type name="Magento\Multishipping\Model\Checkout\Type\Multishipping\PlaceOrderPool">
65+
<arguments>
66+
<argument name="services" xsi:type="array">
67+
<item name="braintree" xsi:type="string">Magento\Braintree\Model\Multishipping\PlaceOrder</item>
68+
<item name="braintree_paypal" xsi:type="string">Magento\Braintree\Model\Multishipping\PlaceOrder</item>
69+
</argument>
70+
</arguments>
71+
</type>
6472
</config>

‎app/code/Magento/Braintree/etc/payment.xml

Lines changed: 23 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,23 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<payment xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:module:Magento_Payment:etc/payment.xsd">
10+
<groups>
11+
<group id="braintree_group">
12+
<label>Braintree</label>
13+
</group>
14+
</groups>
15+
<methods>
16+
<method name="braintree">
17+
<allow_multiple_address>1</allow_multiple_address>
18+
</method>
19+
<method name="braintree_paypal">
20+
<allow_multiple_address>1</allow_multiple_address>
21+
</method>
22+
</methods>
23+
</payment>

‎app/code/Magento/Braintree/view/frontend/layout/multishipping_checkout_billing.xml

Lines changed: 20 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © Magento, Inc. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
9+
xsi:noNamespaceSchemaLocation="urn:magento:framework:View/Layout/etc/page_configuration.xsd">
10+
<body>
11+
<referenceBlock name="checkout_billing">
12+
<arguments>
13+
<argument name="form_templates" xsi:type="array">
14+
<item name="braintree" xsi:type="string">Magento_Braintree::multishipping/form.phtml</item>
15+
<item name="braintree_paypal" xsi:type="string">Magento_Braintree::multishipping/form_paypal.phtml</item>
16+
</argument>
17+
</arguments>
18+
</referenceBlock>
19+
</body>
20+
</page>

0 commit comments

Comments
 (0)