Skip to content

Commit 63202d2

Browse files
author
Joan He
committed
Merge remote-tracking branch 'upstream/2.3-develop' into MAGETWO-90719-reorder-exception
2 parents 678d985 + edaba3c commit 63202d2

File tree

103 files changed

+1166
-999
lines changed

Some content is hidden

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

103 files changed

+1166
-999
lines changed

‎app/code/Magento/Braintree/Gateway/Http/Client/TransactionRefund.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,6 @@ class TransactionRefund extends AbstractTransaction
1717
protected function process(array $data)
1818
{
1919
$storeId = $data['store_id'] ?? null;
20-
// sending store id and other additional keys are restricted by Braintree API
21-
unset($data['store_id']);
2220

2321
return $this->adapterFactory->create($storeId)
2422
->refund($data['transaction_id'], $data[PaymentDataBuilder::AMOUNT]);

‎app/code/Magento/Braintree/Gateway/Http/Client/TransactionSubmitForSettlement.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -19,8 +19,6 @@ class TransactionSubmitForSettlement extends AbstractTransaction
1919
protected function process(array $data)
2020
{
2121
$storeId = $data['store_id'] ?? null;
22-
// sending store id and other additional keys are restricted by Braintree API
23-
unset($data['store_id']);
2422

2523
return $this->adapterFactory->create($storeId)
2624
->submitForSettlement($data[CaptureDataBuilder::TRANSACTION_ID], $data[PaymentDataBuilder::AMOUNT]);

‎app/code/Magento/Braintree/Gateway/Http/Client/TransactionVoid.php

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -15,8 +15,6 @@ class TransactionVoid extends AbstractTransaction
1515
protected function process(array $data)
1616
{
1717
$storeId = $data['store_id'] ?? null;
18-
// sending store id and other additional keys are restricted by Braintree API
19-
unset($data['store_id']);
2018

2119
return $this->adapterFactory->create($storeId)->void($data['transaction_id']);
2220
}

‎app/code/Magento/Braintree/view/frontend/templates/paypal/button.phtml

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,6 +29,7 @@ $config = [
2929
class="action-braintree-paypal-logo" disabled>
3030
<img class="braintree-paypal-button-hidden"
3131
src="https://checkout.paypal.com/pwpp/2.17.6/images/pay-with-paypal.png"
32-
alt="Pay with PayPal"/>
32+
alt="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"
33+
title="<?= $block->escapeHtml(__('Pay with PayPal')) ?>"/>
3334
</button>
3435
</div>

‎app/code/Magento/Catalog/Model/ResourceModel/Product/Indexer/Price/DefaultPrice.php

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -547,7 +547,7 @@ protected function _prepareCustomOptionPriceTable()
547547
* @param IndexTableStructure $finalPriceTable
548548
* @return void
549549
*/
550-
private function modifyPriceIndex(IndexTableStructure $finalPriceTable)
550+
private function modifyPriceIndex(IndexTableStructure $finalPriceTable) : void
551551
{
552552
foreach ($this->priceModifiers as $priceModifier) {
553553
$priceModifier->modifyPrice($finalPriceTable);
@@ -862,6 +862,11 @@ private function getTotalTierPriceExpression(\Zend_Db_Expr $priceExpression)
862862
);
863863
}
864864

865+
/**
866+
* @param string $tableAlias
867+
* @param \Zend_Db_Expr $priceExpression
868+
* @return \Zend_Db_Expr
869+
*/
865870
private function getTierPriceExpressionForTable($tableAlias, \Zend_Db_Expr $priceExpression)
866871
{
867872
return $this->getConnection()->getCheckSql(

‎app/code/Magento/CatalogInventory/Model/Plugin/PriceIndexUpdater.php

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@ public function __construct(Processor $priceIndexProcessor)
3636
* @return Item
3737
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
3838
*/
39-
public function afterSave(Item $subject, Item $result, AbstractModel $model)
39+
public function afterSave(Item $subject, Item $result, AbstractModel $model): Item
4040
{
4141
$fields = [
4242
'is_in_stock',
@@ -55,7 +55,7 @@ public function afterSave(Item $subject, Item $result, AbstractModel $model)
5555

5656
/**
5757
* @param Item $subject
58-
* @param $result
58+
* @param mixed $result
5959
* @param int $websiteId
6060
* @return void
6161
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
@@ -67,7 +67,7 @@ public function afterUpdateSetOutOfStock(Item $subject, $result, int $websiteId)
6767

6868
/**
6969
* @param Item $subject
70-
* @param $result
70+
* @param mixed $result
7171
* @param int $websiteId
7272
* @return void
7373
* @SuppressWarnings(PHPMD.UnusedFormalParameter)

‎app/code/Magento/CatalogInventory/view/adminhtml/ui_component/product_form.xml

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -571,6 +571,7 @@
571571
<settings>
572572
<scopeLabel>[GLOBAL]</scopeLabel>
573573
<validation>
574+
<rule name="validate-integer" xsi:type="boolean">true</rule>
574575
<rule name="validate-number" xsi:type="boolean">true</rule>
575576
</validation>
576577
<label translate="true">Qty Increments</label>

‎app/code/Magento/CatalogInventory/view/adminhtml/web/js/components/qty-validator-changer.js

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,6 @@ define([
2020
var isDigits = value !== 1;
2121

2222
this.validation['validate-integer'] = isDigits;
23-
this.validation['validate-digits'] = isDigits;
2423
this.validation['less-than-equals-to'] = isDigits ? 99999999 : 99999999.9999;
2524
this.validate();
2625
}

‎app/code/Magento/CatalogSearch/Block/Advanced/Form.php

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -177,19 +177,11 @@ public function getCurrencyCount()
177177
*
178178
* @param AbstractAttribute $attribute
179179
* @return string
180+
* @SuppressWarnings(PHPMD.UnusedFormalParameter)
180181
*/
181182
public function getCurrency($attribute)
182183
{
183184
return $this->_storeManager->getStore()->getCurrentCurrencyCode();
184-
185-
$baseCurrency = $this->_storeManager->getStore()->getBaseCurrency()->getCurrencyCode();
186-
return $this->getAttributeValue(
187-
$attribute,
188-
'currency'
189-
) ? $this->getAttributeValue(
190-
$attribute,
191-
'currency'
192-
) : $baseCurrency;
193185
}
194186

195187
/**

‎app/code/Magento/Checkout/view/frontend/web/template/summary/item/details.html

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,7 @@
1212

1313
<div class="product-item-inner">
1414
<div class="product-item-name-block">
15-
<strong class="product-item-name" data-bind="text: $parent.name"></strong>
15+
<strong class="product-item-name" data-bind="html: $parent.name"></strong>
1616
<div class="details-qty">
1717
<span class="label"><!-- ko i18n: 'Qty' --><!-- /ko --></span>
1818
<span class="value" data-bind="text: $parent.qty"></span>

0 commit comments

Comments
 (0)