Andy Brett
2aeed30775
Merge pull request #7265 from andrewpbrett/freeze-adjustments
...
Don't allow edits to adjustments for canceled orders
2021-04-06 10:56:27 -07:00
Matt-Yorkley
61b41491fe
Remove included_tax scope from Adjustment
...
This scope is no longer used, and it's name is exactly the same as other method names and database columns on multiple objects, which is quite confusing.
2021-04-06 12:42:14 +01:00
Matt-Yorkley
5c0a968c27
Remove wkhtmltopdf-binary version pin and bump gem
...
Previously we were tied to a lower version that maintained compatibility with Ubuntu 14 (which we used in Semaphore). We can drop this version pin now and upgrade it. PDF tests should now pass locally if using Ubuntu 20 🎉
2021-04-05 16:16:25 +01:00
Andy Brett
271cc26066
Merge pull request #7319 from openfoodfoundation/dependabot/bundler/rubocop-1.12.1
...
Bump rubocop from 1.12.0 to 1.12.1
2021-04-05 08:14:35 -07:00
Transifex-Openfoodnetwork
3a45d2781a
Updating translations for config/locales/de_DE.yml
2021-04-06 01:10:34 +10:00
Matt-Yorkley
4a18ba256d
Add test for paypal controller redirect
2021-04-05 14:00:07 +01:00
Matt-Yorkley
03c36dfd7f
Remove Bugherd
...
🔥
2021-04-05 13:31:13 +01:00
Transifex-Openfoodnetwork
96f5adf0be
Updating translations for config/locales/en_GB.yml
2021-04-05 22:06:23 +10:00
dependabot[bot]
1320a12a16
Bump rubocop from 1.12.0 to 1.12.1
...
Bumps [rubocop](https://github.com/rubocop/rubocop ) from 1.12.0 to 1.12.1.
- [Release notes](https://github.com/rubocop/rubocop/releases )
- [Changelog](https://github.com/rubocop/rubocop/blob/master/CHANGELOG.md )
- [Commits](https://github.com/rubocop/rubocop/compare/v1.12.0...v1.12.1 )
Signed-off-by: dependabot[bot] <support@github.com >
2021-04-05 05:50:26 +00:00
Andy Brett
c30ced2060
put Time.zone back
2021-04-04 12:27:46 -07:00
Transifex-Openfoodnetwork
788601ea02
Updating translations for config/locales/en_CA.yml
2021-04-05 04:54:25 +10:00
Matt-Yorkley
c702b398d6
Add warning comment on migration test isolation
2021-04-04 19:19:06 +01:00
Matt-Yorkley
3092397346
Isolate migration tests
2021-04-04 19:19:06 +01:00
Matt-Yorkley
a2f6ff7b39
Update deprecated params in checkout spec
2021-04-04 19:19:06 +01:00
Matt-Yorkley
76cf239623
Sort ids in test in case ordering is reversed
2021-04-04 19:19:06 +01:00
Matt-Yorkley
ea3044f47a
Bring in more explicit model code now that good_migrations disables all access to models
2021-04-04 19:19:06 +01:00
Matt-Yorkley
595389cbea
Update stripe spec
...
The hard-coded order total here was incorrect. It's now correctly including the $3 shipping fee used with that order factory, and the total is actually $13.
2021-04-04 19:19:06 +01:00
Matt-Yorkley
d00bdbe1b8
Add index on spree_shipping_methods.tax_category_id
2021-04-04 19:19:06 +01:00
Matt-Yorkley
4fbbbbca76
Load relevant tax rates in a single query outside of find_each block
2021-04-04 19:19:06 +01:00
Matt-Yorkley
e442187672
Delete unused private method OrderTaxAdjustmentsFetcher#table
2021-04-04 19:19:06 +01:00
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
