Skip to content

Commit 2957731

Browse files
🔃 [EngCom] Public Pull Requests - 2.3-develop Minor Fixes
Accepted Public Pull Requests: - #20612: minicart-three-digit-quantity-cutoff (by @parag2jcommerce) - #20196: Confirmation-pop-up-at-mobile-view-not-proper (by @priti2jcommerce) - #20582: correct spelling (by @ravi-chandra3197) - #20531: [TASK] Removed typo in di.xml of GroupedImportExport (by @lewisvoncken) - #20564: issue fixed #20563 Go to shipping information, Update qty & Addresses� (by @cedarvinda) - #20561: Update popup_content.phtml (by @magicsunday) - #19826: Missing PHPDoc comment for method (by @lfluvisotto) - #20501: recent-order-product-title-misaligned (by @parag2jcommerce) - #20519: bundle-product-radio-button-misalign (by @parag2jcommerce) - #20498: Fixing the styling issue on customizable options (by @eduard13) - #20344: Fixed #20282 Module Catalog Url Rewrite: Permanent Redirect for old URL is missed when product was imported (by @ankur-cedcoss) - #20421: Fixes incorrect where condition when deleting swatch option, it delet… (by @hostep) - #20410: #20409 Fixed Unnecessary slash in namespace (by @milindsingh) - #20341: PHPDocs fixes [Sales module] (by @SikailoISM) - #20281: Apply-discount-code-placeholder-get-cut ::Apply discount code placeho� (by @ajay2jcommerce) - #20368: issue fixed #20367 In Compare Products page showing horizontal scroll� (by @cedarvinda) - #20354: Issue#20277 fixed for 2.3.x (by @maheshWebkul721) - #20262: My-Accounttele-phone-field-require-no-validation-appear (by @dipti2jcommerce) - #20114: Fixed issue #20113 Widget option labels are misalinged (by @GovindaSharma) - #20146: Fixed error while adding new review from admin panel (by @suneet64) - #20142: Fixed issue #19942 Success message is not showing when creating invoice & shipment simultaniously (by @Surabhi-Cedcoss) - #19502: Fix issue 19501 - Sales order Bundle product item alignment issue (by @abrarpathan19) Fixed GitHub Issues: - #20611: Minicart qty input box get distorted with 3-digit (reported by @parag2jcommerce) has been fixed in #20612 by @parag2jcommerce in 2.3-develop branch Related commits: 1. 3e9d892 - #20176: Confirmation pop-up at mobile view not proper (reported by @priti2jcommerce) has been fixed in #20196 by @priti2jcommerce in 2.3-develop branch Related commits: 1. 66b47ea - #20563: Go to shipping information, Update qty & Addresses and Enter a new address button Not aligned from left and right in 767px screen size (reported by @swetacedcoss) has been fixed in #20564 by @cedarvinda in 2.3-develop branch Related commits: 1. 93b8077 - #20500: Recent Order Product Title Misaligned in Sidebar (reported by @parag2jcommerce) has been fixed in #20501 by @parag2jcommerce in 2.3-develop branch Related commits: 1. 34e5c6d 2. f0cb896 3. 62bfb5c - #20518: On Bundle product radio button misalign (reported by @parag2jcommerce) has been fixed in #20519 by @parag2jcommerce in 2.3-develop branch Related commits: 1. 99f7f4a - #20497: Product customizable options issue (reported by @eduard13) has been fixed in #20498 by @eduard13 in 2.3-develop branch Related commits: 1. 6f10b64 - #20282: Module Catalog Url Rewrite: Permanent Redirect for old URL is missed when product was imported (reported by @olegAleksin) has been fixed in #20344 by @ankur-cedcoss in 2.3-develop branch Related commits: 1. e331b3f 2. 8668528 - #20396: Changing attribute from swatch to dropdown deletes swatch options for all attributes (reported by @maderlock) has been fixed in #20421 by @hostep in 2.3-develop branch Related commits: 1. b5efb5c 2. 6829ce8 - #20409: Magento\Catalog\Api\ProductRenderListInterface returns products regardless of visibility (reported by @Floddy) has been fixed in #20410 by @milindsingh in 2.3-develop branch Related commits: 1. f199b7d - #20278: Apply discount code placeholder gets cut in Tab portriat view on cart page (reported by @yashwant2jcommerce) has been fixed in #20281 by @ajay2jcommerce in 2.3-develop branch Related commits: 1. 5c4d71b 2. 07ad944 - #20367: In Compare Products page showing horizontal scrollbar In body But It should appear in **table-wrapper comparison** div For mobile device (reported by @swetacedcoss) has been fixed in #20368 by @cedarvinda in 2.3-develop branch Related commits: 1. 3b97fd5 2. c310cd7 - #20277: Uploaded file for custom option can't be downloaded again (reported by @dverkade) has been fixed in #20354 by @maheshWebkul721 in 2.3-develop branch Related commits: 1. 0759026 2. 9c6af93 3. bf246da 4. 45c6fc7 5. 3a01bc0 6. 18ae227 - #20261: In My Account dashboard page when we create new address from address book telephone field is require,but no validation appear while submission (reported by @dipti2jcommerce) has been fixed in #20262 by @dipti2jcommerce in 2.3-develop branch Related commits: 1. 80d87ec 2. 6ebbe3d 3. 3bd68e5 - #20113: Widget option labels are misalinged (reported by @yashwant2jcommerce) has been fixed in #20114 by @GovindaSharma in 2.3-develop branch Related commits: 1. d621498 2. 95defcc - #20122: Getting error on adding new review from admin panel (reported by @mohammadzakir) has been fixed in #20146 by @suneet64 in 2.3-develop branch Related commits: 1. da809e3 2. 130f1ae 3. eed3bc3 - #19942: Success message is not showing when creating invoice & shipment simultaniously (reported by @Surabhi-Cedcoss) has been fixed in #20142 by @Surabhi-Cedcoss in 2.3-develop branch Related commits: 1. e6c41ba 2. 0689a17 - #19501: Sales order Bundle product item alignment issue (reported by @abrarpathan19) has been fixed in #19502 by @abrarpathan19 in 2.3-develop branch Related commits: 1. 5d7cd50 2. fbf5ebb 3. 9c04589 4. 2479f44
2 parents 9216724 + 6ee4085 commit 2957731

File tree

49 files changed

+319
-153
lines changed

Some content is hidden

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

49 files changed

+319
-153
lines changed

app/code/Magento/Catalog/Api/Data/ProductRender/ImageInterface.php

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -92,6 +92,7 @@ public function setWidth($width);
9292

9393
/**
9494
* Retrieve image label
95+
*
9596
* Image label is short description of this image
9697
*
9798
* @return string
@@ -111,7 +112,7 @@ public function setLabel($label);
111112
/**
112113
* Retrieve resize width
113114
*
114-
* This width is image dimension, which represents the width, that can be used for perfomance improvements
115+
* This width is image dimension, which represents the width, that can be used for performance improvements
115116
*
116117
* @return float
117118
* @since 101.1.0
@@ -128,6 +129,8 @@ public function getResizedWidth();
128129
public function setResizedWidth($width);
129130

130131
/**
132+
* Set resized height
133+
*
131134
* @param string $height
132135
* @return void
133136
* @since 101.1.0

app/code/Magento/CatalogInventory/Model/ResourceModel/Stock/Item.php

Lines changed: 18 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -263,6 +263,12 @@ public function updateLowStockDate(int $websiteId)
263263
$connection->update($this->getMainTable(), $value, $where);
264264
}
265265

266+
/**
267+
* Get Manage Stock Expression
268+
*
269+
* @param string $tableAlias
270+
* @return \Zend_Db_Expr
271+
*/
266272
public function getManageStockExpr(string $tableAlias = ''): \Zend_Db_Expr
267273
{
268274
if ($tableAlias) {
@@ -277,6 +283,12 @@ public function getManageStockExpr(string $tableAlias = ''): \Zend_Db_Expr
277283
return $manageStock;
278284
}
279285

286+
/**
287+
* Get Backorders Expression
288+
*
289+
* @param string $tableAlias
290+
* @return \Zend_Db_Expr
291+
*/
280292
public function getBackordersExpr(string $tableAlias = ''): \Zend_Db_Expr
281293
{
282294
if ($tableAlias) {
@@ -291,6 +303,12 @@ public function getBackordersExpr(string $tableAlias = ''): \Zend_Db_Expr
291303
return $itemBackorders;
292304
}
293305

306+
/**
307+
* Get Minimum Sale Quantity Expression
308+
*
309+
* @param string $tableAlias
310+
* @return \Zend_Db_Expr
311+
*/
294312
public function getMinSaleQtyExpr(string $tableAlias = ''): \Zend_Db_Expr
295313
{
296314
if ($tableAlias) {

app/code/Magento/CatalogInventory/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@
111111
<argument name="batchSizeManagement" xsi:type="object">Magento\CatalogInventory\Model\Indexer\Stock\BatchSizeManagement</argument>
112112
</arguments>
113113
</type>
114-
<type name="\Magento\Framework\Data\CollectionModifier">
114+
<type name="Magento\Framework\Data\CollectionModifier">
115115
<arguments>
116116
<argument name="conditions" xsi:type="array">
117117
<item name="stockStatusCondition" xsi:type="object">Magento\CatalogInventory\Model\ProductCollectionStockCondition</item>

app/code/Magento/CatalogSearch/Setup/Patch/Data/MySQLSearchDeprecationNotification.php

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,10 @@ class MySQLSearchDeprecationNotification implements \Magento\Framework\Setup\Pat
2525
*/
2626
private $notifier;
2727

28+
/**
29+
* @param \Magento\Framework\Search\EngineResolverInterface $searchEngineResolver
30+
* @param \Magento\Framework\Notification\NotifierInterface $notifier
31+
*/
2832
public function __construct(
2933
\Magento\Framework\Search\EngineResolverInterface $searchEngineResolver,
3034
\Magento\Framework\Notification\NotifierInterface $notifier

app/code/Magento/CatalogUrlRewrite/Observer/AfterImportDataObserver.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -135,6 +135,7 @@ class AfterImportDataObserver implements ObserverInterface
135135
'url_path',
136136
'name',
137137
'visibility',
138+
'save_rewrites_history'
138139
];
139140

140141
/**
@@ -199,6 +200,7 @@ public function __construct(
199200

200201
/**
201202
* Action after data import.
203+
*
202204
* Save new url rewrites and remove old if exist.
203205
*
204206
* @param Observer $observer
@@ -267,6 +269,8 @@ protected function _populateForUrlGeneration($rowData)
267269
}
268270

269271
/**
272+
* Add store id to product data.
273+
*
270274
* @param \Magento\Catalog\Model\Product $product
271275
* @param array $rowData
272276
* @return void
@@ -436,6 +440,8 @@ protected function currentUrlRewritesRegenerate()
436440
}
437441

438442
/**
443+
* Generate url-rewrite for outogenerated url-rewirte.
444+
*
439445
* @param UrlRewrite $url
440446
* @param Category $category
441447
* @return array
@@ -470,6 +476,8 @@ protected function generateForAutogenerated($url, $category)
470476
}
471477

472478
/**
479+
* Generate url-rewrite for custom url-rewirte.
480+
*
473481
* @param UrlRewrite $url
474482
* @param Category $category
475483
* @return array
@@ -503,6 +511,8 @@ protected function generateForCustom($url, $category)
503511
}
504512

505513
/**
514+
* Retrieve category from url metadata.
515+
*
506516
* @param UrlRewrite $url
507517
* @return Category|null|bool
508518
*/
@@ -517,6 +527,8 @@ protected function retrieveCategoryFromMetadata($url)
517527
}
518528

519529
/**
530+
* Check, category suited for url-rewrite generation.
531+
*
520532
* @param \Magento\Catalog\Model\Category $category
521533
* @param int $storeId
522534
* @return bool

app/code/Magento/Customer/Model/Indexer/CustomerGroupDimensionProvider.php

Lines changed: 12 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,9 @@
1111
use Magento\Framework\Indexer\DimensionFactory;
1212
use Magento\Framework\Indexer\DimensionProviderInterface;
1313

14+
/**
15+
* Class CustomerGroupDimensionProvider
16+
*/
1417
class CustomerGroupDimensionProvider implements DimensionProviderInterface
1518
{
1619
/**
@@ -34,12 +37,19 @@ class CustomerGroupDimensionProvider implements DimensionProviderInterface
3437
*/
3538
private $dimensionFactory;
3639

40+
/**
41+
* @param CustomerGroupCollectionFactory $collectionFactory
42+
* @param DimensionFactory $dimensionFactory
43+
*/
3744
public function __construct(CustomerGroupCollectionFactory $collectionFactory, DimensionFactory $dimensionFactory)
3845
{
3946
$this->dimensionFactory = $dimensionFactory;
4047
$this->collectionFactory = $collectionFactory;
4148
}
4249

50+
/**
51+
* @inheritdoc
52+
*/
4353
public function getIterator(): \Traversable
4454
{
4555
foreach ($this->getCustomerGroups() as $customerGroup) {
@@ -48,6 +58,8 @@ public function getIterator(): \Traversable
4858
}
4959

5060
/**
61+
* Get Customer Groups
62+
*
5163
* @return array
5264
*/
5365
private function getCustomerGroups(): array

app/code/Magento/Customer/view/frontend/templates/widget/telephone.phtml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -19,7 +19,7 @@
1919
<?php
2020
$_validationClass = $block->escapeHtmlAttr(
2121
$this->helper('Magento\Customer\Helper\Address')
22-
->getAttributeValidationClass('fax')
22+
->getAttributeValidationClass('telephone')
2323
);
2424
?>
2525
<input type="text"

app/code/Magento/GroupedImportExport/etc/di.xml

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -9,7 +9,7 @@
99
<type name="Magento\CatalogImportExport\Model\Export\RowCustomizer\Composite">
1010
<arguments>
1111
<argument name="customizers" xsi:type="array">
12-
<item name="gropedProduct" xsi:type="string">Magento\GroupedImportExport\Model\Export\RowCustomizer</item>
12+
<item name="groupedProduct" xsi:type="string">Magento\GroupedImportExport\Model\Export\RowCustomizer</item>
1313
</argument>
1414
</arguments>
1515
</type>

app/code/Magento/Review/Block/Adminhtml/Add.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -56,7 +56,7 @@ protected function _construct()
5656
},
5757
loadProductData : function() {
5858
jQuery.ajax({
59-
type: "POST",
59+
type: "GET",
6060
url: review.productInfoUrl,
6161
data: {
6262
form_key: FORM_KEY

app/code/Magento/Sales/Block/Adminhtml/Order/Create/Load.php

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ class Load extends \Magento\Framework\View\Element\Template
2929
/**
3030
* @param \Magento\Framework\View\Element\Template\Context $context
3131
* @param \Magento\Framework\Json\EncoderInterface $jsonEncoder
32-
* @param \Magento\Framework\View\Helper\Js $adminhtmlJs
32+
* @param \Magento\Framework\View\Helper\Js $jsHelper
3333
* @param array $data
3434
*/
3535
public function __construct(

0 commit comments

Comments
 (0)