Matt-Yorkley
fefa9288a4
Remove :permalink attribute from Product
2023-06-30 11:37:57 +01:00
Matt-Yorkley
a0a1f8f910
Merge pull request #11002 from openfoodfoundation/voucher-prep
...
Vouchers part 1
2023-06-28 11:30:12 +01:00
Maikel
e065910d2d
Merge pull request #10939 from Matt-Yorkley/master-variants
...
Remove master variants
2023-06-23 13:42:58 +10:00
Matt-Yorkley
c6ec13443e
Drop next_invoice_number method from Spree::Order
2023-06-18 21:03:13 +02:00
Matt-Yorkley
d3a31bd0bd
Rename @invoice_presenter instance variable to @order in invoice templates
2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
0ed7599267
extract methods related to invoices from the order model to the OrderInvoiceComparator
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
Matt-Yorkley
ced60d4382
Remove superfluous method from products controller
2023-06-16 21:23:44 +01:00
Matt-Yorkley
1daab8994d
Remove is_master and not_master scopes
2023-06-16 21:23:44 +01:00
Matt-Yorkley
8247dce2dc
Improve validation feedback on new variant page and add test coverage
2023-06-16 21:23:44 +01:00
Matt-Yorkley
3ef7d2c9ff
Remove master variant from product
2023-06-16 21:23:44 +01:00
Matt-Yorkley
7dc1091bc2
Migrate product image from master variant to product
2023-06-16 21:23:44 +01:00
Matt-Yorkley
1b06c20197
Stop using master variant as a potential store for prices
2023-06-16 21:21:40 +01:00
Matt-Yorkley
c5dfecbb69
Reapply taxes at model level if order address changes
...
This should be done at the model level
2023-06-14 10:19:30 +01:00
Matt-Yorkley
13a22c56f4
Move taxing of admin adjustments out of customer details controller
2023-06-14 10:19:30 +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
Matt-Yorkley
983353e078
Remove dead code
...
I'm pretty sure this was here because advancing the order was adding order errors in some cases
2023-06-07 13:01:37 +01:00
Matt-Yorkley
f3ee10dd5a
Simplify by moving conditional to guard clause
2023-06-07 13:01:37 +01:00
Matt-Yorkley
acc34d1deb
Update advance to payment logic
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
Mohamed ABDELLANI
77554e21fc
move advance_to_payment on order's details page from edit to update
2023-06-06 10:23:01 +01:00
Matt-Yorkley
3dd4e7ef03
Delegate order updater method
2023-06-05 23:54:04 +01:00
Matt-Yorkley
10dbeb32b2
Remove Order #credit_cards method
2023-06-05 21:30:40 +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
a20277c3a7
Completely remove option_values and option_types from the codebase
2023-06-01 10:12:19 +01:00
Matt-Yorkley
e34c2acba8
Move CablecarResponses include to ApplicationController
2023-05-26 10:35:41 +01:00
Maikel Linke
86c35fe2dc
Remove dead reference to removed model
2023-05-25 16:13:33 +10:00
Matt-Yorkley
abf00353ea
Permit explicit params
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
048df6230b
Remove angular from admin orders index page
2023-05-21 00:15:32 +01:00
Jean-Baptiste Bellet
3a1579104f
Submit customer_id as params when updating customer details on order
2023-05-04 16:40:58 +02:00
Konrad
b60a6fbd05
Merge pull request #10329 from thejwuscript/9861-improve-input-validation
...
Improve input validation on new and edit Payment Method pages
2023-05-03 16:11:21 +02:00
Konrad
75b5d1fd6f
Merge pull request #10712 from jibees/6133-backoffice-orders-endless-spinner-and-error-500-after-skipping-oc-selector
...
Admin, create new order: distributor and order cycle are now mandatory on step 1 (aka the set_distribution step)
2023-04-22 16:04:15 +02:00
Jean-Baptiste Bellet
0f54d3950d
Save can have a context: simplify then
2023-04-19 10:15:35 +02:00
Jean-Baptiste Bellet
7e306693a8
Use Rails standard naming: same name for the route and the method
2023-04-19 10:15:35 +02:00
Jean-Baptiste Bellet
ac666a6fce
Validate presence of distributor and order_cycle in set_distribution step
2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
ba1d985932
update the set_distribution form on the same path
...
and use the same method `OrdersController#set_distribution`
2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
0f28d318ac
Fix rubocop error and prefer using a return clause
2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
6172d1f2e5
Extract method on_update that will be used elsewhere
2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
05a040b4c3
No need to ensure if the distribution is set on new action
...
This will be handled by validation on set_distribution action
2023-04-18 14:36:47 +02:00
Jean-Baptiste Bellet
73a81310f8
Create a new url /orders/ORDER_ID/distribution
...
That handles the step when distributor and order_cycle must be selected
2023-04-18 14:21:23 +02:00
James Wu
2a7cb50fa9
Keep and display submitted data on new payment method page
2023-04-18 09:39:39 +10:00
James Wu
ae5f2cc19d
Fix error saving data on new Calculator
2023-04-18 09:39:39 +10:00
James Wu
41ce4fbc16
Fix cache issue with invalid form data
2023-04-18 09:39:39 +10:00
James Wu
48753df5f0
Improve input validation and error notification
2023-04-18 09:39:39 +10:00
Maikel Linke
dad4061ff9
Style Rails/ToFormattedS
2023-04-14 16:32:39 +10:00
Maikel Linke
4461b33491
Sort zones by name again
...
Zones were intended to be sorted by name. But I guess that the syntax of
Ransack changed one day and we didn't notice because the spec was
creating entries in the right order already (which often reflects the
query result order without parameters). So the spec is fixed to fail if
the sorting doesn't happen and Ransack is configured to sort correctly.
The previous sort value was ignored.
2023-03-27 16:36:04 +11:00
Konrad
f7f49377b4
Merge pull request #10297 from cyrillefr/convert-admin-order-cancellation-workflow-to-stimulus-reflex
...
Convert admin order cancellation workflow to stimulus reflex
2023-02-20 21:38:33 +01:00
