Skip to content

Commit 04140ba

Browse files
ishakhsuvarovishakhsuvarov
authored
Merge pull request magento#1625 from magento-engcom/2.2-develop-prs
[EngCom] Public Pull Requests - 2.2-develop - MAGETWO-82724 Allow coupon code with special charater to be applied to order in checkout magento#11710 - MAGETWO-82675 Add a health check to the NGINX configuration sample magento#11690 - MAGETWO-82562 Coupon codes not showing in invoice magento#11635 - MAGETWO-82535 Fixed ability to set field config from layout xml magento#11302 [backport 2.2] magento#11643 - MAGETWO-81146 Fixing magento#10275 keyboard submit of adminhtml suggest form. magento#11250 - MAGETWO-82761 [Backport 2.2-develop] Dashboard Fix Y Axis for range magento#11751 - MAGETWO-82748 Fix Notice: freePackageValue is undefined magento#11720 - MAGETWO-82747 [TASK] Updated user.ini according to Magento DevDocs magento#11734 - MAGETWO-82537 MAGETWO-81311: Check the length of the array before attempting to sli… magento#11637 - MAGETWO-81970 Add missing translations in Magento_UI magento#11440 - MAGETWO-81904 FIX magento#11022 in 2.2-develop: Filter Groups of search criteria parameter have not been included for further processing magento#11421 - MAGETWO-82179 Fix Filter Customer Report Review 2.2-develop [Backport] magento#11522
2 parents 08f0056 + 30746ae commit 04140ba

File tree

19 files changed

+112
-45
lines changed

19 files changed

+112
-45
lines changed

‎.htaccess

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -36,7 +36,7 @@
3636
############################################
3737
## adjust memory limit
3838

39-
php_value memory_limit 768M
39+
php_value memory_limit 756M
4040
php_value max_execution_time 18000
4141

4242
############################################
@@ -59,7 +59,7 @@
5959
############################################
6060
## adjust memory limit
6161

62-
php_value memory_limit 768M
62+
php_value memory_limit 756M
6363
php_value max_execution_time 18000
6464

6565
############################################

‎.htaccess.sample

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,7 @@
3535
############################################
3636
## adjust memory limit
3737

38-
php_value memory_limit 768M
38+
php_value memory_limit 756M
3939
php_value max_execution_time 18000
4040

4141
############################################

‎.user.ini

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
memory_limit = 768M
1+
memory_limit = 756M
22
max_execution_time = 18000
33
session.auto_start = off
44
suhosin.session.cryptua = off

‎app/code/Magento/Backend/Block/Dashboard/Graph.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -421,6 +421,8 @@ public function getChartUrl($directUrl = true)
421421
$tmpstring = implode('|', $this->_axisLabels[$idx]);
422422

423423
$valueBuffer[] = $indexid . ":|" . $tmpstring;
424+
} elseif ($idx == 'y') {
425+
$valueBuffer[] = $indexid . ":|" . implode('|', $yLabels);
424426
}
425427
$indexid++;
426428
}

‎app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -62,6 +62,7 @@ public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet)
6262
*/
6363
public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria)
6464
{
65+
$this->searchCriteriaBuilder->setFilterGroups((array)$searchCriteria->getFilterGroups());
6566
$this->searchCriteriaBuilder->addFilters(
6667
[
6768
$this->filterBuilder
@@ -71,9 +72,15 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr
7172
->create(),
7273
]
7374
);
75+
76+
$this->searchCriteriaBuilder->setSortOrders((array)$searchCriteria->getSortOrders());
7477
$this->searchCriteriaBuilder->setCurrentPage($searchCriteria->getCurrentPage());
7578
$this->searchCriteriaBuilder->setPageSize($searchCriteria->getPageSize());
76-
return $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create());
79+
80+
$searchResult = $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create());
81+
$searchResult->setSearchCriteria($searchCriteria);
82+
83+
return $searchResult;
7784
}
7885

7986
/**

‎app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php

Lines changed: 13 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -168,20 +168,19 @@ protected function getFieldConfig(
168168

169169
$element = [
170170
'component' => isset($additionalConfig['component']) ? $additionalConfig['component'] : $uiComponent,
171-
'config' => [
172-
// customScope is used to group elements within a single form (e.g. they can be validated separately)
173-
'customScope' => $dataScopePrefix,
174-
'customEntry' => isset($additionalConfig['config']['customEntry'])
175-
? $additionalConfig['config']['customEntry']
176-
: null,
177-
'template' => 'ui/form/field',
178-
'elementTmpl' => isset($additionalConfig['config']['elementTmpl'])
179-
? $additionalConfig['config']['elementTmpl']
180-
: $elementTemplate,
181-
'tooltip' => isset($additionalConfig['config']['tooltip'])
182-
? $additionalConfig['config']['tooltip']
183-
: null
184-
],
171+
'config' => $this->mergeConfigurationNode(
172+
'config',
173+
$additionalConfig,
174+
[
175+
'config' => [
176+
// customScope is used to group elements within a single
177+
// form (e.g. they can be validated separately)
178+
'customScope' => $dataScopePrefix,
179+
'template' => 'ui/form/field',
180+
'elementTmpl' => $elementTemplate,
181+
],
182+
]
183+
),
185184
'dataScope' => $dataScopePrefix . '.' . $attributeCode,
186185
'label' => $attributeConfig['label'],
187186
'provider' => $providerName,

‎app/code/Magento/Checkout/view/frontend/web/js/model/resource-url-manager.js

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -75,8 +75,8 @@ define([
7575
quoteId: quoteId
7676
} : {},
7777
urls = {
78-
'guest': '/guest-carts/' + quoteId + '/coupons/' + couponCode,
79-
'customer': '/carts/mine/coupons/' + couponCode
78+
'guest': '/guest-carts/' + quoteId + '/coupons/' + encodeURIComponent(couponCode),
79+
'customer': '/carts/mine/coupons/' + encodeURIComponent(couponCode)
8080
};
8181

8282
return this.getUrl(urls, params);

‎app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -113,8 +113,9 @@ public function collectRates(RateRequest $request)
113113

114114
// Free shipping by qty
115115
$freeQty = 0;
116+
$freePackageValue = 0;
117+
116118
if ($request->getAllItems()) {
117-
$freePackageValue = 0;
118119
foreach ($request->getAllItems() as $item) {
119120
if ($item->getProduct()->isVirtual() || $item->getParentItem()) {
120121
continue;

‎app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php

Lines changed: 15 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -103,6 +103,21 @@ protected function _joinCustomers()
103103
return $this;
104104
}
105105

106+
/**
107+
* {@inheritdoc}
108+
*
109+
* Additional processing of 'customer_name' field is required, as it is a concat field, which can not be aliased.
110+
* @see _joinCustomers
111+
*/
112+
public function addFieldToFilter($field, $condition = null)
113+
{
114+
if ($field === 'customer_name') {
115+
$field = $this->getConnection()->getConcatSql(['customer.firstname', 'customer.lastname'], ' ');
116+
}
117+
118+
return parent::addFieldToFilter($field, $condition);
119+
}
120+
106121
/**
107122
* Get select count sql
108123
*

‎app/code/Magento/Sales/etc/fieldset.xml

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -486,6 +486,12 @@
486486
<aspect name="to_quote_address_shipping" />
487487
<aspect name="to_cm"/>
488488
</field>
489+
<field name="discount_description">
490+
<aspect name="to_quote" />
491+
<aspect name="to_invoice" />
492+
<aspect name="to_shipment" />
493+
<aspect name="to_cm" />
494+
</field>
489495
<field name="shipping_amount">
490496
<aspect name="to_quote_address_shipping" />
491497
<aspect name="to_cm"/>

0 commit comments

Comments
 (0)