Matt-Yorkley
a0a1f8f910
Merge pull request #11002 from openfoodfoundation/voucher-prep
...
Vouchers part 1
2023-06-28 11:30:12 +01:00
Maikel
014fb69d4b
Merge pull request #10964 from macanudo527/fix_linelength_bundle1
...
Fix Layout/LineLength - Bundle 1
2023-06-26 12:10:39 +10:00
Maikel
e065910d2d
Merge pull request #10939 from Matt-Yorkley/master-variants
...
Remove master variants
2023-06-23 13:42:58 +10:00
David Cook
3bff7a9f13
Fix query
...
With deep nesting syntax.
I chose the longer alias 'left_outer_joins' because it's more explicit, and matches the use up on line 121.
2023-06-23 09:11:03 +09:00
Neal Chambers
1e4034534c
Fix Layout/LineLength
2023-06-23 09:08:04 +09:00
Matt-Yorkley
776eac9f52
Add image error Bugsnag notifications
2023-06-20 14:14:19 +01: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
73cdcca022
fix linter issues
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
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
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
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
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
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
733dd3c428
Disable variant is_master column
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
85059bfb26
Remove master variant validation conditionals
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
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
Matt-Yorkley
8c0b8dad85
Stop using master variant for storing :display_as value
2023-06-16 21:21:40 +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
d4188da7c1
Simplify product images delegation mess
2023-06-16 21:21:40 +01:00
Matt-Yorkley
42a5a48816
Remove dead code
2023-06-16 21:21:40 +01:00
Matt-Yorkley
7068df5d4b
Merge pull request #10804 from Matt-Yorkley/public-images
...
Update ActiveStorage image processing
2023-06-15 15:49:11 +01:00
Matt-Yorkley
395cf7fb8d
Use direct image URLs for enterprise logos
2023-06-14 12:53:20 +01:00
Matt-Yorkley
5ad37ce6a5
Return default image url on ActiveStorage errors in image loading
2023-06-14 12:53:20 +01:00
Matt-Yorkley
b510668ecf
Render direct URLs for s3 images
2023-06-14 10:56:10 +01:00
Matt-Yorkley
551d0d3a93
Simplify calling #url_for in models
2023-06-14 10:56:10 +01:00
Matt-Yorkley
a898915724
Use named image variants
2023-06-14 10:56:10 +01:00
Matt-Yorkley
e54cff2274
Set images to public-read
...
Defining an alternate s3 configuration set to `public: true` means we can use it selectively. It sets the objects to `acl: "public-read"` by default (read-only) and means any image tags for those assets can use direct public links in the src attribute (without hitting the ActiveStorage::Representation endpoint). The default non-public service will still be used by default for any other files on instances using s3.
2023-06-14 10:56:10 +01:00
Matt-Yorkley
93df70c0a7
Use order total excluding discounts in voucher calculations
2023-06-14 10:19:30 +01:00
Matt-Yorkley
06c9697d0d
Don't try to cancel shipments that might already be cancelled
2023-06-14 10:19:30 +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
a0f23fc510
Extract before_payment_state? method
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
65b6a75c9b
Reorder callback definitions
2023-06-14 10:19:30 +01:00
Maikel Linke
91d0dabc1d
Require associations on DistributorShippingMethod
2023-06-14 15:09:12 +10:00
Maikel Linke
bd11475fe1
Require associations on DistributorPaymentMethod
2023-06-14 15:08:22 +10:00
Maikel Linke
ed231ec512
Update belongs_to default in Customer model
2023-06-14 15:08:05 +10:00
