Skip to content

Commit 8708e91

Browse files
PechenushkoPechenushko
committed
MAGETWO-36164: Move Online Methods Back to CE
- Merge mainline, fix conflicts
1 parent 3d1af4e commit 8708e91

File tree

7 files changed

+82
-7
lines changed

7 files changed

+82
-7
lines changed

‎app/code/Magento/Paypal/Model/Cart.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -165,7 +165,7 @@ protected function _importItemsFromSalesModel()
165165
* - Catalog Prices = Including Tax
166166
* - Shipping Prices = Including Tax
167167
* - Apply Customer Tax = After Discount
168-
* - Create a shopping cart price rule with % discount applied to the Shipping Amount
168+
* - Create a cart price rule with % discount applied to the Shipping Amount
169169
* - run shopping cart and estimate shipping
170170
* - go to PayPal
171171
*

‎app/code/Magento/Paypal/view/frontend/layout/checkout_index_index.xml

Lines changed: 61 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
<?xml version="1.0"?>
2+
<!--
3+
/**
4+
* Copyright © 2015 Magento. All rights reserved.
5+
* See COPYING.txt for license details.
6+
*/
7+
-->
8+
<page xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" layout="1column" xsi:noNamespaceSchemaLocation="../../../../../../../lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd">
9+
<body>
10+
<referenceBlock name="checkout.root">
11+
<arguments>
12+
<argument name="jsLayout" xsi:type="array">
13+
<item name="components" xsi:type="array">
14+
<item name="checkout" xsi:type="array">
15+
<item name="children" xsi:type="array">
16+
<item name="steps" xsi:type="array">
17+
<item name="children" xsi:type="array">
18+
<item name="billing-step" xsi:type="array">
19+
<item name="component" xsi:type="string">uiComponent</item>
20+
<item name="children" xsi:type="array">
21+
<item name="payment" xsi:type="array">
22+
<item name="children" xsi:type="array">
23+
<item name="renders" xsi:type="array">
24+
<!-- merge payment method renders here -->
25+
<item name="children" xsi:type="array">
26+
<item name="paypal-payments" xsi:type="array">
27+
<item name="component" xsi:type="string">Magento_Paypal/js/view/payment/paypal-payments</item>
28+
<item name="methods" xsi:type="array">
29+
<item name="payflowpro" xsi:type="array">
30+
<item name="isBillingAddressRequired" xsi:type="boolean">true</item>
31+
</item>
32+
<item name="payflow_link" xsi:type="array">
33+
<item name="isBillingAddressRequired" xsi:type="boolean">true</item>
34+
</item>
35+
<item name="payflow_advanced" xsi:type="array">
36+
<item name="isBillingAddressRequired" xsi:type="boolean">true</item>
37+
</item>
38+
<item name="hosted_pro" xsi:type="array">
39+
<item name="isBillingAddressRequired" xsi:type="boolean">true</item>
40+
</item>
41+
<item name="paypal_billing_agreement" xsi:type="array">
42+
<item name="isBillingAddressRequired" xsi:type="boolean">true</item>
43+
</item>
44+
</item>
45+
</item>
46+
</item>
47+
</item>
48+
</item>
49+
</item>
50+
</item>
51+
</item>
52+
</item>
53+
</item>
54+
</item>
55+
</item>
56+
</item>
57+
</argument>
58+
</arguments>
59+
</referenceBlock>
60+
</body>
61+
</page>

‎app/code/Magento/Paypal/view/frontend/web/js/view/payment/method-renderer/iframe-methods.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ define(
1818
redirectAfterPlaceOrder: false,
1919
isInAction: iframe.isInAction,
2020
/**
21-
* Get action url for payment mathod iframe.
21+
* Get action url for payment method iframe.
2222
* @returns {String}
2323
*/
2424
getActionUrl: function () {

‎app/code/Magento/Paypal/view/frontend/web/template/payment/iframe-methods.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@
2525
</div>
2626
<div class="actions-toolbar" data-bind="visible: !isInAction()">
2727
<div class="primary">
28-
<button data-role="review-save" type="submit" data-bind="click: placePendingPaymentOrder, attr: {title: $t('Continue')}" class="button action primary checkout"><span data-bind="text: $t('Continue')"></span></button>
28+
<button data-role="review-save"
29+
type="submit"
30+
data-bind="click: placePendingPaymentOrder, attr: {title: $t('Continue')}, css: {disabled: !isPlaceOrderActionAllowed()}"
31+
class="button action primary checkout">
32+
<span data-bind="text: $t('Continue')"></span>
33+
</button>
2934
</div>
3035
</div>
3136
<div data-bind="visible: isInAction()">

‎app/code/Magento/Paypal/view/frontend/web/template/payment/payflowpro-form.html

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,12 @@
5353
<div class="primary">
5454
<button data-role="review-save"
5555
type="submit"
56-
data-bind="attr: {title: $t('Place order')}, enable: (getCode() == isChecked()), click: placeOrder"
56+
data-bind="
57+
attr: {title: $t('Place order')},
58+
enable: (getCode() == isChecked()),
59+
click: placeOrder,
60+
css: {disabled: !isPlaceOrderActionAllowed()}
61+
"
5762
class="action primary checkout"
5863
disabled>
5964
<span data-bind="text: $t('Place order')"></span>
@@ -63,4 +68,3 @@
6368
</form>
6469
</div>
6570
</div>
66-

‎app/code/Magento/Paypal/view/frontend/web/template/payment/paypal_billing_agreement-form.html

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,12 @@
3535
<div class="primary">
3636
<button class="action primary checkout"
3737
type="submit"
38-
data-bind="click: placeOrder, attr: {title: $t('Place Order')}, enable: (getCode() == isChecked())"
38+
data-bind="
39+
click: placeOrder,
40+
attr: {title: $t('Place Order')},
41+
enable: (getCode() == isChecked()),
42+
css: {disabled: !isPlaceOrderActionAllowed()}
43+
"
3944
data-role="review-save">
4045
<span data-bind="text: $t('Place Order')"></span>
4146
</button>

‎composer.lock

Lines changed: 1 addition & 1 deletion
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

0 commit comments

Comments
 (0)