Skip to content

Commit ae8fbf0

Browse files
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #15184: [Backport] Removed unused class declaration and code (by @dmytro-ch) - #15183: [Backport] Corrected param in docblock (by @rogyar) - #15169: Swatches module file was missing in 2.1 (by @kaushik-chavda) - #15103: [Backport] Removed extra close tag (by @sergiy-v) - #15094: [Backport] Duplicate Order Confirmation Emails for PayPal Express checkout order (by @rogyar)
2 parents f4aec5f + 7e6a778 commit ae8fbf0

File tree

6 files changed

+25
-7
lines changed

6 files changed

+25
-7
lines changed

app/code/Magento/OfflineShipping/Block/Adminhtml/Form/Field/Export.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -21,7 +21,7 @@ class Export extends \Magento\Framework\Data\Form\Element\AbstractElement
2121
* @param \Magento\Framework\Data\Form\Element\Factory $factoryElement
2222
* @param \Magento\Framework\Data\Form\Element\CollectionFactory $factoryCollection
2323
* @param \Magento\Framework\Escaper $escaper
24-
* @param \Magento\Backend\Helper\Data $helper
24+
* @param \Magento\Backend\Model\UrlInterface $backendUrl
2525
* @param array $data
2626
*/
2727
public function __construct(

app/code/Magento/Paypal/Model/Express/Checkout.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -816,7 +816,9 @@ public function place($token, $shippingMethodCode = null)
816816
case \Magento\Sales\Model\Order::STATE_PROCESSING:
817817
case \Magento\Sales\Model\Order::STATE_COMPLETE:
818818
case \Magento\Sales\Model\Order::STATE_PAYMENT_REVIEW:
819-
$this->orderSender->send($order);
819+
if (!$order->getEmailSent()) {
820+
$this->orderSender->send($order);
821+
}
820822
$this->_checkoutSession->start();
821823
break;
822824
default:

app/code/Magento/Review/view/frontend/templates/redirect.phtml

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -8,9 +8,6 @@
88

99
?>
1010
<?php
11-
/* if(isset($GET['limit'])) {
12-
$limit = $GET['limit']
13-
}*/
1411
header("Location:{$block->getProduct()->getProductUrl()}#info-product_reviews");
1512
exit;
1613
?>

app/code/Magento/Review/view/frontend/templates/view.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -49,7 +49,7 @@
4949
<div class="actions">
5050
<div class="secondary">
5151
<a class="action back" href="<?php /* @escapeNotVerified */ echo $block->getBackUrl() ?>">
52-
<span><?php /* @escapeNotVerified */ echo __('Back to Product Reviews') ?></a></span>
52+
<span><?php /* @escapeNotVerified */ echo __('Back to Product Reviews') ?></span>
5353
</a>
5454
</div>
5555
</div>

app/code/Magento/Swatches/etc/acl.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+
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:Acl/etc/acl.xsd">
9+
<acl>
10+
<resources>
11+
<resource id="Magento_Backend::admin">
12+
<resource id="Magento_Backend::stores">
13+
<resource id="Magento_Backend::stores_attributes">
14+
<resource id="Magento_Swatches::iframe" title="Swatches" translate="title" sortOrder="70" />
15+
</resource>
16+
</resource>
17+
</resource>
18+
</resources>
19+
</acl>
20+
</config>

app/code/Magento/Version/Controller/Index/Index.php

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,6 @@
99
use Magento\Framework\App\Action\Action;
1010
use Magento\Framework\App\Action\Context;
1111
use Magento\Framework\App\ProductMetadataInterface;
12-
use Magento\Framework\Exception\StateException;
1312

1413
/**
1514
* Magento Version controller

0 commit comments

Comments
 (0)