Andy Brett
2128675e95
Merge pull request #7236 from Matt-Yorkley/exchange-deadlocks
...
Update Exchange touch on Enterprise to use #touch_later
2021-04-07 20:54:03 -07:00
Maikel
b83340ac45
Merge pull request #7287 from mkllnk/7166-cancelled-stock
...
Disallow changes of canceled order
2021-04-08 11:28:35 +10:00
Maikel Linke
42543bfaf7
Add flash when order cannot be changed
2021-04-08 09:24:39 +10:00
Maikel Linke
cf22a864f3
Fix typo in spec description
2021-04-08 09:24:39 +10:00
Maikel Linke
bfa5d443f1
Don't change canceled orders
...
We have a PR already that removes the UI for this when the order is
canceled. Implementing it on controller-side makes sure that it doesn't
happen accidentally if the user has multiple tabs open.
2021-04-08 09:24:39 +10:00
Maikel Linke
f0d5bf0ab5
Disallow changes of canceled order
2021-04-08 09:24:39 +10:00
Maikel Linke
f2a2cbd3f9
Spec stock bug when changing canceled orders
...
We decided to disallow changing canceled orders in a way that would
affect stock or totals.
2021-04-08 09:24:39 +10:00
Maikel Linke
8079fb0315
Add specs for stock changes
2021-04-08 09:24:39 +10:00
Maikel Linke
e1d22aec83
Prepare for more shipment specs with different context
...
This commit is best viewed ignoring whitespaces.
2021-04-08 09:24:39 +10:00
Maikel Linke
c5e72f8563
Test shipment changes more precisely
2021-04-08 09:24:39 +10:00
Maikel Linke
65b37b249d
Prepare spec code for re-use
2021-04-08 09:24:39 +10:00
Maikel Linke
d571bc731b
Style spec with rubocop -a
2021-04-08 09:24:39 +10:00
Matt-Yorkley
52c7abf1c0
Merge pull request #7334 from Matt-Yorkley/payment-reports-error
...
Fix outstanding balance sum in payment report
2021-04-07 13:47:45 +02:00
Matt-Yorkley
05b8b8e9db
Fix outstanding balance sum in payment report
2021-04-07 10:56:20 +01:00
Matt-Yorkley
1ce3103aa7
Merge pull request #6924 from Matt-Yorkley/adjustments-shipping-tax
...
[Adjustments] Shipping tax
2021-04-07 00:21:12 +02:00
Matt-Yorkley
4a65e5817f
Add fieldset title to shipping methods edit form
2021-04-06 20:30:07 +01:00
Matt-Yorkley
01e6397e27
Remove Spree::Config[:shipment_inc_vat]
...
This is now done per ShippingMethod instead of globally
2021-04-06 20:29:58 +01:00
Andy Brett
2c17d12f6e
Merge pull request #7303 from drummer83/independent-update-cart-label
...
Independent 'update cart' label
2021-04-06 10:59:06 -07:00
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
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
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
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
