Skip to content

Commit 71fac5b

Browse files
sidolovsidolov
authored
Merge branch '2.3-develop' into 2.3-develop-prs
2 parents 3399121 + a72432e commit 71fac5b

File tree

7 files changed

+17
-29
lines changed

7 files changed

+17
-29
lines changed

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_block_form.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -123,6 +123,10 @@
123123
<rule name="required-entry" xsi:type="boolean">true</rule>
124124
</validation>
125125
<dataType>int</dataType>
126+
<tooltip>
127+
<link>https://docs.magento.com/m2/ce/user_guide/configuration/scope.html</link>
128+
<description>What is this?</description>
129+
</tooltip>
126130
<label translate="true">Store View</label>
127131
<dataScope>store_id</dataScope>
128132
</settings>

‎app/code/Magento/Cms/view/adminhtml/ui_component/cms_page_form.xml

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -207,6 +207,10 @@
207207
<rule name="required-entry" xsi:type="boolean">true</rule>
208208
</validation>
209209
<dataType>int</dataType>
210+
<tooltip>
211+
<link>https://docs.magento.com/m2/ce/user_guide/configuration/scope.html</link>
212+
<description>What is this?</description>
213+
</tooltip>
210214
<label translate="true">Store View</label>
211215
<dataScope>store_id</dataScope>
212216
</settings>

‎app/code/Magento/Customer/view/adminhtml/ui_component/customer_listing.xml

Lines changed: 0 additions & 24 deletions
Original file line numberDiff line numberDiff line change
@@ -157,18 +157,12 @@
157157
<column name="billing_telephone" sortOrder="60">
158158
<settings>
159159
<filter>text</filter>
160-
<editor>
161-
<editorType>text</editorType>
162-
</editor>
163160
<label translate="true">Phone</label>
164161
</settings>
165162
</column>
166163
<column name="billing_postcode" sortOrder="70">
167164
<settings>
168165
<filter>text</filter>
169-
<editor>
170-
<editorType>text</editorType>
171-
</editor>
172166
<label translate="true">ZIP</label>
173167
</settings>
174168
</column>
@@ -269,59 +263,41 @@
269263
<column name="billing_city" sortOrder="210">
270264
<settings>
271265
<filter>text</filter>
272-
<editor>
273-
<editorType>text</editorType>
274-
</editor>
275266
<label translate="true">City</label>
276267
<visible>false</visible>
277268
</settings>
278269
</column>
279270
<column name="billing_fax" sortOrder="220">
280271
<settings>
281272
<filter>text</filter>
282-
<editor>
283-
<editorType>text</editorType>
284-
</editor>
285273
<label translate="true">Fax</label>
286274
<visible>false</visible>
287275
</settings>
288276
</column>
289277
<column name="billing_vat_id" sortOrder="230">
290278
<settings>
291279
<filter>text</filter>
292-
<editor>
293-
<editorType>text</editorType>
294-
</editor>
295280
<label translate="true">VAT Number</label>
296281
<visible>false</visible>
297282
</settings>
298283
</column>
299284
<column name="billing_company" sortOrder="240">
300285
<settings>
301286
<filter>text</filter>
302-
<editor>
303-
<editorType>text</editorType>
304-
</editor>
305287
<label translate="true">Company</label>
306288
<visible>false</visible>
307289
</settings>
308290
</column>
309291
<column name="billing_firstname" sortOrder="250">
310292
<settings>
311293
<filter>text</filter>
312-
<editor>
313-
<editorType>text</editorType>
314-
</editor>
315294
<label translate="true">Billing Firstname</label>
316295
<visible>false</visible>
317296
</settings>
318297
</column>
319298
<column name="billing_lastname" sortOrder="260">
320299
<settings>
321300
<filter>text</filter>
322-
<editor>
323-
<editorType>text</editorType>
324-
</editor>
325301
<label translate="true">Billing Lastname</label>
326302
<visible>false</visible>
327303
</settings>

‎app/code/Magento/Multishipping/view/frontend/templates/checkout/addresses.phtml

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -62,8 +62,9 @@
6262
name="ship[<?= $block->escapeHtml($_index) ?>][<?= $block->escapeHtml($_item->getQuoteItemId()) ?>][qty]"
6363
value="<?= $block->escapeHtml($_item->getQty()) ?>"
6464
size="2"
65-
class="input-text qty required-entry"
66-
data-validate="{number: true, required:true}"/>
65+
min="0"
66+
class="input-text qty"
67+
data-validate="{number: true, required:true, 'validate-greater-than-zero':true}"/>
6768
</div>
6869
</div>
6970
</td>

‎app/code/Magento/Quote/Model/Cart/CartTotalRepository.php

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,6 @@
88
use Magento\Quote\Api;
99
use Magento\Quote\Api\CartRepositoryInterface;
1010
use Magento\Quote\Api\CartTotalRepositoryInterface;
11-
use Magento\Catalog\Helper\Product\ConfigurationPool;
1211
use Magento\Framework\Api\DataObjectHelper;
1312
use Magento\Framework\Api\ExtensibleDataInterface;
1413
use Magento\Quote\Model\Cart\Totals\ItemConverter;
@@ -40,7 +39,7 @@ class CartTotalRepository implements CartTotalRepositoryInterface
4039
private $dataObjectHelper;
4140

4241
/**
43-
* @var ConfigurationPool
42+
* @var ItemConverter
4443
*/
4544
private $itemConverter;
4645

‎app/code/Magento/Ui/view/base/web/js/grid/columns/date.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -26,7 +26,7 @@ define([
2626
initConfig: function () {
2727
this._super();
2828

29-
this.dateFormat = utils.normalizeDate(this.dateFormat);
29+
this.dateFormat = utils.normalizeDate(this.dateFormat ? this.dateFormat : this.options.dateFormat);
3030

3131
return this;
3232
},

‎lib/web/mage/validation.js

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1888,6 +1888,10 @@
18881888
if (element.siblings('.tooltip').length) {
18891889
errorPlacement = element.siblings('.tooltip');
18901890
}
1891+
//logic for select with tooltip in after element
1892+
if (element.next().find('.tooltip').length) {
1893+
errorPlacement = element.next();
1894+
}
18911895
errorPlacement.after(error);
18921896
}
18931897
},

0 commit comments

Comments
 (0)