Skip to content

Commit fe8a459

Browse files
🔃 [EngCom] Public Pull Requests - 2.1-develop
Accepted Public Pull Requests: - #15407: [Backport] Fix to allow use decimals less then 1 in subproducts qty (by @rogyar) - #15318: [Backport] Allow configuring min and max dates for date picker component (by @rogyar) - #15392: [Backport] Add 'const' type support to layout arguments (by @IgorVitol) Fixed GitHub Issues: - #14692: 'validate-grouped-qty' validation is meaningless (reported by @likemusic) has been fixed in #15407 by @rogyar in 2.1-develop branch Related commits: 1. e8087c5
2 parents 3085bda + e97aca9 commit fe8a459

File tree

5 files changed

+16
-1
lines changed

5 files changed

+16
-1
lines changed

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

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -197,6 +197,7 @@
197197
<type name="Magento\Framework\Data\Argument\Interpreter\Composite">
198198
<arguments>
199199
<argument name="interpreters" xsi:type="array">
200+
<item name="const" xsi:type="object">Magento\Framework\Data\Argument\Interpreter\Constant</item>
200201
<item name="object" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
201202
<item name="configurableObject" xsi:type="object">configurableObjectArgumentInterpreterProxy</item>
202203
<item name="array" xsi:type="object">arrayArgumentInterpreterProxy</item>

lib/internal/Magento/Framework/Data/Form/Element/Date.php

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -167,6 +167,8 @@ public function getElementHtml()
167167
'buttonImage' => $this->getImage(),
168168
'buttonText' => 'Select Date',
169169
'disabled' => $this->getDisabled(),
170+
'minDate' => $this->getMinDate(),
171+
'maxDate' => $this->getMaxDate(),
170172
],
171173
]
172174
)

lib/internal/Magento/Framework/View/Layout/etc/layout_merged.xsd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -62,4 +62,10 @@
6262
</xs:extension>
6363
</xs:complexContent>
6464
</xs:complexType>
65+
66+
<xs:complexType name="const">
67+
<xs:complexContent>
68+
<xs:extension base="argumentType" />
69+
</xs:complexContent>
70+
</xs:complexType>
6571
</xs:schema>

lib/internal/Magento/Framework/View/Layout/etc/page_configuration.xsd

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -32,4 +32,10 @@
3232
<xs:field xpath="@name"/>
3333
</xs:unique>
3434
</xs:element>
35+
36+
<xs:complexType name="const">
37+
<xs:complexContent>
38+
<xs:extension base="argumentType" />
39+
</xs:complexContent>
40+
</xs:complexType>
3541
</xs:schema>

lib/web/mage/validation/validation.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,7 @@
2525
var val = $(e).val();
2626
if (val && val.length > 0) {
2727
result = true;
28-
var valInt = parseInt(val, 10) || 0;
28+
var valInt = parseFloat(val) || 0;
2929
if (valInt >= 0) {
3030
total += valInt;
3131
} else {

0 commit comments

Comments
 (0)