Skip to content

Commit 6e7c519

Browse files
sivaschenkosivaschenko
committed
Merge branch 'develop' of https://github.corp.ebay.com/magento2/magento2ce into MAGETWO-39917
2 parents 843cae7 + 03e6a16 commit 6e7c519

File tree

197 files changed

+5566
-1408
lines changed

Some content is hidden

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

197 files changed

+5566
-1408
lines changed

‎app/code/Magento/Authorizenet/Model/Directpost.php

Lines changed: 22 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -898,4 +898,26 @@ protected function addStatusCommentOnUpdate(
898898
}
899899
return $this;
900900
}
901+
902+
/**
903+
* Sets method code
904+
*
905+
* @param string $methodCode
906+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
907+
* @return void
908+
*/
909+
public function setMethodCode($methodCode)
910+
{
911+
}
912+
913+
/**
914+
* Sets path pattern
915+
*
916+
* @param string $pathPattern
917+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
918+
* @return void
919+
*/
920+
public function setPathPattern($pathPattern)
921+
{
922+
}
901923
}

‎app/code/Magento/Checkout/view/frontend/templates/cart/form.phtml

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,19 +45,21 @@
4545
<?php endif; ?>
4646
<button type="submit"
4747
name="update_cart_action"
48+
data-cart-empty=""
4849
value="empty_cart"
4950
title="<?php echo $block->escapeHtml(__('Clear Shopping Cart')); ?>"
5051
class="action clear" id="empty_cart_button">
5152
<span><?php echo __('Clear Shopping Cart'); ?></span>
5253
</button>
5354
<button type="submit"
5455
name="update_cart_action"
56+
data-cart-item-update=""
5557
value="update_qty"
5658
title="<?php echo $block->escapeHtml(__('Update Shopping Cart')); ?>"
5759
class="action update">
5860
<span><?php echo __('Update Shopping Cart'); ?></span>
5961
</button>
60-
<input type="hidden" value="" id="update_cart_action_container" />
62+
<input type="hidden" value="" id="update_cart_action_container" data-cart-item-update=""/>
6163
</div>
6264
</form>
6365
<?php echo $block->getChildHtml('checkout.cart.order.actions') ?>

‎app/code/Magento/Checkout/view/frontend/templates/cart/item/default.phtml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -93,6 +93,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
9393
<div class="control qty">
9494
<input id="cart-<?php echo $_item->getId() ?>-qty"
9595
name="cart[<?php echo $_item->getId() ?>][qty]"
96+
data-cart-item-id="<?php echo $_item->getSku() ?>"
9697
value="<?php echo $block->getQty() ?>"
9798
type="number"
9899
size="4"

‎app/code/Magento/Checkout/view/frontend/web/template/shipping.html

Lines changed: 5 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,7 @@
44
* See COPYING.txt for license details.
55
*/
66
-->
7-
<li id="opc-shipping" data-bind="fadeVisible: visible()">
7+
<li id="opc-shipping" class="checkout-shipping-address" data-bind="fadeVisible: visible()">
88
<div class="step-title" data-bind="text: $t('Shipping Address')" data-role="title"></div>
99
<div id="checkout-step-shipping"
1010
class="step-content"
@@ -48,7 +48,10 @@
4848

4949

5050
<!--Shipping method template-->
51-
<li id="opc-shipping_method" data-bind="fadeVisible: visible(), blockLoader: isLoading" role="presentation">
51+
<li id="opc-shipping_method"
52+
class="checkout-shipping-method"
53+
data-bind="fadeVisible: visible(), blockLoader: isLoading"
54+
role="presentation">
5255
<div class="checkout-shipping-method">
5356
<div class="step-title" data-bind="text: $t('Shipping Methods')" data-role="title"></div>
5457
<!-- ko foreach: getRegion('before-shipping-method-form') -->

‎app/code/Magento/Downloadable/view/frontend/templates/checkout/cart/item/default.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -87,7 +87,7 @@ $canApplyMsrp = $helper->isShowBeforeOrderConfirm($product) && $helper->isMinima
8787
<?php endif; ?>
8888
<td class="col qty" data-th="<?php echo $block->escapeHtml(__('Qty')); ?>">
8989
<div class="control qty">
90-
<input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $block->getQty() ?>" type="number" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" maxlength="12" data-validate="{'required-number':true,'validate-greater-than-zero':true}" data-role="cart-item-qty"/>
90+
<input name="cart[<?php echo $_item->getId() ?>][qty]" value="<?php echo $block->getQty() ?>" type="number" size="4" title="<?php echo __('Qty') ?>" class="input-text qty" data-cart-item-id="<?php echo $block->escapeHtml(__($_item->getSku())) ?>" maxlength="12" data-validate="{'required-number':true,'validate-greater-than-zero':true}" data-role="cart-item-qty"/>
9191
</div>
9292
<?php $cols++; ?>
9393
</td>

‎app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@
4242
<span><?php echo __('Qty') ?></span>
4343
</label>
4444
<div class="control">
45-
<input type="number" id="ship-<?php echo $_index ?>-<?php echo $_item->getQuoteItemId() ?>-qty" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $block->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/>
45+
<input type="number" data-multiship-item-id="<?php echo $_item->getSku() ?>" id="ship-<?php echo $_index ?>-<?php echo $_item->getQuoteItemId() ?>-qty" name="ship[<?php echo $_index ?>][<?php echo $_item->getQuoteItemId() ?>][qty]" value="<?php echo $block->escapeHtml($_item->getQty()) ?>" size="2" class="input-text qty" data-validate="{number: true}"/>
4646
</div>
4747
</div>
4848
</td>
@@ -61,7 +61,7 @@
6161
<?php endif; ?>
6262
</td>
6363
<td class="col actions" data-th="<?php echo $block->escapeHtml(__('Actions'));?>">
64-
<a href="<?php echo $block->getItemDeleteUrl($_item) ?>" title="<?php echo __('Remove Item') ?>" class="action delete">
64+
<a href="<?php echo $block->getItemDeleteUrl($_item) ?>" title="<?php echo __('Remove Item') ?>" class="action delete" data-multiship-item-update="">
6565
<span><?php echo __('Remove item') ?></span>
6666
</a>
6767
</td>
@@ -76,7 +76,7 @@
7676
<button type="submit" title="<?php echo __('Go to Shipping Information') ?>" class="action primary continue<?php if ($block->isContinueDisabled()):?> disabled<?php endif; ?>" data-role="can-continue" data-flag="1"<?php if ($block->isContinueDisabled()):?> disabled="disabled"<?php endif; ?>><span><?php echo __('Go to Shipping Information') ?></span></button>
7777
</div>
7878
<div class="secondary">
79-
<button type="submit" class="action update" data-role="can-continue" data-flag="0"><span><?php echo __('Update Qty &amp; Addresses') ?></span></button>
79+
<button type="submit" data-multiship-item-update="" class="action update" data-role="can-continue" data-flag="0"><span><?php echo __('Update Qty &amp; Addresses') ?></span></button>
8080
<button type="button" title="<?php echo __('Enter a New Address') ?>" class="action add" data-role="add-new-address"><span><?php echo __('Enter a New Address') ?></span></button>
8181
<a href="<?php echo $block->getBackUrl() ?>" class="action back"><span><?php echo __('Back to Shopping Cart') ?></span></a>
8282
</div>

‎app/code/Magento/Newsletter/Model/Resource/Subscriber/Collection.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -146,7 +146,7 @@ public function showCustomerInfo()
146146
[
147147
'customer' => $this->getTable('customer_entity')
148148
],
149-
'main_table.customer_id',
149+
'main_table.customer_id = customer.entity_id',
150150
[
151151
'customer_lastname' => 'lastname',
152152
'customer_firstname' => 'firstname'

‎app/code/Magento/Payment/Block/ConfigurableInfo.php

Lines changed: 118 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,118 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Payment\Block;
7+
8+
use Magento\Framework\Phrase;
9+
use Magento\Framework\View\Element\Template\Context;
10+
use Magento\Payment\Gateway\ConfigInterface;
11+
12+
class ConfigurableInfo extends \Magento\Payment\Block\Info
13+
{
14+
/**
15+
* @var ConfigInterface
16+
*/
17+
private $config;
18+
19+
/**
20+
* @param Context $context
21+
* @param ConfigInterface $config
22+
* @param array $data
23+
*/
24+
public function __construct(
25+
Context $context,
26+
ConfigInterface $config,
27+
array $data = []
28+
) {
29+
parent::__construct($context, $data);
30+
$this->config = $config;
31+
32+
if (isset($data['pathPattern'])) {
33+
$this->config->setPathPattern($data['pathPattern']);
34+
}
35+
36+
if (isset($data['pathPattern'])) {
37+
$this->config->setMethodCode($data['methodCode']);
38+
}
39+
}
40+
41+
/**
42+
* Prepare PayPal-specific payment information
43+
*
44+
* @param \Magento\Framework\Object|array|null $transport
45+
* @return \Magento\Framework\Object
46+
*/
47+
protected function _prepareSpecificInformation($transport = null)
48+
{
49+
$transport = parent::_prepareSpecificInformation($transport);
50+
$payment = $this->getInfo();
51+
$fieldsToStore = explode(',', (string)$this->config->getValue('paymentInfoKeys'));
52+
if ($this->getIsSecureMode()) {
53+
$fieldsToStore = array_diff(
54+
$fieldsToStore,
55+
explode(',', (string)$this->config->getValue('privateInfoKeys'))
56+
);
57+
}
58+
59+
foreach ($fieldsToStore as $field) {
60+
if ($payment->getAdditionalInformation($field) !== null) {
61+
$this->setDataToTransfer(
62+
$transport,
63+
$field,
64+
$payment->getAdditionalInformation($field)
65+
);
66+
67+
}
68+
}
69+
70+
return $transport;
71+
}
72+
73+
/**
74+
* Sets data to transport
75+
*
76+
* @param \Magento\Framework\Object $transport
77+
* @param string $field
78+
* @param string $value
79+
* @return void
80+
*/
81+
protected function setDataToTransfer(
82+
\Magento\Framework\Object $transport,
83+
$field,
84+
$value
85+
) {
86+
$transport->setData(
87+
(string)$this->getLabel($field),
88+
(string)$this->getValueView(
89+
$field,
90+
$value
91+
)
92+
);
93+
}
94+
95+
/**
96+
* Returns label
97+
*
98+
* @param string $field
99+
* @return string | Phrase
100+
*/
101+
protected function getLabel($field)
102+
{
103+
return $field;
104+
}
105+
106+
/**
107+
* Returns value view
108+
*
109+
* @param string $field
110+
* @param string $value
111+
* @return string | Phrase
112+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
113+
*/
114+
protected function getValueView($field, $value)
115+
{
116+
return $value;
117+
}
118+
}

‎app/code/Magento/Payment/Block/Info/Cc.php

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -101,6 +101,7 @@ protected function _prepareSpecificInformation($transport = null)
101101
if ($this->getInfo()->getCcLast4()) {
102102
$data[(string)__('Credit Card Number')] = sprintf('xxxx-%s', $this->getInfo()->getCcLast4());
103103
}
104+
104105
if (!$this->getIsSecureMode()) {
105106
if ($ccSsIssue = $this->getInfo()->getCcSsIssue()) {
106107
$data[(string)__('Switch/Solo/Maestro Issue Number')] = $ccSsIssue;

‎app/code/Magento/Payment/Gateway/Command/NullCommand.php

Lines changed: 25 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
<?php
2+
/**
3+
* Copyright © 2015 Magento. All rights reserved.
4+
* See COPYING.txt for license details.
5+
*/
6+
namespace Magento\Payment\Gateway\Command;
7+
8+
use Magento\Payment\Gateway\Command;
9+
use Magento\Payment\Gateway\CommandInterface;
10+
11+
class NullCommand implements CommandInterface
12+
{
13+
/**
14+
* Null command. Does nothing. Stable.
15+
*
16+
* @param array $commandSubject
17+
*
18+
* @return null|Command\ResultInterface
19+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
20+
*/
21+
public function execute(array $commandSubject)
22+
{
23+
return null;
24+
}
25+
}

0 commit comments

Comments
 (0)