Matt-Yorkley
821be3eef5
Update combined queries to use #or
2021-04-04 19:19:06 +01:00
Matt-Yorkley
96d8de35f2
Delete dead code Adjustment#set_included_tax!
2021-04-04 19:19:06 +01:00
Matt-Yorkley
fcdc627ce3
Add fallbacks in migration for migrating locally with RAILS_ENV=test
...
Instances have these preference values set, but when running this migration locally with RAILS_ENV=test, the preference does not exist in the database.
2021-04-04 19:19:06 +01:00
Matt-Yorkley
fec2b0b7c1
Define models in migration
2021-04-04 19:19:06 +01:00
Matt-Yorkley
903788903b
Remove Spree::Config[:shipping_tax_rate]
2021-04-04 19:19:06 +01:00
Matt-Yorkley
a26880a3a1
Update shipment tax fetching in Xero Invoices report
2021-04-04 19:19:06 +01:00
Matt-Yorkley
3c602cad97
Add unit tests for migration
2021-04-04 19:19:06 +01:00
Matt-Yorkley
eb3c2da740
Migrate shipping taxes to adjustments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
63483818d7
Remove dead code
...
This spec is doing nothing...
2021-04-04 19:19:06 +01:00
Matt-Yorkley
56a01194cd
Update shipping tax adjustments specs
2021-04-04 19:19:06 +01:00
Matt-Yorkley
e81270d0d7
Fix adjustment test setups missing order associations
...
All adjustments must be associated with an order
2021-04-04 19:19:06 +01:00
Matt-Yorkley
bbd4a33a87
Tax adjustments should be open when created
...
All adjustments get closed during `order.finalize!`, but before that point they should be open.
2021-04-04 19:19:06 +01:00
Matt-Yorkley
6d48471368
Update shipment totals updating
2021-04-04 19:19:06 +01:00
Matt-Yorkley
ac67f7391e
Update tax charging in checkout flow
2021-04-04 19:19:06 +01:00
Matt-Yorkley
2ab9602ad7
Increase tested details in Order spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
d635d70add
Update Order::Updater adjustment handling
2021-04-04 19:19:06 +01:00
Matt-Yorkley
93771aeb94
Update orders spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
2f19428b40
Update orders controller
2021-04-04 19:19:06 +01:00
Matt-Yorkley
1f897b1e44
Update sales tax report spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
1d1b842e08
Delete dead code
2021-04-04 19:19:06 +01:00
Matt-Yorkley
889b357408
Update Order#total_tax
2021-04-04 19:19:06 +01:00
Matt-Yorkley
2af0afafe9
Update Order#shipping_tax
2021-04-04 19:19:06 +01:00
Matt-Yorkley
ead85e71de
Update shipping tax in checkout spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
a8366a3a72
Update Order::Updater totals counts
2021-04-04 19:19:06 +01:00
Matt-Yorkley
a060b9fe5a
Update LineItemsController and order factory
2021-04-04 19:19:06 +01:00
Matt-Yorkley
8b0a9ddb2f
Update OrderTaxAdjustmentsFetcher
2021-04-04 19:19:06 +01:00
Matt-Yorkley
7d3288ca53
Remove #to_package calls on shipment calculations
2021-04-04 19:19:06 +01:00
Matt-Yorkley
db07a73bd7
Ensure Adjustment#update! returns an amount
2021-04-04 19:19:06 +01:00
Matt-Yorkley
232286b0be
Add adjustment_total to spree_shipments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
7e0aad7c7e
Adapt current tax setup to work with shipment taxes
...
This is a temporary step...
2021-04-04 19:19:06 +01:00
Matt-Yorkley
7425ad5c4a
Include ItemAdjustments handling in Adjustment class
...
Currently only applies to shipments, but will later include line items, etc
2021-04-04 19:19:06 +01:00
Matt-Yorkley
0d5d4aca11
Update tax_rate_factory
...
The amount is a decimal, so `0.1` here is actually a 10% tax rate. `100` is ridiculous (10000% tax).
Also, the factory fails without a calculator, and it should explicitly be a DefaultTax calculator or it will not be correct.
2021-04-04 19:19:06 +01:00
Matt-Yorkley
0fea92b63d
Add :default_tax_calculator factory
2021-04-04 19:19:06 +01:00
Matt-Yorkley
25a739ea75
Remove Shipment #update_adjustment_included_tax
2021-04-04 19:19:06 +01:00
Matt-Yorkley
385b12d83b
Add tax total fields to spree_shipments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
9bbe57afda
Extract method
2021-04-04 19:19:06 +01:00
Matt-Yorkley
89889bc280
Record tax totals in ItemAdjustments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
605a94e3c9
Use Spree::ItemAdjustments in Shipment callbacks for updating adjustments
2021-04-04 19:19:06 +01:00
Matt-Yorkley
ac9ecdfcbc
Introduce Spree::ItemAdjustments class
2021-04-04 19:19:06 +01:00
Matt-Yorkley
45f0082321
Add tax_category_id to shipping method permitted params
2021-04-04 19:19:06 +01:00
Matt-Yorkley
431706b704
Add tax_category_id to spree_shipping_methods
2021-04-04 19:19:06 +01:00
Matt-Yorkley
8fccdbf92f
Introduce TaxCategories to ShippingMethods
2021-04-04 19:19:06 +01:00
Andy Brett
2ee15838d9
Merge pull request #7213 from Matt-Yorkley/optional-bullet
...
Make bullet activation optional
2021-04-03 13:48:21 -07:00
Andy Brett
b5846592b1
Merge pull request #7260 from jibees/7069-add-automated-tests-for-unit-price-in-backoffice
...
Add automated tests for unit price in backoffice
2021-04-03 13:43:32 -07:00
Matt-Yorkley
cb0644ce47
Merge pull request #7312 from openfoodfoundation/transifex
...
Transifex
2021-04-03 17:32:13 +02:00
Transifex-Openfoodnetwork
9b2255cb20
Updating translations for config/locales/en_US.yml
2021-04-03 14:03:44 +11:00
Transifex-Openfoodnetwork
1159c425b9
Updating translations for config/locales/en_US.yml
2021-04-03 14:03:09 +11:00
filipefurtad0
a01493725d
Merge pull request #7309 from openfoodfoundation/filipefurtad0-add-QA-info
...
Update README.md
2021-04-02 16:00:16 +01:00
Transifex-Openfoodnetwork
d7787261ed
Updating translations for config/locales/en_IE.yml
2021-04-03 01:54:41 +11:00
filipefurtad0
857611d232
Update README.md
...
Adding a line about our new QAs board.
2021-04-02 15:23:15 +01:00