Rachel Arnould
6c1c103272
Merge pull request #10080 from jibees/10075-change-edit-order-page-colors
...
[WIP 🚧 ] Admin - Order edition, behind feature toggle `admin_style_v2`: adjust colors
2022-12-30 11:42:23 +01:00
Jean-Baptiste Bellet
74b618230f
Put action icons on the same line inside a .flex container
2022-12-30 09:39:01 +01:00
Jean-Baptiste Bellet
7b7718977f
Put action icons on the same line with .flex container
...
As they are now `display: flex;` (due to alignement of the background, and the icon itself), we are obliged to add this small container
2022-12-29 14:44:30 +01:00
Jean-Baptiste Bellet
d8e22a5ee7
Add rounded corner on top of table header
2022-12-16 15:49:38 +01:00
Jean-Baptiste Bellet
819cf5cc49
Add this td even if empty
...
easier to design table then
2022-12-16 15:49:38 +01:00
Jean-Baptiste Bellet
64d467ce39
Specify table#listing_orders and be as generic as possible for table
2022-12-16 15:49:38 +01:00
Jean-Baptiste Bellet
87ae8a40d1
Put date filter after the order cycle selector
...
it's way easier to understand then that date range could change when selecting order cycle
2022-12-14 10:13:36 +01:00
Jean-Baptiste Bellet
ac494f97ec
When changing order cycle selection, update date range selector value
...
Date selector should change when selecting an order cycle in order to reflect the order cycle date range itself
2022-12-14 10:12:42 +01:00
Jean-Baptiste Bellet
311675f2cf
Used an already existing key
...
Update bulk_management.html.haml
2022-12-12 16:18:39 +01:00
Jean-Baptiste Bellet
97c3aaebb2
Update the view as well: remove red clear button
...
+ remove all `refreshData()` callback on input change
+ align html (add fieldset, legend) to look same as `/admin/orders`
2022-12-12 16:18:39 +01:00
Jean-Baptiste Bellet
7556eee5d4
Do not display: flex; a td but its child
...
Actually, having `td.actions` with `display: flex;` cancel the `table-cell` height computation and it's then impossible to solve.
The solution here is to have a child (`div.flex`) that is `display: flex` and then the parent `td` can compute its height (as the same than its current row).
2022-11-28 14:36:51 +01:00
Jean-Baptiste Bellet
7d51bd7b83
Add secondary button
2022-11-25 16:47:48 +01:00
Jean-Baptiste Bellet
1a241e4953
Only call confirmRefresh() on time, on date range change
...
Previously, when changing the date range, we had several modals that opened.
Now, the `confirmRefresh()` method should be open only one time.
Update specs as well:
- use the method `accept_confirm`
- Removing pending and sleep as the spec is now green
2022-11-03 15:55:48 +01:00
Jean-Baptiste Bellet
e076e23064
Do not use ng-change on endDate but instead watch both start and end date
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
6ec3e7ee0c
Only send event change on valid range (ie. both start and end date)
...
+ do not refresh data on start date change but only on end date change
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
eec117e769
Implements daterangepicker for /admin/orders/bulk_management
...
+ update specs as well
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
73f55ae776
Implements daterangepicker for /admin/orders
...
+ update specs as well
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
8942d3d17b
Clear date on custom event flatpickr_clear
2022-10-08 16:36:26 +02:00
Jean-Baptiste Bellet
6b7030a6a8
Don't use directive, but the flatpickr stimulusjs controller
2022-10-08 16:36:26 +02:00
binarygit
25ae10dbe8
Create bulk orders cancellation feature
2022-10-04 16:57:31 +02:00
Cillian O'Ruanaidh
37617f63ea
Remove non-functional :backend scope from Spree::ShippingRate
...
It finds shipping methods where 'display_on != front_end' but :front_end values were removed in a1317be19b/db/migrate/20200508101630_convert_frontend_shipping_method_to_both.rb
2022-09-30 13:13:39 +01:00
Maikel
44bf63137a
Merge pull request #9606 from binarygit/remove-angular-from-address
...
Remove Angular from Address Tab
2022-09-12 13:49:54 +10:00
binarygit
0cfe842bd6
Fix typo: dependant to dependent in dependent-select controller
2022-09-05 09:52:27 +05:45
Maikel Linke
91eaa522cf
Simplify tax totals helper
2022-08-31 16:47:04 +10:00
Maikel Linke
2a57dc9766
Index tax totals correctly for invoice display
2022-08-31 16:47:04 +10:00
Maikel Linke
f37b681fac
Allow more tax data in the summary
...
I converted the value to a hash so that we can put all information in
there and we won't need the current hash key as percentage any more.
2022-08-31 16:47:04 +10:00
Nihal Mohammed
53ee5c32eb
Add order note at the end of both invoices following current UI patterns
...
Add translation for note title in invoice
Update invoice spec to also test for order note
2022-08-10 23:02:13 +05:30
Jean-Baptiste Bellet
fa9c2b24f2
Select Customer Details as step title for Set Distribution step
2022-07-28 09:31:42 +02:00
Jean-Baptiste Bellet
e3683d25ca
Change second step order: Customer Details instead of Order Details
...
This second step comes from a first one, which is Set Distribution
2022-07-28 09:31:42 +02:00
jibees
35c18664fc
Merge pull request #9389 from jibees/9388-handle-plural-in-order-selection-component
...
Handle plural (and 0) on orders selection component
2022-07-26 15:57:58 +02:00
Maikel Linke
dd6c066f5a
DRY view with JS translation
2022-07-20 17:01:10 +10:00
binarygit
1165c997bc
Add styles on notes/tracking info when hoving over their delete buttons
2022-07-19 13:36:58 +05:45
binarygit
6b042e4a17
Display notes field in admin/orders/new only after an item has been added
2022-07-18 16:15:37 +05:45
binarygit
2f01351ad2
Enable users to delete only non-empty tracking info/notes
2022-07-15 11:34:37 +05:45
binarygit
b88c85555e
Add delete tracking feature
2022-07-09 14:39:20 +05:45
binarygit
dc31ebebb1
Add delete note feature
2022-07-09 13:23:38 +05:45
Filipe
2f550725e3
Merge pull request #9368 from jibees/9178-add-note-on-order
...
Admin, Edit order: Can add note on order
2022-07-08 12:13:18 +01:00
Jean-Baptiste Bellet
06b1c9aa40
Handle plural (and 0) on orders selection component
2022-07-06 09:48:12 +02:00
Jean-Baptiste Bellet
89809aed5f
Add counter on note input
2022-07-05 10:09:20 +02:00
Jean-Baptiste Bellet
3f1099d968
Add edit note line on an order
2022-07-05 10:09:20 +02:00
Jean-Baptiste Bellet
8ba59079b3
Reverse per_page and actions components left <-> right
2022-06-28 18:12:47 +02:00
Jean-Baptiste Bellet
8d66f33230
per_page control can now be set on the right of the page
2022-06-28 18:12:20 +02:00
Jean-Baptiste Bellet
77e384ab71
Replace button by a drop-down
...
+ update specs as well
2022-06-28 17:39:41 +02:00
Filipe
ef0a346076
Merge pull request #9212 from jibees/9140-assign-a-customer-to-an-order-in-admin-section
...
When creating an order, and assigning a customer, fill all the customer inputs in the shipping/billing address form
2022-06-13 14:57:31 +01:00
Filipe
9fee4f1554
Merge pull request #9203 from AgriculturaFamiliar/remove-closed-associated-adjustments-button
...
Remove closed associated adjustments button
2022-06-10 10:10:50 +01:00
Jean-Baptiste Bellet
2e0851c02f
Use the method logo_url
2022-06-09 14:15:41 +02:00
Maikel Linke
4facab0335
Guard against invariable file types
...
Australian production had one JPG image which was not recognised as
such. The `content_type` was missing and trying to generate a URL for a
variant raised an error and crashed the page.
Testing for `variable?` includes testing for `attached?` and is more
defensive.
2022-06-01 17:16:55 +10:00
Maikel Linke
4a0ed99919
Replace Paperclip on Enterprise model
...
We configured Paperclip to convert images to JPG in some cases but I
omitted that here because we don't need it. If an image is better
represented as PNG or another format then the user should be able to
choose that.
Some specs were also testing the generated URL but the Active Storage
URL doesn't contain a style name anymore and it's not helpful to test
the URL.
2022-06-01 17:16:55 +10:00
Arthur Vieira
0fb9cc0f2a
Remove associated adjustments radio button
...
Removes the 'Associated Adjustment Closed' options from the order edit
page (/admin/orders/XXXXX/edit).
2022-05-26 09:12:19 -03:00
Jean-Baptiste Bellet
2c29b1f60f
Replace Angular directive and use stimulus controller
...
+ Update specs as well
2022-05-24 12:30:00 +02:00
