Skip to content

Commit b5dbf38

Browse files
🔃 [Magento Community Engineering] Community Contributions - 2.3-develop expedited
Accepted Public Pull Requests: - magento#22914: magento#22899 Fix the issue with Incorrect return type at getListByCustomerId in PaymentTokenManagementInterface (by @serhiyzhovnir) - magento#22718: Resolved issue coupon codes don't work anymore magento#18183 (by @this-adarsh) - magento#22387: Checkout totals order in specific store (by @krnshah) Fixed GitHub Issues: - magento#22899: Incorrect return type at getListByCustomerId in PaymentTokenManagementInterface (reported by @eduan) has been fixed in magento#22914 by @serhiyzhovnir in 2.3-develop branch Related commits: 1. 6e5cdb1 2. f1c85d4 - magento#18183: Magento 2.2.6 coupon codes don't work anymore (reported by @Cristiano81) has been fixed in magento#22718 by @this-adarsh in 2.3-develop branch Related commits: 1. e965f0c - magento#22380: Checkout totals order in specific store (reported by @daniel-ifrim) has been fixed in magento#22387 by @krnshah in 2.3-develop branch Related commits: 1. d43eeb8 2. 20f677f
2 parents 4b2bbc7 + 37a2549 commit b5dbf38

File tree

3 files changed

+10
-3
lines changed

3 files changed

+10
-3
lines changed

app/code/Magento/Checkout/Model/Layout/AbstractTotalsProcessor.php

+6-1
Original file line numberDiff line numberDiff line change
@@ -3,16 +3,19 @@
33
* Copyright © Magento, Inc. All rights reserved.
44
* See COPYING.txt for license details.
55
*/
6+
67
namespace Magento\Checkout\Model\Layout;
78

89
use Magento\Framework\App\Config\ScopeConfigInterface;
10+
use Magento\Store\Model\ScopeInterface;
911

1012
/**
1113
* Abstract totals processor.
1214
*
1315
* Can be used to process totals information that will be rendered during checkout.
1416
* Abstract class provides sorting routing to sort total information based on configuration settings.
1517
*
18+
* phpcs:disable Magento2.Classes.AbstractApi
1619
* @api
1720
*/
1821
abstract class AbstractTotalsProcessor
@@ -35,12 +38,14 @@ public function __construct(
3538
}
3639

3740
/**
41+
* Sort total information based on configuration settings.
42+
*
3843
* @param array $totals
3944
* @return array
4045
*/
4146
public function sortTotals($totals)
4247
{
43-
$configData = $this->scopeConfig->getValue('sales/totals_sort');
48+
$configData = $this->scopeConfig->getValue('sales/totals_sort', ScopeInterface::SCOPE_STORES);
4449
foreach ($totals as $code => &$total) {
4550
//convert JS naming style to config naming style
4651
$code = str_replace('-', '_', $code);

app/code/Magento/SalesRule/etc/db_schema.xml

+1-1
Original file line numberDiff line numberDiff line change
@@ -68,7 +68,7 @@
6868
comment="Usage Per Customer"/>
6969
<column xsi:type="int" name="times_used" padding="10" unsigned="true" nullable="false" identity="false"
7070
default="0" comment="Times Used"/>
71-
<column xsi:type="timestamp" name="expiration_date" on_update="false" nullable="true"
71+
<column xsi:type="datetime" name="expiration_date" on_update="false" nullable="true"
7272
comment="Expiration Date"/>
7373
<column xsi:type="smallint" name="is_primary" padding="5" unsigned="true" nullable="true" identity="false"
7474
comment="Is Primary"/>

app/code/Magento/Vault/Api/PaymentTokenManagementInterface.php

+3-1
Original file line numberDiff line numberDiff line change
@@ -20,7 +20,7 @@ interface PaymentTokenManagementInterface
2020
* Lists payment tokens that match specified search criteria.
2121
*
2222
* @param int $customerId Customer ID.
23-
* @return \Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface Payment token search result interface.
23+
* @return \Magento\Vault\Api\Data\PaymentTokenSearchResultsInterface[] Payment token search result interface.
2424
* @since 100.1.0
2525
*/
2626
public function getListByCustomerId($customerId);
@@ -56,6 +56,8 @@ public function getByGatewayToken($token, $paymentMethodCode, $customerId);
5656
public function getByPublicHash($hash, $customerId);
5757

5858
/**
59+
* Save token with payment link
60+
*
5961
* @param PaymentTokenInterface $token
6062
* @param OrderPaymentInterface $payment
6163
* @return bool

0 commit comments

Comments
 (0)