Andy Brett
a431c03eb1
only show primary producers on shopfront list of producers
2021-03-04 14:32:55 -08:00
Andy Brett
7bf1bd6287
Merge pull request #6995 from coopdevs/add-good-migrations
...
Add gem to watch after data migrations
2021-03-04 12:09:22 -08:00
Andy Brett
4e5945f9ef
add resumed to list of allowable order states
2021-03-04 11:24:39 -08:00
Transifex-Openfoodnetwork
2ea9664ecb
Updating translations for config/locales/en_US.yml
2021-03-05 05:13:51 +11:00
Transifex-Openfoodnetwork
dfdc97cfa4
Updating translations for config/locales/de_DE.yml
2021-03-05 05:00:27 +11:00
Pau Pérez Fabregat
674f0f87a3
Merge pull request #6528 from mprieger/5546-cart-page-last-item-deletion
...
Fix users removing last item of confirmed order on /cart page
2021-03-04 17:27:51 +01:00
Pau Pérez Fabregat
982c3d2215
Merge pull request #6965 from andrewpbrett/fix-sca-snail
...
Fix #6964 : don't try to complete a failed payment
2021-03-04 17:26:24 +01:00
Pau Pérez Fabregat
ff239802b6
Merge pull request #6982 from andrewpbrett/canceled-order-payments
...
Fix #5018 : Allow access to payments tab for canceled orders
2021-03-04 17:25:30 +01:00
Matt-Yorkley
3396319f29
Fix test setup in Order spec
2021-03-04 14:27:02 +00:00
Matt-Yorkley
9deadc8ae1
Simplify order.adjustment_total sum
2021-03-04 14:27:02 +00:00
Matt-Yorkley
1afcd70510
Simplify Order#total_tax
2021-03-04 14:27:02 +00:00
Matt-Yorkley
9cf8c84a7d
Add model definition to migration
2021-03-04 14:27:02 +00:00
Matt-Yorkley
ff58e2da54
Use AR syntax in queries
2021-03-04 14:27:02 +00:00
Matt-Yorkley
b1bf2487e2
Update adjustment scope use in Xero Invoices report
2021-03-04 14:27:02 +00:00
Matt-Yorkley
e33950721c
Change misleading method name in Xero Invoices code
2021-03-04 14:27:02 +00:00
Matt-Yorkley
945605e3a8
Rename Shipment #adjustment to #fee_adjustment for clarity
2021-03-04 14:27:02 +00:00
Matt-Yorkley
a5929b489a
Ensure order object has line items in bulk_invoice_service
2021-03-04 14:27:02 +00:00
Matt-Yorkley
eed71d795e
Use persisted shipment in shipping adjustment test
2021-03-04 14:27:02 +00:00
Matt-Yorkley
57b54637e3
Ensure order factory selects shipping rates correctly
2021-03-04 14:27:02 +00:00
Matt-Yorkley
434c9f1c7c
Fix test setup in adjustments_spec
...
The order association is required for these objects to be found
2021-03-04 14:27:02 +00:00
Matt-Yorkley
0e2c1d0317
Refresh shipment rates when changing shipping method cost
...
The test setup here wasn't correctly updating he shipment's shipping_rates, so they were still zero.
2021-03-04 14:27:02 +00:00
Matt-Yorkley
55db911334
Update sales tax report
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f956aca82f
Use shipping fee adjustment as single source of truth, and persist it on the shipment :cost field when it changes.
2021-03-04 14:27:02 +00:00
Matt-Yorkley
bcbea618e8
Fix adjustment spec
...
The tested adjustment isn't found correctly if it isn't associated to the order...
2021-03-04 14:27:02 +00:00
Matt-Yorkley
7fb5bf217f
Update checkout spec adjustment fetching
2021-03-04 14:27:02 +00:00
Matt-Yorkley
aa16c64f20
Update Order#finalize! to include all adjustments
2021-03-04 14:27:02 +00:00
Matt-Yorkley
c0b33de0f0
Move #adjustment_label to shipment
2021-03-04 14:27:02 +00:00
Matt-Yorkley
e67c29872a
Update OrderMailer spec
2021-03-04 14:27:02 +00:00
Matt-Yorkley
86110f2f40
Improve shipment factory
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f0de09da84
Update order correctly in ReturnAuthorizationsController
2021-03-04 14:27:02 +00:00
Matt-Yorkley
833aae23e5
Update admin adjustments controller
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f94f424b63
Update fee fetching in controller tests
2021-03-04 14:27:02 +00:00
Matt-Yorkley
65bcf83552
Migrate shipping fee adjustments to shipments
2021-03-04 14:27:02 +00:00
Matt-Yorkley
c093701adf
Improve UserBalanceCalculator spec test setup
...
Previously we were creating order objects that were not actually complete, and manually setting the `completed_at` field. This meant the order objects being tested were not actually in the correct state, ie: pre-checkout orders that had not been processed properly.
2021-03-04 14:27:02 +00:00
Matt-Yorkley
d4c9d70caa
Update Adjustment specs
2021-03-04 14:27:02 +00:00
Matt-Yorkley
045cdec23c
Update OrderDetailedSerializer
2021-03-04 14:27:02 +00:00
Matt-Yorkley
80aefa8e73
Update OrderTaxAdjustmentsFetcher
2021-03-04 14:27:02 +00:00
Matt-Yorkley
02fb2c6a55
Update CheckoutHelper
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f0aa43e198
Update Order shipment adjustments fetching
2021-03-04 14:27:01 +00:00
Matt-Yorkley
00f116f35f
Update Order::Updater to include shipment adjustments
2021-03-04 14:27:01 +00:00
Matt-Yorkley
1aec324269
Update shipment cost spec
2021-03-04 14:27:01 +00:00
Matt-Yorkley
f5d3e22730
Add shipment_adjustments association to Order
2021-03-04 14:27:01 +00:00
Matt-Yorkley
9ed6ae588f
Update EnterpriseFeeSummary report adjustment scopes
2021-03-04 14:27:01 +00:00
Matt-Yorkley
4c57addb02
Move shipping fee adjustment from the order to the shipment
2021-03-04 14:27:01 +00:00
Matt-Yorkley
551cb9a2d2
Remove Shipment#cost method
...
Cost is now recorded on the shipment record itself
2021-03-04 14:27:01 +00:00
Matt-Yorkley
81cdc2eac1
Bring in Shipment#update_amounts method
2021-03-04 14:27:01 +00:00
Matt-Yorkley
2a0f132b8b
Improve ShippingMethod -> Shipment association
...
5a54a0b6b0
2021-03-04 14:27:01 +00:00
Matt-Yorkley
f33c881503
Set default 0 on spree_shipments cost
2021-03-04 14:27:01 +00:00
Pau Pérez Fabregat
1ad3f38942
Merge pull request #6981 from drummer83/missing-translations
...
Updated translations to close #6666
2021-03-04 15:01:36 +01:00
Pau Pérez Fabregat
d856e006ec
Merge pull request #6989 from andrewpbrett/fix-group-map-icons
...
Update path to +1 map icon
2021-03-04 11:31:17 +01:00
