Skip to content

Commit c0fee4d

Browse files
vpelipenkovpelipenko
committed
Merge pull request #442 from magento-firedrakes/MAGETWO-39917
[Firedrakes] Bugfixes
2 parents 74dafb6 + 6e7c519 commit c0fee4d

File tree

5 files changed

+226
-101
lines changed

5 files changed

+226
-101
lines changed

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_creditmemo_grid.xml

Lines changed: 61 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -113,7 +113,7 @@
113113
<argument name="data" xsi:type="array">
114114
<item name="config" xsi:type="array">
115115
<item name="dataScope" xsi:type="string">increment_id</item>
116-
<item name="label" xsi:type="string" translate="true">Credit Memo</item>
116+
<item name="label" xsi:type="string" translate="true">Credit Memo #</item>
117117
</item>
118118
</argument>
119119
</filterInput>
@@ -152,7 +152,7 @@
152152
<argument name="data" xsi:type="array">
153153
<item name="config" xsi:type="array">
154154
<item name="dataScope" xsi:type="string">order_increment_id</item>
155-
<item name="label" xsi:type="string" translate="true">Order</item>
155+
<item name="label" xsi:type="string" translate="true">Order #</item>
156156
</item>
157157
</argument>
158158
</filterInput>
@@ -382,6 +382,64 @@
382382
</argument>
383383
</filterInput>
384384
</filterRange>
385+
<filterRange name="adjustment_positive">
386+
<argument name="data" xsi:type="array">
387+
<item name="config" xsi:type="array">
388+
<item name="dataScope" xsi:type="string">adjustment_positive</item>
389+
<item name="label" xsi:type="string" translate="true">Adjustment Refund</item>
390+
<item name="childDefaults" xsi:type="array">
391+
<item name="provider" xsi:type="string">sales_order_creditmemo_grid.sales_order_creditmemo_grid.listing_top.listing_filters</item>
392+
</item>
393+
</item>
394+
</argument>
395+
<filterInput name="from">
396+
<argument name="data" xsi:type="array">
397+
<item name="config" xsi:type="array">
398+
<item name="dataScope" xsi:type="string">from</item>
399+
<item name="label" xsi:type="string" translate="true">From</item>
400+
<item name="placeholder" xsi:type="string" translate="true">From</item>
401+
</item>
402+
</argument>
403+
</filterInput>
404+
<filterInput name="to">
405+
<argument name="data" xsi:type="array">
406+
<item name="config" xsi:type="array">
407+
<item name="dataScope" xsi:type="string">to</item>
408+
<item name="label" xsi:type="string" translate="true">To</item>
409+
<item name="placeholder" xsi:type="string" translate="true">To</item>
410+
</item>
411+
</argument>
412+
</filterInput>
413+
</filterRange>
414+
<filterRange name="adjustment_negative">
415+
<argument name="data" xsi:type="array">
416+
<item name="config" xsi:type="array">
417+
<item name="dataScope" xsi:type="string">adjustment_negative</item>
418+
<item name="label" xsi:type="string" translate="true">Adjustment Fee</item>
419+
<item name="childDefaults" xsi:type="array">
420+
<item name="provider" xsi:type="string">sales_order_creditmemo_grid.sales_order_creditmemo_grid.listing_top.listing_filters</item>
421+
</item>
422+
</item>
423+
</argument>
424+
<filterInput name="from">
425+
<argument name="data" xsi:type="array">
426+
<item name="config" xsi:type="array">
427+
<item name="dataScope" xsi:type="string">from</item>
428+
<item name="label" xsi:type="string" translate="true">From</item>
429+
<item name="placeholder" xsi:type="string" translate="true">From</item>
430+
</item>
431+
</argument>
432+
</filterInput>
433+
<filterInput name="to">
434+
<argument name="data" xsi:type="array">
435+
<item name="config" xsi:type="array">
436+
<item name="dataScope" xsi:type="string">to</item>
437+
<item name="label" xsi:type="string" translate="true">To</item>
438+
<item name="placeholder" xsi:type="string" translate="true">To</item>
439+
</item>
440+
</argument>
441+
</filterInput>
442+
</filterRange>
385443
<filterRange name="order_base_grand_total">
386444
<argument name="data" xsi:type="array">
387445
<item name="config" xsi:type="array">
@@ -420,7 +478,7 @@
420478
<item name="actions" xsi:type="array">
421479
<item name="pdfcreditmemos_order" xsi:type="array">
422480
<item name="type" xsi:type="string">pdfcreditmemos_order</item>
423-
<item name="label" xsi:type="string" translate="true">PDF Creditmemos</item>
481+
<item name="label" xsi:type="string" translate="true">PDF Credit Memos</item>
424482
<item name="url" xsi:type="string">sales/creditmemo/pdfcreditmemos</item>
425483
</item>
426484
</item>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_grid.xml

Lines changed: 153 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -143,7 +143,7 @@
143143
<item name="dataScope" xsi:type="string">created_at</item>
144144
<item name="label" xsi:type="string" translate="true">Purchase Date</item>
145145
<item name="childDefaults" xsi:type="array">
146-
<item name="provider" xsi:type="string">cms_block_listing.cms_block_listing.listing_top.listing_filters</item>
146+
<item name="provider" xsi:type="string">sales_order_grid.sales_order_grid.listing_top.listing_filters</item>
147147
</item>
148148
</item>
149149
</argument>
@@ -254,6 +254,157 @@
254254
</item>
255255
</argument>
256256
</filterSelect>
257+
<filterInput name="billing_address">
258+
<argument name="data" xsi:type="array">
259+
<item name="config" xsi:type="array">
260+
<item name="dataScope" xsi:type="string">billing_address</item>
261+
<item name="label" xsi:type="string" translate="true">Bill-to Name</item>
262+
</item>
263+
</argument>
264+
</filterInput>
265+
<filterInput name="shipping_address">
266+
<argument name="data" xsi:type="array">
267+
<item name="config" xsi:type="array">
268+
<item name="dataScope" xsi:type="string">shipping_address</item>
269+
<item name="label" xsi:type="string" translate="true">Shipping Address</item>
270+
</item>
271+
</argument>
272+
</filterInput>
273+
<filterInput name="shipping_information">
274+
<argument name="data" xsi:type="array">
275+
<item name="config" xsi:type="array">
276+
<item name="dataScope" xsi:type="string">shipping_information</item>
277+
<item name="label" xsi:type="string" translate="true">Shipping Information</item>
278+
</item>
279+
</argument>
280+
</filterInput>
281+
<filterInput name="customer_email">
282+
<argument name="data" xsi:type="array">
283+
<item name="config" xsi:type="array">
284+
<item name="dataScope" xsi:type="string">customer_email</item>
285+
<item name="label" xsi:type="string" translate="true">Customer Email</item>
286+
</item>
287+
</argument>
288+
</filterInput>
289+
<filterSelect name="customer_group">
290+
<argument name="optionsProvider" xsi:type="configurableObject">
291+
<argument name="class" xsi:type="string">Magento\Customer\Ui\Component\Listing\Column\Group\Options</argument>
292+
</argument>
293+
<argument name="data" xsi:type="array">
294+
<item name="config" xsi:type="array">
295+
<item name="caption" xsi:type="string" translate="true">Select...</item>
296+
<item name="dataScope" xsi:type="string">customer_group</item>
297+
<item name="label" xsi:type="string" translate="true">Customer Group</item>
298+
</item>
299+
</argument>
300+
</filterSelect>
301+
<filterRange name="subtotal">
302+
<argument name="data" xsi:type="array">
303+
<item name="config" xsi:type="array">
304+
<item name="dataScope" xsi:type="string">subtotal</item>
305+
<item name="label" xsi:type="string" translate="true">Subtotal</item>
306+
<item name="childDefaults" xsi:type="array">
307+
<item name="provider" xsi:type="string">sales_order_grid.sales_order_grid.listing_top.listing_filters</item>
308+
</item>
309+
</item>
310+
</argument>
311+
<filterInput name="from">
312+
<argument name="data" xsi:type="array">
313+
<item name="config" xsi:type="array">
314+
<item name="dataScope" xsi:type="string">from</item>
315+
<item name="label" xsi:type="string" translate="true">From</item>
316+
<item name="placeholder" xsi:type="string" translate="true">From</item>
317+
</item>
318+
</argument>
319+
</filterInput>
320+
<filterInput name="to">
321+
<argument name="data" xsi:type="array">
322+
<item name="config" xsi:type="array">
323+
<item name="dataScope" xsi:type="string">to</item>
324+
<item name="label" xsi:type="string" translate="true">To</item>
325+
<item name="placeholder" xsi:type="string" translate="true">To</item>
326+
</item>
327+
</argument>
328+
</filterInput>
329+
</filterRange>
330+
<filterRange name="shipping_and_handling">
331+
<argument name="data" xsi:type="array">
332+
<item name="config" xsi:type="array">
333+
<item name="dataScope" xsi:type="string">shipping_and_handling</item>
334+
<item name="label" xsi:type="string" translate="true">Shipping and Handling</item>
335+
<item name="childDefaults" xsi:type="array">
336+
<item name="provider" xsi:type="string">sales_order_grid.sales_order_grid.listing_top.listing_filters</item>
337+
</item>
338+
</item>
339+
</argument>
340+
<filterInput name="from">
341+
<argument name="data" xsi:type="array">
342+
<item name="config" xsi:type="array">
343+
<item name="dataScope" xsi:type="string">from</item>
344+
<item name="label" xsi:type="string" translate="true">From</item>
345+
<item name="placeholder" xsi:type="string" translate="true">From</item>
346+
</item>
347+
</argument>
348+
</filterInput>
349+
<filterInput name="to">
350+
<argument name="data" xsi:type="array">
351+
<item name="config" xsi:type="array">
352+
<item name="dataScope" xsi:type="string">to</item>
353+
<item name="label" xsi:type="string" translate="true">To</item>
354+
<item name="placeholder" xsi:type="string" translate="true">To</item>
355+
</item>
356+
</argument>
357+
</filterInput>
358+
</filterRange>
359+
<filterInput name="customer_name">
360+
<argument name="data" xsi:type="array">
361+
<item name="config" xsi:type="array">
362+
<item name="dataScope" xsi:type="string">customer_name</item>
363+
<item name="label" xsi:type="string" translate="true">Customer Name</item>
364+
</item>
365+
</argument>
366+
</filterInput>
367+
<filterSelect name="payment_method">
368+
<argument name="optionsProvider" xsi:type="configurableObject">
369+
<argument name="class" xsi:type="string">Magento\Payment\Ui\Component\Listing\Column\Method\Options</argument>
370+
</argument>
371+
<argument name="data" xsi:type="array">
372+
<item name="config" xsi:type="array">
373+
<item name="caption" xsi:type="string" translate="true">Select...</item>
374+
<item name="dataScope" xsi:type="string">payment_method</item>
375+
<item name="label" xsi:type="string" translate="true">Payment Method</item>
376+
</item>
377+
</argument>
378+
</filterSelect>
379+
<filterRange name="total_refunded">
380+
<argument name="data" xsi:type="array">
381+
<item name="config" xsi:type="array">
382+
<item name="dataScope" xsi:type="string">total_refunded</item>
383+
<item name="label" xsi:type="string" translate="true">Total Refunded</item>
384+
<item name="childDefaults" xsi:type="array">
385+
<item name="provider" xsi:type="string">sales_order_grid.sales_order_grid.listing_top.listing_filters</item>
386+
</item>
387+
</item>
388+
</argument>
389+
<filterInput name="from">
390+
<argument name="data" xsi:type="array">
391+
<item name="config" xsi:type="array">
392+
<item name="dataScope" xsi:type="string">from</item>
393+
<item name="label" xsi:type="string" translate="true">From</item>
394+
<item name="placeholder" xsi:type="string" translate="true">From</item>
395+
</item>
396+
</argument>
397+
</filterInput>
398+
<filterInput name="to">
399+
<argument name="data" xsi:type="array">
400+
<item name="config" xsi:type="array">
401+
<item name="dataScope" xsi:type="string">to</item>
402+
<item name="label" xsi:type="string" translate="true">To</item>
403+
<item name="placeholder" xsi:type="string" translate="true">To</item>
404+
</item>
405+
</argument>
406+
</filterInput>
407+
</filterRange>
257408
</filters>
258409
<massaction name="listing_massaction">
259410
<argument name="data" xsi:type="array">
@@ -379,7 +530,7 @@
379530
</item>
380531
<item name="config" xsi:type="array">
381532
<item name="dataType" xsi:type="string">text</item>
382-
<item name="sorting" xsi:type="string">asc</item>
533+
<item name="sorting" xsi:type="string">desc</item>
383534
<item name="align" xsi:type="string">left</item>
384535
<item name="label" xsi:type="string" translate="true">ID</item>
385536
</item>

‎app/code/Magento/Sales/view/adminhtml/ui_component/sales_order_invoice_grid.xml

Lines changed: 5 additions & 47 deletions
Original file line numberDiff line numberDiff line change
@@ -109,35 +109,14 @@
109109
</item>
110110
</item>
111111
</argument>
112-
<filterRange name="increment_id">
112+
<filterInput name="increment_id">
113113
<argument name="data" xsi:type="array">
114114
<item name="config" xsi:type="array">
115115
<item name="dataScope" xsi:type="string">increment_id</item>
116-
<item name="label" xsi:type="string" translate="true">Invoice</item>
117-
<item name="childDefaults" xsi:type="array">
118-
<item name="provider" xsi:type="string">sales_order_invoice_grid.sales_order_invoice_grid.listing_top.listing_filters</item>
119-
</item>
116+
<item name="label" xsi:type="string" translate="true">Invoice #</item>
120117
</item>
121118
</argument>
122-
<filterInput name="from">
123-
<argument name="data" xsi:type="array">
124-
<item name="config" xsi:type="array">
125-
<item name="dataScope" xsi:type="string">from</item>
126-
<item name="label" xsi:type="string" translate="true">From</item>
127-
<item name="placeholder" xsi:type="string" translate="true">From</item>
128-
</item>
129-
</argument>
130-
</filterInput>
131-
<filterInput name="to">
132-
<argument name="data" xsi:type="array">
133-
<item name="config" xsi:type="array">
134-
<item name="dataScope" xsi:type="string">to</item>
135-
<item name="label" xsi:type="string" translate="true">To</item>
136-
<item name="placeholder" xsi:type="string" translate="true">To</item>
137-
</item>
138-
</argument>
139-
</filterInput>
140-
</filterRange>
119+
</filterInput>
141120
<filterRange name="created_at" class="Magento\Ui\Component\Filters\Type\DateRange">
142121
<argument name="data" xsi:type="array">
143122
<item name="config" xsi:type="array">
@@ -169,35 +148,14 @@
169148
</argument>
170149
</filterDate>
171150
</filterRange>
172-
<filterRange name="order_increment_id">
151+
<filterInput name="order_increment_id">
173152
<argument name="data" xsi:type="array">
174153
<item name="config" xsi:type="array">
175154
<item name="dataScope" xsi:type="string">order_increment_id</item>
176155
<item name="label" xsi:type="string" translate="true">Order #</item>
177-
<item name="childDefaults" xsi:type="array">
178-
<item name="provider" xsi:type="string">sales_order_invoice_grid.sales_order_invoice_grid.listing_top.listing_filters</item>
179-
</item>
180156
</item>
181157
</argument>
182-
<filterInput name="from">
183-
<argument name="data" xsi:type="array">
184-
<item name="config" xsi:type="array">
185-
<item name="dataScope" xsi:type="string">from</item>
186-
<item name="label" xsi:type="string" translate="true">From</item>
187-
<item name="placeholder" xsi:type="string" translate="true">From</item>
188-
</item>
189-
</argument>
190-
</filterInput>
191-
<filterInput name="to">
192-
<argument name="data" xsi:type="array">
193-
<item name="config" xsi:type="array">
194-
<item name="dataScope" xsi:type="string">to</item>
195-
<item name="label" xsi:type="string" translate="true">To</item>
196-
<item name="placeholder" xsi:type="string" translate="true">To</item>
197-
</item>
198-
</argument>
199-
</filterInput>
200-
</filterRange>
158+
</filterInput>
201159
<filterRange name="order_created_at" class="Magento\Ui\Component\Filters\Type\DateRange">
202160
<argument name="data" xsi:type="array">
203161
<item name="config" xsi:type="array">

0 commit comments

Comments
 (0)