Skip to content

Commit 908a6bb

Browse files
sidolovsidolov
authored
🔃 [EngCom] Public Pull Requests - 2.3-develop
Accepted Public Pull Requests: - #20050: Add missing throws to PHPDoc (by @pmclain) - #20046: Added constants to unit codes to make it easier to reuse it if necessary (by @tiagosampaio) - #20022: [Fixed Radio alignment issue on Cart page #20021] (by @hitesh-wagento) - #19792: Fixed 19791: Logo vertical misalignment. (by @suryakant-krish) - #20005: Minor Typo fix in AbstractFilter.php (by @ajeetsinghcedcoss) - #19981: Fix issue 19887 creating new shipment: getting all trackers. (by @Nazar65) - #19978: Set correct email message encoding (by @4lexvav) - #19941: issue resolved:Undefined Variable $itemsOrderItemId (by @GovindaSharma) - #19799: Fix issue 19796 - Sales Order invoice Update Qty's Button is misaligned (by @speedy008) - #19914: Move website_name column into columnSet (by @bradleyfrye) - #19926: fixed issue #19925 Close button overlapping in shipping address label whenever any user adding new shipping address in mobile view in checkout (by @cedarvinda) - #19929: Refactoring in Magento_SalesRule (by @agorbulin) - #19900: Fix negative credit memo #19899 (by @wojtekn) - #19752: Fixed Typo error avaialble -> available (by @gulshanchitranshcedcoss) - #19715: [TASK] Updated the implements for the Magento_Cms Adminhtml Controllers (by @lewisvoncken) - #19620: Fix issue causing attribute not loading when using getList (by @MiliTree) - #19467: Use semantic theme color variables, including global primary/secondary colors (by @Brengineer) - #19930: Refactoring magento sales sequence (by @agorbulin) - #19646: Area Frontend: Fixed checkbox alignment account information page. (by @suryakant-krish) Fixed GitHub Issues: - #20037: CategoryLinkReposity does not list all possible exceptions (reported by @troendheim) has been fixed in #20050 by @pmclain in 2.3-develop branch Related commits: 1. d08ce91 2. a1d3299 - #20021: Radio alignment issue on Cart page (reported by @hitesh-wagento) has been fixed in #20022 by @hitesh-wagento in 2.3-develop branch Related commits: 1. 6089f27 - #19791: Logo vertical misalignment. (reported by @suryakant-krish) has been fixed in #19792 by @suryakant-krish in 2.3-develop branch Related commits: 1. 485b89f 2. 3a56397 3. 8e59e4b - #19887: creating new shipment: gettting all trackers. after this commit 2307e16 (reported by @aldf) has been fixed in #19981 by @Nazar65 in 2.3-develop branch Related commits: 1. 8048516 2. 9cf1e3e - #19977: E-Mail subject not showing utf-8 characters (reported by @4lexvav) has been fixed in #19978 by @4lexvav in 2.3-develop branch Related commits: 1. bccc949 - #19940: Exception undefined variable itemsOrderItemId while creating shipment through MSI (reported by @mohammadzakir) has been fixed in #19941 by @GovindaSharma in 2.3-develop branch Related commits: 1. b54ab2d - #19796: Sales Order invoice Update Qty's Button is misaligned (reported by @speedy008) has been fixed in #19799 by @speedy008 in 2.3-develop branch Related commits: 1. e30a080 2. 8a3fa61 - #19899: Credit memo for $0 order without refunded shipping produces negative credit memo (reported by @wojtekn) has been fixed in #19900 by @wojtekn in 2.3-develop branch Related commits: 1. e840e41 2. 4a77f29 3. 5b4fdca - #17759: M2.2.5 : CustomerRepository::getList() does not load custom attribute if the name is "company" (reported by @kanduvisla) has been fixed in #19620 by @MiliTree in 2.3-develop branch Related commits: 1. d600179 2. b99af38 3. e29c5dd - #19645: Area Frontend: Account information page checkbox alignment issue. (reported by @suryakant-krish) has been fixed in #19646 by @suryakant-krish in 2.3-develop branch Related commits: 1. 0811a71
2 parents 807ee7d + c5f5872 commit 908a6bb

File tree

75 files changed

+245
-165
lines changed

Some content is hidden

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

75 files changed

+245
-165
lines changed

‎app/code/Magento/Backend/Model/Search/Customer.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -89,7 +89,7 @@ public function load()
8989

9090
$this->searchCriteriaBuilder->setCurrentPage($this->getStart());
9191
$this->searchCriteriaBuilder->setPageSize($this->getLimit());
92-
$searchFields = ['firstname', 'lastname', 'company'];
92+
$searchFields = ['firstname', 'lastname', 'billing_company'];
9393
$filters = [];
9494
foreach ($searchFields as $field) {
9595
$filters[] = $this->filterBuilder

‎app/code/Magento/Catalog/Api/CategoryLinkRepositoryInterface.php

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -32,18 +32,20 @@ public function save(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $pro
3232
*
3333
* @throws \Magento\Framework\Exception\CouldNotSaveException
3434
* @throws \Magento\Framework\Exception\StateException
35+
* @throws \Magento\Framework\Exception\InputException
3536
*/
3637
public function delete(\Magento\Catalog\Api\Data\CategoryProductLinkInterface $productLink);
3738

3839
/**
3940
* Remove the product assignment from the category by category id and sku
4041
*
41-
* @param string $sku
42+
* @param string $categoryId
4243
* @param string $sku
4344
* @return bool will returned True if products successfully deleted
4445
*
4546
* @throws \Magento\Framework\Exception\CouldNotSaveException
4647
* @throws \Magento\Framework\Exception\StateException
48+
* @throws \Magento\Framework\Exception\InputException
4749
*/
4850
public function deleteByIds($categoryId, $sku);
4951
}

‎app/code/Magento/Catalog/Model/Layer/Filter/AbstractFilter.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -139,7 +139,7 @@ public function apply(\Magento\Framework\App\RequestInterface $request)
139139
}
140140

141141
/**
142-
* Get fiter items count
142+
* Get filter items count
143143
*
144144
* @return int
145145
*/

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Edit.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,8 +5,11 @@
55
*/
66
namespace Magento\Cms\Controller\Adminhtml\Block;
77

8-
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
8+
use Magento\Framework\App\Action\HttpGetActionInterface;
99

10+
/**
11+
* Edit CMS block action.
12+
*/
1013
class Edit extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
1114
{
1215
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Index.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Block;
87

9-
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
8+
use Magento\Framework\App\Action\HttpGetActionInterface;
109

10+
/**
11+
* Index action.
12+
*/
1113
class Index extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
1214
{
1315
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Block/MassDelete.php

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,6 +6,7 @@
66
*/
77
namespace Magento\Cms\Controller\Adminhtml\Block;
88

9+
use Magento\Framework\App\Action\HttpPostActionInterface;
910
use Magento\Framework\Controller\ResultFactory;
1011
use Magento\Backend\App\Action\Context;
1112
use Magento\Ui\Component\MassAction\Filter;
@@ -14,7 +15,7 @@
1415
/**
1516
* Class MassDelete
1617
*/
17-
class MassDelete extends \Magento\Backend\App\Action
18+
class MassDelete extends \Magento\Backend\App\Action implements HttpPostActionInterface
1819
{
1920
/**
2021
* Authorization level of a basic admin session

‎app/code/Magento/Cms/Controller/Adminhtml/Block/NewAction.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,15 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Block;
87

9-
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
8+
use Magento\Framework\App\Action\HttpGetActionInterface;
109

10+
/**
11+
* Create CMS block action.
12+
*/
1113
class NewAction extends \Magento\Cms\Controller\Adminhtml\Block implements HttpGetActionInterface
1214
{
1315
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Block/Save.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,11 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Block;
87

9-
use Magento\Framework\App\Action\HttpPostActionInterface as HttpPostActionInterface;
8+
use Magento\Framework\App\Action\HttpPostActionInterface;
109
use Magento\Backend\App\Action\Context;
1110
use Magento\Cms\Api\BlockRepositoryInterface;
1211
use Magento\Cms\Model\Block;
@@ -15,6 +14,9 @@
1514
use Magento\Framework\Exception\LocalizedException;
1615
use Magento\Framework\Registry;
1716

17+
/**
18+
* Save CMS block action.
19+
*/
1820
class Save extends \Magento\Cms\Controller\Adminhtml\Block implements HttpPostActionInterface
1921
{
2022
/**

‎app/code/Magento/Cms/Controller/Adminhtml/Page/Delete.php

Lines changed: 6 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,16 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Page;
87

9-
class Delete extends \Magento\Backend\App\Action
8+
use Magento\Framework\App\Action\HttpPostActionInterface;
9+
10+
/**
11+
* Delete CMS page action.
12+
*/
13+
class Delete extends \Magento\Backend\App\Action implements HttpPostActionInterface
1014
{
1115
/**
1216
* Authorization level of a basic admin session

‎app/code/Magento/Cms/Controller/Adminhtml/Page/Edit.php

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,16 @@
11
<?php
22
/**
3-
*
43
* Copyright © Magento, Inc. All rights reserved.
54
* See COPYING.txt for license details.
65
*/
76
namespace Magento\Cms\Controller\Adminhtml\Page;
87

9-
use Magento\Framework\App\Action\HttpGetActionInterface as HttpGetActionInterface;
8+
use Magento\Framework\App\Action\HttpGetActionInterface;
109
use Magento\Backend\App\Action;
1110

11+
/**
12+
* Edit CMS page action.
13+
*/
1214
class Edit extends \Magento\Backend\App\Action implements HttpGetActionInterface
1315
{
1416
/**

0 commit comments

Comments
 (0)