Maikel
101e72726c
Merge pull request #11032 from dacook/show-current-version2
...
Show current version2
2023-06-19 10:07:49 +10:00
Matt-Yorkley
d3a31bd0bd
Rename @invoice_presenter instance variable to @order in invoice templates
2023-06-18 21:03:13 +02:00
Matt-Yorkley
352ad20681
Fix display_checkout_taxes_hash in invoice_table4 template
2023-06-18 21:03:13 +02:00
Matt-Yorkley
5bbc63f716
Fix options_text displaying when there is no options_text
2023-06-18 21:03:13 +02:00
Matt-Yorkley
208840b99d
Use @invoice_presenter.checkout_adjustments
2023-06-18 21:03:13 +02:00
Matt-Yorkley
a44f24ad43
Remove prefixes from invoice data representation so it conforms to the same interface as order
2023-06-18 21:03:13 +02:00
Matt-Yorkley
8dba1618b1
Don't call information from @order in new invoice templates
...
Previously this template was calling various bits of data from the @order object and not the @invoice_presenter object
2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
d86173c509
add feature toggle
...
seperate the invoice templates that rely on presenters from the old ones.
2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
0fbf88190e
Generate invoice model
...
There are three main components:
1. The invoice model
2. order serializers: serialize the order for the invoice
3. data presenters: the object that will be use to access the order's serialize data
2023-06-18 21:03:13 +02:00
David Cook
56e4b3b843
Load git version once at initialisation
...
Co-authored-by: Matt-Yorkley <9029026+Matt-Yorkley@users.noreply.github.com >
2023-06-16 09:36:16 +10:00
David Cook
35d9837f24
Show current version at bottom of admin dashboard
...
With generic link to the releases page. We could provide a link to latest tag with `git describe --tags --abbrev=0`. But I thought it better to keep things simple.
2023-06-16 09:11:59 +10:00
Matt-Yorkley
5ad37ce6a5
Return default image url on ActiveStorage errors in image loading
2023-06-14 12:53:20 +01:00
Matt-Yorkley
6f12d012ed
Use #url helper
2023-06-14 10:56:10 +01:00
Matt-Yorkley
f4261b85b8
Merge pull request #10940 from Matt-Yorkley/order-tidyup
...
Order class tidyup
2023-06-08 15:06:59 +01:00
David Cook
7d26158e06
Code cleanup
...
Co-authored-by: Maikel <maikel@email.org.au >
2023-06-08 11:31:37 +10:00
Matt-Yorkley
e1b37090be
Use _path helper instead of _url
2023-06-07 00:58:43 +01:00
Matt-Yorkley
6e8ed1f612
Hide secondary form until the order has line items
2023-06-07 00:58:43 +01:00
Matt-Yorkley
c7bb24e2a0
Remove dead code and clarify update logic
2023-06-07 00:58:43 +01:00
Matt-Yorkley
67c3e09dba
Use RESTful routes for orders controller actions
2023-06-07 00:35:47 +01:00
Matt-Yorkley
2bfb57a1a1
Clarify shipments partial inclusion
2023-06-06 14:59:53 +01:00
Matt-Yorkley
8813edaed8
Fix variables in form partial
2023-06-06 14:59:03 +01:00
Matt-Yorkley
05a715a43a
Remove Order #distribution_set? method
2023-06-05 21:30:46 +01:00
Filipe
12159edaca
Merge pull request #10833 from Matt-Yorkley/order-angular
...
Remove Angular from admin orders index page
2023-06-01 13:57:39 +01:00
Matt-Yorkley
1128fd9c02
Visual tweak to ship/capture buttons and success feedback
2023-06-01 12:13:12 +01:00
Matt-Yorkley
a20277c3a7
Completely remove option_values and option_types from the codebase
2023-06-01 10:12:19 +01:00
Matt-Yorkley
3e5ecba738
Remove unhelpful Helper
2023-06-01 10:11:20 +01:00
David Cook
31fa9c2c04
Add admin_style_v3 feature toggle
2023-05-26 15:10:27 +10:00
Matt-Yorkley
7c5067ff42
Update "special instructions" note tooltip and add missing test coverage
2023-05-21 14:06:14 +01:00
Matt-Yorkley
dcdcdb4fc0
Align filter buttons centrally
2023-05-21 00:15:32 +01:00
Matt-Yorkley
52450028a1
Fix checkbox alignment
2023-05-21 00:15:32 +01:00
Matt-Yorkley
d50ac4bf45
Reinstate dropdown-with-prepend
2023-05-21 00:15:32 +01:00
Matt-Yorkley
4ddde65a04
Reimplement saving and restoring submitted search filters between page loads
2023-05-21 00:15:32 +01:00
Matt-Yorkley
d64a9afece
Replace angular ofn-with-tip directive on capture/ship buttons
2023-05-21 00:15:32 +01:00
Matt-Yorkley
c3cf79f5ef
Delete angular ordersCtrl
2023-05-21 00:15:32 +01:00
Matt-Yorkley
95f1643cec
Combine related reflex actions
2023-05-21 00:15:32 +01:00
Matt-Yorkley
bee46720f4
Combine bulk action controllers and pass reflex as an argument
2023-05-21 00:15:32 +01:00
Matt-Yorkley
5930d0c1f5
Make bulk actions more generic
2023-05-21 00:15:32 +01:00
Matt-Yorkley
55d9deb5bd
Update order cancelling bulk action
2023-05-21 00:15:32 +01:00
Matt-Yorkley
134f1ab151
Replace angular bulkInvoiceCtrl
2023-05-21 00:15:32 +01:00
Matt-Yorkley
25aecfa5b9
Add reflex for shipping orders
2023-05-21 00:15:32 +01:00
Matt-Yorkley
e58a37f65b
Add reflex for capturing orders
2023-05-21 00:15:32 +01:00
Matt-Yorkley
048df6230b
Remove angular from admin orders index page
2023-05-21 00:15:32 +01:00
Matt-Yorkley
5ad68f25e3
Handle old jquery_ujs buttons
2023-05-21 00:15:30 +01:00
Matt-Yorkley
f181b35a90
Add minimal admin js setup
2023-05-20 19:47:41 +01:00
Filipe
0d23b63bbd
Merge pull request #10779 from dacook/10634-remove-admin_style_v2
...
10634 Remove admin_style_v2 feature
2023-05-17 15:37:05 +01:00
David Cook
e29df5ea8f
Remove unused secondary class
...
This partially reverts 97c3aaebb2 because it referred to the new feature toggle which has been removed.
2023-05-09 21:26:47 +10:00
David Cook
3ec659d82b
Revert pull #10025
...
[WIP 🚧 ] Admin, behind feature toggle admin_style_v2: adjust some colors
This reverts commits 60f0a58508ce77666fa96c73d76dc0620f23daaf~1..09bcc772ff089f911a56bb
2023-05-09 21:26:47 +10:00
David Cook
be70cd7893
Revert pull #10054
...
[WIP 🚧 ] Admin/Orders, behind feature toggle admin_style_v2: adjust colors
This reverts commits 5cab0f7f3d495daaeb97fd786208a24355b630fe..4ef5609b0eb08fe7e48803de166ae3e979103c1b
2023-05-09 21:26:47 +10:00
David Cook
0ff540e1e3
Revert pull #10080
...
[WIP 🚧 ] Admin - Order edition, behind feature toggle admin_style_v2: adjust colors
This reverts commits faf106b2824f248812f523c10b688bd9b254dc14..74b618230ff736ac7929246e2c83ed95067a4dd0
2023-05-09 21:25:29 +10:00
Jean-Baptiste Bellet
3a1579104f
Submit customer_id as params when updating customer details on order
2023-05-04 16:40:58 +02:00