Skip to content

Commit f112c7a

Browse files
sverasvera
authored
Merge branch '2.4-develop' into graphql-api-enhancements
2 parents c272402 + 3a6536d commit f112c7a

File tree

8 files changed

+36
-69
lines changed

8 files changed

+36
-69
lines changed

‎app/code/Magento/Sales/Model/Order.php‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2017 Adobe
4+
* All Rights Reserved.
55
*/
66
namespace Magento\Sales\Model;
77

@@ -2001,7 +2001,7 @@ public function getShipmentsCollection()
20012001
{
20022002
if (empty($this->_shipments)) {
20032003
if ($this->getId()) {
2004-
$this->_shipments = $this->_shipmentCollectionFactory->create()->setOrderFilter($this)->load();
2004+
$this->_shipments = $this->_shipmentCollectionFactory->create()->setOrderFilter($this);
20052005
} else {
20062006
return false;
20072007
}
@@ -2018,7 +2018,7 @@ public function getCreditmemosCollection()
20182018
{
20192019
if (empty($this->_creditmemos)) {
20202020
if ($this->getId()) {
2021-
$this->_creditmemos = $this->_memoCollectionFactory->create()->setOrderFilter($this)->load();
2021+
$this->_creditmemos = $this->_memoCollectionFactory->create()->setOrderFilter($this);
20222022
} else {
20232023
return false;
20242024
}

‎app/code/Magento/Translation/etc/di.xml‎

Lines changed: 2 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -1,8 +1,8 @@
11
<?xml version="1.0"?>
22
<!--
33
/**
4-
* Copyright © Magento, Inc. All rights reserved.
5-
* See COPYING.txt for license details.
4+
* Copyright 2017 Adobe
5+
* All Rights Reserved.
66
*/
77
-->
88
<config xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xsi:noNamespaceSchemaLocation="urn:magento:framework:ObjectManager/etc/config.xsd">
@@ -65,13 +65,6 @@
6565
<argument name="translator" xsi:type="object">Magento\Framework\Translate</argument>
6666
</arguments>
6767
</type>
68-
<type name="Magento\Translation\Model\Js">
69-
<arguments>
70-
<argument name="dataProviders" xsi:type="array">
71-
<item name="default" xsi:type="object">Magento\Translation\Model\Js\DataProvider</item>
72-
</argument>
73-
</arguments>
74-
</type>
7568
<type name="Magento\Translation\Model\Js\Config">
7669
<arguments>
7770
<argument name="patterns" xsi:type="array">

‎app/code/Magento/Ui/view/base/web/templates/form/element/uploader/image.html‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<!--
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2017 Adobe
4+
* All Rights Reserved.
55
*/
66
-->
77
<div class="admin__field" visible="visible" css="$data.additionalClasses">
@@ -12,7 +12,7 @@
1212
<div class="admin__field-control" css="'_with-tooltip': $data.tooltip">
1313
<div class="file-uploader image-uploader" data-role="drop-zone" css="_loading: isLoading">
1414
<div class="file-uploader-area">
15-
<input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles" disable="disabled" />
15+
<input type="file" afterRender="onElementRender" attr="id: uid, name: inputName, multiple: isMultipleFiles" disable="disabled">
1616
<label class="file-uploader-button action-default" attr="for: uid, disabled: disabled" disable="disabled" translate="'Upload'"></label>
1717
<label
1818
data-bind="event: {change: addFileFromMediaGallery, click: openMediaBrowserDialog}"
@@ -43,7 +43,7 @@
4343

4444
<each args="data: value, as: '$file'" render="$parent.getPreviewTmpl($file)"></each>
4545

46-
<div if="!hasData()" class="image image-placeholder" click="triggerImageUpload">
46+
<div if="!hasData() || isMultipleFiles" class="image image-placeholder" click="triggerImageUpload">
4747
<div class="file-uploader-summary product-image-wrapper">
4848
<div class="file-uploader-spinner image-uploader-spinner"></div>
4949
<p class="image-placeholder-text" translate="'Browse to find or drag image here'"></p>

‎app/code/Magento/WeeeGraphQl/Model/Resolver/FixedProductTax.php‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2018 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -21,24 +21,14 @@
2121
*/
2222
class FixedProductTax implements ResolverInterface
2323
{
24-
/**
25-
* @var Data
26-
*/
27-
private $weeeHelper;
28-
29-
/**
30-
* @var TaxHelper
31-
*/
32-
private $taxHelper;
33-
3424
/**
3525
* @param Data $weeeHelper
3626
* @param TaxHelper $taxHelper
3727
*/
38-
public function __construct(Data $weeeHelper, TaxHelper $taxHelper)
39-
{
40-
$this->weeeHelper = $weeeHelper;
41-
$this->taxHelper = $taxHelper;
28+
public function __construct(
29+
private readonly Data $weeeHelper,
30+
private readonly TaxHelper $taxHelper
31+
) {
4232
}
4333

4434
/**

‎app/code/Magento/WeeeGraphQl/Model/Resolver/Quote/FixedProductTax.php‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2018 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -21,24 +21,14 @@
2121
*/
2222
class FixedProductTax implements ResolverInterface
2323
{
24-
/**
25-
* @var Data
26-
*/
27-
private $weeeHelper;
28-
29-
/**
30-
* @var TaxHelper
31-
*/
32-
private $taxHelper;
33-
3424
/**
3525
* @param Data $weeeHelper
3626
* @param TaxHelper $taxHelper
3727
*/
38-
public function __construct(Data $weeeHelper, TaxHelper $taxHelper)
39-
{
40-
$this->weeeHelper = $weeeHelper;
41-
$this->taxHelper = $taxHelper;
28+
public function __construct(
29+
private readonly Data $weeeHelper,
30+
private readonly TaxHelper $taxHelper
31+
) {
4232
}
4333

4434
/**

‎app/code/Magento/WeeeGraphQl/Model/Resolver/StoreConfig.php‎

Lines changed: 6 additions & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2019 Adobe
4+
* All Rights Reserved.
55
*/
66
declare(strict_types=1);
77

@@ -37,16 +37,6 @@ class StoreConfig implements ResolverInterface, ResetAfterRequestInterface
3737
WeeeDisplayConfig::DISPLAY_EXCL => 'EXCLUDE_FPT_WITHOUT_DETAILS'
3838
];
3939

40-
/**
41-
* @var Data
42-
*/
43-
private $weeeHelper;
44-
45-
/**
46-
* @var TaxHelper
47-
*/
48-
private $taxHelper;
49-
5040
/**
5141
* @var array
5242
*/
@@ -56,10 +46,10 @@ class StoreConfig implements ResolverInterface, ResetAfterRequestInterface
5646
* @param Data $weeeHelper
5747
* @param TaxHelper $taxHelper
5848
*/
59-
public function __construct(Data $weeeHelper, TaxHelper $taxHelper)
60-
{
61-
$this->weeeHelper = $weeeHelper;
62-
$this->taxHelper = $taxHelper;
49+
public function __construct(
50+
private readonly Data $weeeHelper,
51+
private readonly TaxHelper $taxHelper
52+
) {
6353
}
6454

6555
/**

‎app/code/Magento/WeeeGraphQl/registration.php‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,13 @@
11
<?php
22
/**
3-
* Copyright © Magento, Inc. All rights reserved.
4-
* See COPYING.txt for license details.
3+
* Copyright 2017 Adobe
4+
* All Rights Reserved.
55
*/
66

77
use Magento\Framework\Component\ComponentRegistrar;
88

9-
ComponentRegistrar::register(ComponentRegistrar::MODULE, 'Magento_WeeeGraphQl', __DIR__);
9+
ComponentRegistrar::register(
10+
ComponentRegistrar::MODULE,
11+
'Magento_WeeeGraphQl',
12+
__DIR__
13+
);

‎lib/web/varien/js.js‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -445,7 +445,7 @@ Varien.DateElement.prototype = {
445445
if (!valueError) {
446446
this.advice.innerHTML = error.replace('%1', countDaysInMonth);
447447
} else {
448-
this.advice.innerHTML = this.errorTextModifier(error);
448+
this.advice.innerText = this.errorTextModifier(error);
449449
}
450450
this.advice.show();
451451

0 commit comments

Comments
 (0)