Skip to content

Commit f31334b

Browse files
serhii-balkoserhii-balko
committed
Merge remote-tracking branch 'origin/MC-34258' into 2.4.1-develop-pr25
2 parents fc8b208 + d729655 commit f31334b

File tree

1 file changed

+32
-16
lines changed
  • app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action

1 file changed

+32
-16
lines changed

‎app/code/Magento/Catalog/view/adminhtml/templates/catalog/product/edit/action/inventory.phtml‎

Lines changed: 32 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333
$defaultMinSaleQty = $block->getDefaultConfigValue('min_sale_qty');
3434
if (!is_numeric($defaultMinSaleQty)) {
3535
$defaultMinSaleQty = json_decode($defaultMinSaleQty, true);
36-
$defaultMinSaleQty = (float) $defaultMinSaleQty[\Magento\Customer\Api\Data\GroupInterface::CUST_GROUP_ALL] ?? 1;
36+
$defaultMinSaleQty = (float) ($defaultMinSaleQty[\Magento\Customer\Api\Data\GroupInterface::CUST_GROUP_ALL] ?? 1);
3737
}
3838
?>
3939
<div class="fieldset-wrapper form-inline advanced-inventory-edit">
@@ -52,17 +52,19 @@ if (!is_numeric($defaultMinSaleQty)) {
5252
<div class="control">
5353
<div class="fields-group-2">
5454
<div class="field">
55-
<select id="inventory_manage_stock" name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[manage_stock]"
55+
<select id="inventory_manage_stock"
56+
name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[manage_stock]"
5657
class="select" disabled="disabled">
5758
<option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
5859
<option value="0"
59-
<?php if ($block->getFieldValue('manage_stock') == 0) :?>
60+
<?php if ($block->getFieldValue('manage_stock') == 0):?>
6061
selected="selected"
6162
<?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
6263
</select>
6364
</div>
6465
<div class="field choice">
65-
<input name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_manage_stock]" type="checkbox"
66+
<input name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[use_config_manage_stock]"
67+
type="checkbox"
6668
id="inventory_use_config_manage_stock" data-role="toggle-editability" value="1"
6769
checked="checked" disabled="disabled"/>
6870
<label for="inventory_use_config_manage_stock"
@@ -211,13 +213,15 @@ if (!is_numeric($defaultMinSaleQty)) {
211213
disabled="disabled">
212214
<option value="0"><?= $block->escapeHtml(__('No')) ?></option>
213215
<option value="1"
214-
<?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1) :?>
216+
<?php if ($block->getDefaultConfigValue('is_qty_decimal') == 1):?>
215217
selected="selected"
216218
<?php endif; ?>><?= $block->escapeHtml(__('Yes')) ?></option>
217219
</select>
218220
</div>
219221
<div class="field choice">
220-
<input type="checkbox" id="inventory_is_qty_decimal_checkbox" data-role="toggle-editability-all"/>
222+
<input type="checkbox"
223+
id="inventory_is_qty_decimal_checkbox"
224+
data-role="toggle-editability-all"/>
221225
<label for="inventory_is_qty_decimal_checkbox"
222226
class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
223227
</div>
@@ -238,10 +242,12 @@ if (!is_numeric($defaultMinSaleQty)) {
238242
name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[backorders]"
239243
class="select"
240244
disabled="disabled">
241-
<?php foreach ($block->getBackordersOption() as $option) :?>
242-
<?php $_selected = ($option['value'] == $block->getDefaultConfigValue('backorders')) ? ' selected="selected"' : '' ?>
243-
<option
244-
value="<?= $block->escapeHtmlAttr($option['value']) ?>"<?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?></option>
245+
<?php foreach ($block->getBackordersOption() as $option):?>
246+
<?php $_selected = ($option['value'] == $block->getDefaultConfigValue('backorders'))
247+
? ' selected="selected"' : '' ?>
248+
<option value="<?= $block->escapeHtmlAttr($option['value']) ?>"
249+
<?= /* @noEscape */ $_selected ?>><?= $block->escapeHtml($option['label']) ?>
250+
</option>
245251
<?php endforeach; ?>
246252
</select>
247253
</div>
@@ -291,7 +297,9 @@ if (!is_numeric($defaultMinSaleQty)) {
291297
class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
292298
</div>
293299
<div class="field choice">
294-
<input type="checkbox" id="inventory_notify_stock_qty_checkbox" data-role="toggle-editability-all"/>
300+
<input type="checkbox"
301+
id="inventory_notify_stock_qty_checkbox"
302+
data-role="toggle-editability-all"/>
295303
<label for="inventory_notify_stock_qty_checkbox"
296304
class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
297305
</div>
@@ -314,7 +322,7 @@ if (!is_numeric($defaultMinSaleQty)) {
314322
disabled="disabled">
315323
<option value="1"><?= $block->escapeHtml(__('Yes')) ?></option>
316324
<option value="0"
317-
<?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0) :?>
325+
<?php if ($block->getDefaultConfigValue('enable_qty_increments') == 0):?>
318326
selected="selected"
319327
<?php endif; ?>><?= $block->escapeHtml(__('No')) ?></option>
320328
</select>
@@ -330,7 +338,9 @@ if (!is_numeric($defaultMinSaleQty)) {
330338
class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
331339
</div>
332340
<div class="field choice">
333-
<input type="checkbox" id="inventory_enable_qty_increments_checkbox" data-role="toggle-editability-all"/>
341+
<input type="checkbox"
342+
id="inventory_enable_qty_increments_checkbox"
343+
data-role="toggle-editability-all"/>
334344
<label for="inventory_enable_qty_increments_checkbox"
335345
class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
336346
</div>
@@ -364,7 +374,9 @@ if (!is_numeric($defaultMinSaleQty)) {
364374
class="label"><span><?= $block->escapeHtml(__('Use Config Settings')) ?></span></label>
365375
</div>
366376
<div class="field choice">
367-
<input type="checkbox" id="inventory_qty_increments_checkbox" data-role="toggle-editability-all"/>
377+
<input type="checkbox"
378+
id="inventory_qty_increments_checkbox"
379+
data-role="toggle-editability-all"/>
368380
<label for="inventory_qty_increments_checkbox"
369381
class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
370382
</div>
@@ -385,11 +397,15 @@ if (!is_numeric($defaultMinSaleQty)) {
385397
name="<?= /* @noEscape */ $block->getFieldSuffix() ?>[is_in_stock]" class="select"
386398
disabled="disabled">
387399
<option value="1"><?= $block->escapeHtml(__('In Stock')) ?></option>
388-
<option value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0) :?> selected<?php endif; ?>><?= $block->escapeHtml(__('Out of Stock')) ?></option>
400+
<option value="0"<?php if ($block->getDefaultConfigValue('is_in_stock') == 0):?>
401+
selected<?php endif; ?>><?= $block->escapeHtml(__('Out of Stock')) ?>
402+
</option>
389403
</select>
390404
</div>
391405
<div class="field choice">
392-
<input type="checkbox" id="inventory_stock_availability_checkbox" data-role="toggle-editability-all"/>
406+
<input type="checkbox"
407+
id="inventory_stock_availability_checkbox"
408+
data-role="toggle-editability-all"/>
393409
<label for="inventory_stock_availability_checkbox"
394410
class="label"><span><?= $block->escapeHtml(__('Change')) ?></span></label>
395411
</div>

0 commit comments

Comments
 (0)