Maikel Linke
cceca5f936
Use Redis for caching in test environment
...
All other environments use it.
2023-06-19 15:35:17 +10:00
Maikel Linke
f6db69104f
Update Gemfile.lock with new Ruby version
2023-06-19 15:03:44 +10:00
Maikel
7e20415490
Merge pull request #10888 from mkllnk/ruby3.1
...
Bump Ruby from 3.0.3 to 3.1.4
2023-06-19 10:08:20 +10:00
Maikel
101e72726c
Merge pull request #11032 from dacook/show-current-version2
...
Show current version2
2023-06-19 10:07:49 +10:00
Konrad
dab5436444
Merge pull request #10532 from abdellani/invoices
...
Invoices
2023-06-18 21:44:29 +02:00
Mohamed ABDELLANI
d059680f4b
remove white label from feature toggle
2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
27c1fd0d30
test invoice model
2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
639567e903
replace attr with attr_reader
2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
fff0b1e577
Update lib/open_food_network/feature_toggle.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
7a0686786d
Update db/migrate/20230308075421_create_invoices.rb
...
Co-authored-by: Maikel <maikel@email.org.au >
2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
73cdcca022
fix linter issues
2023-06-18 21:03:13 +02:00
Matt-Yorkley
4eb05a1d73
Reduce public interface of OrderInvoiceComparator
2023-06-18 21:03:13 +02:00
Matt-Yorkley
3946e7a6f5
Memoize presenters in OrderInvoiceComparator
...
This is now twice as fast and triggers half the number of database queries if both comparison methods get called
2023-06-18 21:03:13 +02: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
Matt-Yorkley
352ad20681
Fix display_checkout_taxes_hash in invoice_table4 template
2023-06-18 21:03:13 +02:00
Matt-Yorkley
68ab539ed3
Include completed_at attribute
2023-06-18 21:03:13 +02:00
Matt-Yorkley
113e1344f2
Include tax adjustments in serializer and presenter
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
72e537b598
Update *_amount_with_adjustments methods on LineItem presenter
...
These methods are slightly different and they're both needed in the template for invoice4
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
Matt-Yorkley
c3d6b2280f
Update reference to removed method
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
61d58df56f
fix linter issues
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
fa14dc370b
implement the invoice data generator
2023-06-18 21:03:13 +02:00
Mohamed ABDELLANI
d9efd10ac0
update attributes relevant for the comparaison
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
ae24b2d688
Update ScopeVariantsForSearch logic to match both product and variant SKUs
2023-06-16 21:26:28 +01:00
Matt-Yorkley
0f253bb2a0
Blank out product SKU when cloning a product
...
This was effectively being done before for the product's sku (stored on the master variant) via the #duplicate_variant method, but now it needs to be done explicitly on the product in #duplicate_product
2023-06-16 21:26:28 +01:00
Matt-Yorkley
15000c7ed1
Remove unnecessary iterator
2023-06-16 21:26:28 +01:00
Matt-Yorkley
733dd3c428
Disable variant is_master column
2023-06-16 21:23:44 +01:00
Matt-Yorkley
be72bbebb9
Remove master images data migration tests
2023-06-16 21:23:44 +01:00
Matt-Yorkley
fbd09869bb
Remove is_master from variant serializer
2023-06-16 21:23:44 +01:00
Matt-Yorkley
ced60d4382
Remove superfluous method from products controller
2023-06-16 21:23:44 +01:00
Matt-Yorkley
b59bdc75e9
Delete master variants
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
0703bb4583
Remove unused is_master references in tests
2023-06-16 21:23:44 +01:00
Matt-Yorkley
85059bfb26
Remove master variant validation conditionals
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
618900767f
Fix flaky spec: use milliseconds in cache service and remove sleep
2023-06-16 21:23:44 +01:00
Matt-Yorkley
1e36043a2e
Set unit_value to true when cloning a product
...
This value doesn't get persisted, but it's presence is validated. The product's duplicated variants store the actual :unit_value attribute
2023-06-16 21:23:44 +01:00
Matt-Yorkley
1922598d2d
Reorganise associations, validations, scopes and callbacks for clarity
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
21cba0aa13
Migrate first master variant image to product image
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
d8649fc9fb
Migrate master variant :sku to product
2023-06-16 21:21:40 +01:00
Matt-Yorkley
6b9b5ea347
Stop storing unit_value and unit_description on master variant
2023-06-16 21:21:40 +01:00