From eefdc1cdb6c21298e135fbbf986cabf742647caa Mon Sep 17 00:00:00 2001 From: Romain Ruaud Date: Thu, 5 Oct 2017 16:15:21 +0200 Subject: [PATCH 01/17] Fixing keyboard submit of adminhtml suggest form. --- lib/web/mage/backend/suggest.js | 14 ++++++++++++++ 1 file changed, 14 insertions(+) diff --git a/lib/web/mage/backend/suggest.js b/lib/web/mage/backend/suggest.js index 81bde35f9e12a..2ce3405783ea1 100644 --- a/lib/web/mage/backend/suggest.js +++ b/lib/web/mage/backend/suggest.js @@ -245,6 +245,20 @@ case keyCode.ENTER: case keyCode.NUMPAD_ENTER: + suggestList = event.currentTarget.parentNode.getElementsByTagName('ul')[0]; + hasSelectedItems = suggestList.getElementsByClassName('_active').length >= 0; + + if (hasSelectedItems) { + selectedItem = $(suggestList.getElementsByClassName('_active')[0]); + /* eslint-disable max-depth */ + if (selectedItem.find('a') && selectedItem.find('a').attr('href') !== undefined) { + window.location = selectedItem.find('a').attr('href'); + event.preventDefault(); + + return false; + } + /* eslint-enable max-depth */ + } if (this.isDropdownShown() && this._focused) { this._proxyEvents(event); From 2fd48e6a99da3f6283cbad36a9b730b7a23cf767 Mon Sep 17 00:00:00 2001 From: David Verholen Date: Fri, 13 Oct 2017 11:15:46 +0200 Subject: [PATCH 02/17] [BUGFIX][11022] include original search criteria #fixes 11022 --- .../Magento/Catalog/Model/Product/Attribute/SetRepository.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php b/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php index ab6cdb3b464a4..44e99d4f29926 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php @@ -62,6 +62,7 @@ public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet) */ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria) { + $this->searchCriteriaBuilder->setFilterGroups($searchCriteria->getFilterGroups()); $this->searchCriteriaBuilder->addFilters( [ $this->filterBuilder @@ -71,6 +72,7 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr ->create(), ] ); + $this->searchCriteriaBuilder->setSortOrders((array)$searchCriteria->getSortOrders()); $this->searchCriteriaBuilder->setCurrentPage($searchCriteria->getCurrentPage()); $this->searchCriteriaBuilder->setPageSize($searchCriteria->getPageSize()); return $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create()); From a85d164f6c08b1fc37fd4df1fbd3c4a8e871749d Mon Sep 17 00:00:00 2001 From: David Verholen Date: Fri, 13 Oct 2017 15:17:23 +0200 Subject: [PATCH 03/17] [BUGFIX][11022] return original search criteria in search result --- .../Model/Product/Attribute/SetRepository.php | 7 ++++++- .../Catalog/Api/AttributeSetRepositoryTest.php | 14 ++------------ 2 files changed, 8 insertions(+), 13 deletions(-) diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php b/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php index 44e99d4f29926..dafa7581253fd 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php @@ -72,10 +72,15 @@ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCr ->create(), ] ); + $this->searchCriteriaBuilder->setSortOrders((array)$searchCriteria->getSortOrders()); $this->searchCriteriaBuilder->setCurrentPage($searchCriteria->getCurrentPage()); $this->searchCriteriaBuilder->setPageSize($searchCriteria->getPageSize()); - return $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create()); + + $searchResult = $this->attributeSetRepository->getList($this->searchCriteriaBuilder->create()); + $searchResult->setSearchCriteria($searchCriteria); + + return $searchResult; } /** diff --git a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetRepositoryTest.php b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetRepositoryTest.php index 5e640390c3231..4f917a9c9961a 100644 --- a/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetRepositoryTest.php +++ b/dev/tests/api-functional/testsuite/Magento/Catalog/Api/AttributeSetRepositoryTest.php @@ -165,19 +165,9 @@ public function testGetList() { $searchCriteria = [ 'searchCriteria' => [ - 'filter_groups' => [ - [ - 'filters' => [ - [ - 'field' => 'entity_type_code', - 'value' => 'catalog_product', - 'condition_type' => 'eq', - ], - ], - ], - ], + 'filter_groups' => [], 'current_page' => 1, - 'page_size' => 2, + 'page_size' => 2 ], ]; From 3ec56ac9158f5d344c387f62315696360a12a60d Mon Sep 17 00:00:00 2001 From: David Verholen Date: Fri, 13 Oct 2017 15:18:40 +0200 Subject: [PATCH 04/17] [BUGFIX][11022] typecast filtergroups array --- .../Magento/Catalog/Model/Product/Attribute/SetRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php b/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php index dafa7581253fd..14774103b8cd2 100644 --- a/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php +++ b/app/code/Magento/Catalog/Model/Product/Attribute/SetRepository.php @@ -62,7 +62,7 @@ public function save(\Magento\Eav\Api\Data\AttributeSetInterface $attributeSet) */ public function getList(\Magento\Framework\Api\SearchCriteriaInterface $searchCriteria) { - $this->searchCriteriaBuilder->setFilterGroups($searchCriteria->getFilterGroups()); + $this->searchCriteriaBuilder->setFilterGroups((array)$searchCriteria->getFilterGroups()); $this->searchCriteriaBuilder->addFilters( [ $this->filterBuilder From 52d8db4a9f4a31b9f8f94e7620241bfeeb062174 Mon Sep 17 00:00:00 2001 From: crissanclick Date: Sun, 22 Oct 2017 23:42:21 +0200 Subject: [PATCH 05/17] Add fieldset --- app/code/Magento/Sales/etc/fieldset.xml | 6 ++++++ 1 file changed, 6 insertions(+) diff --git a/app/code/Magento/Sales/etc/fieldset.xml b/app/code/Magento/Sales/etc/fieldset.xml index 3d29575063fef..d680d7373bc35 100644 --- a/app/code/Magento/Sales/etc/fieldset.xml +++ b/app/code/Magento/Sales/etc/fieldset.xml @@ -486,6 +486,12 @@ + + + + + + From 1623a22e1d774de8b388a04abc168d8b3f1c2dc8 Mon Sep 17 00:00:00 2001 From: Paul Briscoe Date: Sun, 22 Oct 2017 23:54:41 -0400 Subject: [PATCH 06/17] MAGETWO-81311: Check the length of the array before attempting to slice it. Slicing an array of one will create an empty result. Issue: 9944 --- app/code/Magento/Ui/view/base/web/js/form/element/abstract.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js index 6bbcb4416d33a..11f1f4c04fadc 100755 --- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js @@ -119,7 +119,7 @@ define([ this._super(); scope = this.dataScope; - name = scope.split('.').slice(1); + name = (scope.split('.').length > 1) ? scope.split('.').slice(1) : scope.split('.'); valueUpdate = this.showFallbackReset ? 'afterkeydown' : this.valueUpdate; From 1951f07d8ce53b9330fff70246500a059764ab05 Mon Sep 17 00:00:00 2001 From: Paul Briscoe Date: Mon, 23 Oct 2017 00:54:27 -0400 Subject: [PATCH 07/17] MAGETWO-81311: Fix error 'gratuitous parens' from CI build. Issue: 9944 --- app/code/Magento/Ui/view/base/web/js/form/element/abstract.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js index 11f1f4c04fadc..55e6d6cc1c57f 100755 --- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js @@ -119,7 +119,7 @@ define([ this._super(); scope = this.dataScope; - name = (scope.split('.').length > 1) ? scope.split('.').slice(1) : scope.split('.'); + name = scope.split('.').length > 1 ? scope.split('.').slice(1) : scope.split('.'); valueUpdate = this.showFallbackReset ? 'afterkeydown' : this.valueUpdate; From 00afa44ab1d21cf3a66d07f9e365a3d64ca4fe85 Mon Sep 17 00:00:00 2001 From: Romain Ruaud Date: Mon, 23 Oct 2017 11:41:22 +0200 Subject: [PATCH 08/17] Fixing keyboard submit of adminhtml suggest form. --- lib/web/mage/backend/suggest.js | 39 +++++++++++++++++++++------------ 1 file changed, 25 insertions(+), 14 deletions(-) diff --git a/lib/web/mage/backend/suggest.js b/lib/web/mage/backend/suggest.js index 2ce3405783ea1..412a80804ae0f 100644 --- a/lib/web/mage/backend/suggest.js +++ b/lib/web/mage/backend/suggest.js @@ -245,20 +245,7 @@ case keyCode.ENTER: case keyCode.NUMPAD_ENTER: - suggestList = event.currentTarget.parentNode.getElementsByTagName('ul')[0]; - hasSelectedItems = suggestList.getElementsByClassName('_active').length >= 0; - - if (hasSelectedItems) { - selectedItem = $(suggestList.getElementsByClassName('_active')[0]); - /* eslint-disable max-depth */ - if (selectedItem.find('a') && selectedItem.find('a').attr('href') !== undefined) { - window.location = selectedItem.find('a').attr('href'); - event.preventDefault(); - - return false; - } - /* eslint-enable max-depth */ - } + this._toggleEnter(event); if (this.isDropdownShown() && this._focused) { this._proxyEvents(event); @@ -328,6 +315,30 @@ this._bindDropdown(); }, + /** + * @param {Object} event - event object + * @private + */ + _toggleEnter: function (event) { + var suggestList, + activeItems, + selectedItem; + + suggestList = $(event.currentTarget.parentNode).find('ul').first(); + activeItems = suggestList.find('._active'); + + if (activeItems.length >= 0) { + selectedItem = activeItems.first(); + + if (selectedItem.find('a') && selectedItem.find('a').attr('href') !== undefined) { + window.location = selectedItem.find('a').attr('href'); + event.preventDefault(); + + return false; + } + } + }, + /** * @param {Object} e - event object * @private From 29ce8bec8fc5bf58e19e9c1d7a894e5c7387d6ed Mon Sep 17 00:00:00 2001 From: Eugene Tulika Date: Thu, 19 Oct 2017 11:38:39 -0400 Subject: [PATCH 09/17] MAGETWO-81310: Fixed ability to set field config from layout xml #11302 --- .../Block/Checkout/AttributeMerger.php | 27 +++++++++---------- 1 file changed, 13 insertions(+), 14 deletions(-) diff --git a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php index 4ee3d070d5b77..d93475a4744ca 100644 --- a/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php +++ b/app/code/Magento/Checkout/Block/Checkout/AttributeMerger.php @@ -168,20 +168,19 @@ protected function getFieldConfig( $element = [ 'component' => isset($additionalConfig['component']) ? $additionalConfig['component'] : $uiComponent, - 'config' => [ - // customScope is used to group elements within a single form (e.g. they can be validated separately) - 'customScope' => $dataScopePrefix, - 'customEntry' => isset($additionalConfig['config']['customEntry']) - ? $additionalConfig['config']['customEntry'] - : null, - 'template' => 'ui/form/field', - 'elementTmpl' => isset($additionalConfig['config']['elementTmpl']) - ? $additionalConfig['config']['elementTmpl'] - : $elementTemplate, - 'tooltip' => isset($additionalConfig['config']['tooltip']) - ? $additionalConfig['config']['tooltip'] - : null - ], + 'config' => $this->mergeConfigurationNode( + 'config', + $additionalConfig, + [ + 'config' => [ + // customScope is used to group elements within a single + // form (e.g. they can be validated separately) + 'customScope' => $dataScopePrefix, + 'template' => 'ui/form/field', + 'elementTmpl' => $elementTemplate, + ], + ] + ), 'dataScope' => $dataScopePrefix . '.' . $attributeCode, 'label' => $attributeConfig['label'], 'provider' => $providerName, From 08c61ac5ac124cbf0a8c0cf971555dbd5f263ae6 Mon Sep 17 00:00:00 2001 From: Paul Briscoe Date: Mon, 23 Oct 2017 09:24:20 -0400 Subject: [PATCH 10/17] MAGETWO-81311: Refactor split onto previous line per comment feedback. scope variable is not used anywhere else except on the next line. Issue: 9944 --- app/code/Magento/Ui/view/base/web/js/form/element/abstract.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js index 55e6d6cc1c57f..b6979121a1891 100755 --- a/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js +++ b/app/code/Magento/Ui/view/base/web/js/form/element/abstract.js @@ -118,8 +118,8 @@ define([ this._super(); - scope = this.dataScope; - name = scope.split('.').length > 1 ? scope.split('.').slice(1) : scope.split('.'); + scope = this.dataScope.split('.'); + name = scope.length > 1 ? scope.slice(1) : scope; valueUpdate = this.showFallbackReset ? 'afterkeydown' : this.valueUpdate; From 73178d87e5bc719c57e4dc874de3a4e62977e2bd Mon Sep 17 00:00:00 2001 From: Andrew Howden Date: Tue, 24 Oct 2017 15:42:34 +0200 Subject: [PATCH 11/17] Add a health check to the NGINX configuration sample With the release of the 2.2 version of Magento Varnish has been configured to determine the state of the upstream HTTP proxy with a HTTP probe. This probe polls a script called "health_check.php", located in the pub folder. Unfortunately in the sample configuration, this script is not whitelisted as a PHP executable script, and thus fails to get executed as expected. Varnish then marks the host as down, refusing to serve any traffic. This commit adds the health_check script to the executable PHP block, allowing the varnish proxy to correctly determine the health of the application. Fixes #11157 --- nginx.conf.sample | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/nginx.conf.sample b/nginx.conf.sample index d2f10502e03f8..5ee5e2f672aad 100644 --- a/nginx.conf.sample +++ b/nginx.conf.sample @@ -162,7 +162,7 @@ location /media/import/ { } # PHP entry point for main application -location ~ (index|get|static|report|404|503)\.php$ { +location ~ (index|get|static|report|404|503|health_check)\.php$ { try_files $uri =404; fastcgi_pass fastcgi_backend; fastcgi_buffers 1024 4k; From fb842675fcbc7c1e60fe80404204c6dd759a626b Mon Sep 17 00:00:00 2001 From: Gabriel Queiroz Silva Date: Wed, 25 Oct 2017 01:23:37 -0200 Subject: [PATCH 12/17] Allow coupon code w/ special char to be applied in checkout --- .../view/frontend/web/js/model/resource-url-manager.js | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/app/code/Magento/Checkout/view/frontend/web/js/model/resource-url-manager.js b/app/code/Magento/Checkout/view/frontend/web/js/model/resource-url-manager.js index 2d27d4a032b24..410f5b4927374 100644 --- a/app/code/Magento/Checkout/view/frontend/web/js/model/resource-url-manager.js +++ b/app/code/Magento/Checkout/view/frontend/web/js/model/resource-url-manager.js @@ -75,8 +75,8 @@ define([ quoteId: quoteId } : {}, urls = { - 'guest': '/guest-carts/' + quoteId + '/coupons/' + couponCode, - 'customer': '/carts/mine/coupons/' + couponCode + 'guest': '/guest-carts/' + quoteId + '/coupons/' + encodeURIComponent(couponCode), + 'customer': '/carts/mine/coupons/' + encodeURIComponent(couponCode) }; return this.getUrl(urls, params); From f64281102c6c16b0e67d779d178054f179044187 Mon Sep 17 00:00:00 2001 From: Alexander Menk Date: Wed, 25 Oct 2017 13:33:13 +0200 Subject: [PATCH 13/17] Fix Notice: freePackageValue is undefined As visible from the code, freePackageValue can be undefined in some cases but accessed. `$request->getAllItems() == false` and `$request->getPackageQty() == $freeQty` is true and `!empty($rate) && $rate['price'] >= 0` is false This fixes this --- app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php index b12691ad16245..87d4b984cf933 100644 --- a/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php +++ b/app/code/Magento/OfflineShipping/Model/Carrier/Tablerate.php @@ -113,8 +113,9 @@ public function collectRates(RateRequest $request) // Free shipping by qty $freeQty = 0; + $freePackageValue = 0; + if ($request->getAllItems()) { - $freePackageValue = 0; foreach ($request->getAllItems() as $item) { if ($item->getProduct()->isVirtual() || $item->getParentItem()) { continue; From 1694e023a45f96b071dcf5e955da24d2129cbb8a Mon Sep 17 00:00:00 2001 From: Ievgen Shakhsuvarov Date: Wed, 25 Oct 2017 19:49:37 +0300 Subject: [PATCH 14/17] MAGETWO-82179: Fix Filter Customer Report Review 2.2-develop [Backport] - magento/magento2#11522 --- .../ResourceModel/Review/Customer/Collection.php | 15 +++++++++++++++ .../Review/Customer/CollectionTest.php | 2 +- 2 files changed, 16 insertions(+), 1 deletion(-) diff --git a/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php b/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php index 9297a1dda18d8..02eae4d75d2a7 100644 --- a/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php +++ b/app/code/Magento/Reports/Model/ResourceModel/Review/Customer/Collection.php @@ -103,6 +103,21 @@ protected function _joinCustomers() return $this; } + /** + * {@inheritdoc} + * + * Additional processing of 'customer_name' field is required, as it is a concat field, which can not be aliased. + * @see _joinCustomers + */ + public function addFieldToFilter($field, $condition = null) + { + if ($field === 'customer_name') { + $field = $this->getConnection()->getConcatSql(['customer.firstname', 'customer.lastname'], ' '); + } + + return parent::addFieldToFilter($field, $condition); + } + /** * Get select count sql * diff --git a/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Review/Customer/CollectionTest.php b/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Review/Customer/CollectionTest.php index 2decae1acf9ac..c14ccbff3a785 100644 --- a/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Review/Customer/CollectionTest.php +++ b/dev/tests/integration/testsuite/Magento/Reports/Model/ResourceModel/Review/Customer/CollectionTest.php @@ -30,7 +30,7 @@ protected function setUp() */ public function testSelectCountSql() { - $this->collection->addFieldToFilter('customer_name', ['like' => '%john%']); + $this->collection->addFieldToFilter('customer_name', ['like' => '%John%'])->getItems(); $this->assertEquals(1, $this->collection->getSize()); } } From 45648e4e0c8b796b30a7f6efe5a752852f140a4e Mon Sep 17 00:00:00 2001 From: Lewis Voncken Date: Wed, 25 Oct 2017 17:43:26 +0000 Subject: [PATCH 15/17] [TASK] Incorrect minimum memory_limit references have been updated from 768M to 756M --- .htaccess | 4 ++-- .htaccess.sample | 2 +- .user.ini | 2 +- .../SampleData/Console/Command/SampleDataDeployCommand.php | 4 ++-- nginx.conf.sample | 4 ++-- pub/.htaccess | 4 ++-- pub/.user.ini | 2 +- 7 files changed, 11 insertions(+), 11 deletions(-) diff --git a/.htaccess b/.htaccess index 90b9c16a5a8c0..e7a6c2e218cb7 100644 --- a/.htaccess +++ b/.htaccess @@ -36,7 +36,7 @@ ############################################ ## adjust memory limit - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 ############################################ @@ -59,7 +59,7 @@ ############################################ ## adjust memory limit - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 ############################################ diff --git a/.htaccess.sample b/.htaccess.sample index 3b61bb672ec8a..aa8aaaf9b2818 100644 --- a/.htaccess.sample +++ b/.htaccess.sample @@ -35,7 +35,7 @@ ############################################ ## adjust memory limit - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 ############################################ diff --git a/.user.ini b/.user.ini index 8c0b765e0551c..bfc3a86d88e20 100644 --- a/.user.ini +++ b/.user.ini @@ -1,4 +1,4 @@ -memory_limit = 768M +memory_limit = 756M max_execution_time = 18000 session.auto_start = off suhosin.session.cryptua = off \ No newline at end of file diff --git a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php index 50ad8bdbb3e33..158c588d11358 100644 --- a/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php +++ b/app/code/Magento/SampleData/Console/Command/SampleDataDeployCommand.php @@ -136,8 +136,8 @@ private function updateMemoryLimit() if (function_exists('ini_set')) { @ini_set('display_errors', 1); $memoryLimit = trim(ini_get('memory_limit')); - if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 768 * 1024 * 1024) { - @ini_set('memory_limit', '768M'); + if ($memoryLimit != -1 && $this->getMemoryInBytes($memoryLimit) < 756 * 1024 * 1024) { + @ini_set('memory_limit', '756M'); } } } diff --git a/nginx.conf.sample b/nginx.conf.sample index d2f10502e03f8..58c059657c070 100644 --- a/nginx.conf.sample +++ b/nginx.conf.sample @@ -41,7 +41,7 @@ location ~* ^/setup($|/) { fastcgi_pass fastcgi_backend; fastcgi_param PHP_FLAG "session.auto_start=off \n suhosin.session.cryptua=off"; - fastcgi_param PHP_VALUE "memory_limit=768M \n max_execution_time=600"; + fastcgi_param PHP_VALUE "memory_limit=756M \n max_execution_time=600"; fastcgi_read_timeout 600s; fastcgi_connect_timeout 600s; @@ -168,7 +168,7 @@ location ~ (index|get|static|report|404|503)\.php$ { fastcgi_buffers 1024 4k; fastcgi_param PHP_FLAG "session.auto_start=off \n suhosin.session.cryptua=off"; - fastcgi_param PHP_VALUE "memory_limit=768M \n max_execution_time=18000"; + fastcgi_param PHP_VALUE "memory_limit=756M \n max_execution_time=18000"; fastcgi_read_timeout 600s; fastcgi_connect_timeout 600s; diff --git a/pub/.htaccess b/pub/.htaccess index bdae9be342d8d..047ba279f8651 100644 --- a/pub/.htaccess +++ b/pub/.htaccess @@ -37,7 +37,7 @@ ############################################ ## Adjust memory limit - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 ############################################ @@ -60,7 +60,7 @@ ############################################ ## Adjust memory limit - php_value memory_limit 768M + php_value memory_limit 756M php_value max_execution_time 18000 ############################################ diff --git a/pub/.user.ini b/pub/.user.ini index 8c0b765e0551c..bfc3a86d88e20 100644 --- a/pub/.user.ini +++ b/pub/.user.ini @@ -1,4 +1,4 @@ -memory_limit = 768M +memory_limit = 756M max_execution_time = 18000 session.auto_start = off suhosin.session.cryptua = off \ No newline at end of file From d2d555e5de5ff1cf23d9ef49e1cd8bd7efb0a449 Mon Sep 17 00:00:00 2001 From: Oscar Recio Date: Wed, 25 Oct 2017 18:04:07 -0500 Subject: [PATCH 16/17] Fix Y Axis for order qty --- app/code/Magento/Backend/Block/Dashboard/Graph.php | 2 ++ 1 file changed, 2 insertions(+) diff --git a/app/code/Magento/Backend/Block/Dashboard/Graph.php b/app/code/Magento/Backend/Block/Dashboard/Graph.php index cecd7b8050352..301dffbdc4987 100644 --- a/app/code/Magento/Backend/Block/Dashboard/Graph.php +++ b/app/code/Magento/Backend/Block/Dashboard/Graph.php @@ -421,6 +421,8 @@ public function getChartUrl($directUrl = true) $tmpstring = implode('|', $this->_axisLabels[$idx]); $valueBuffer[] = $indexid . ":|" . $tmpstring; + } elseif ($idx == 'y') { + $valueBuffer[] = $indexid . ":|" . implode('|', $yLabels); } $indexid++; } From 0e301a3b067e6c7227350c7e5d9b03bfcd3039eb Mon Sep 17 00:00:00 2001 From: Jeroen van Leusden Date: Fri, 13 Oct 2017 22:50:10 +0200 Subject: [PATCH 17/17] Add missing translations in Magento_UI --- app/code/Magento/Ui/i18n/en_US.csv | 22 ++++++++++++++++++++++ 1 file changed, 22 insertions(+) diff --git a/app/code/Magento/Ui/i18n/en_US.csv b/app/code/Magento/Ui/i18n/en_US.csv index 1a1b56b379075..225d83387563b 100644 --- a/app/code/Magento/Ui/i18n/en_US.csv +++ b/app/code/Magento/Ui/i18n/en_US.csv @@ -179,3 +179,25 @@ settings/addAfter,settings/addAfter Action,Action CSV,CSV "Excel XML","Excel XML" +"Please select one of the options above.","Please select one of the options above." +"Please select a file.","Please select a file." +"Please select one of the options.","Please select one of the options." +"Please enter a value less than or equal to %s.","Please enter a value less than or equal to %s." +"Please enter a value greater than or equal to %s.","Please enter a value greater than or equal to %s." +"Card type does not match credit card number.","Card type does not match credit card number." +"Credit card number does not match credit card type.","Credit card number does not match credit card type." +"Incorrect credit card expiration date.","Incorrect credit card expiration date." +"Please enter less or equal than %1 symbols.","Please enter less or equal than %1 symbols." +"Please enter more or equal than %1 symbols.","Please enter more or equal than %1 symbols." +"Please enter a valid value from list","Please enter a valid value from list" +"Please enter valid SKU key.","Please enter valid SKU key." +"Please enter a valid number.","Please enter a valid number." +"Admin is a required field in the each row.","Admin is a required field in the each row." +"Please fix this field.","Please fix this field." +"Please enter a valid date (ISO).","Please enter a valid date (ISO)." +"Please enter only digits.","Please enter only digits." +"Please enter the same value again.","Please enter the same value again." +"Please enter no more than {0} characters.","Please enter no more than {0} characters." +"Please enter at least {0} characters.","Please enter at least {0} characters." +"Please enter a value between {0} and {1} characters long.","Please enter a value between {0} and {1} characters long." +"Please enter a value between {0} and {1}.","Please enter a value between {0} and {1}."