Matt-Yorkley
12c9914d1b
Delete old Adjustment scopes #with_tax and #without_tax
2021-07-09 21:49:36 +01:00
Luis Ramos
23627c5453
Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied
...
9290 issues fixed
2021-06-17 22:19:26 +01:00
Matt-Yorkley
a1438bdb3d
Update enterprise fee tax adjustment specs
2021-06-06 20:16:03 +01:00
Matt-Yorkley
ff9ad96b74
Update TaxRate specs
2021-06-06 20:16:03 +01:00
Luis Ramos
b2e97fe1d2
Rename order.update! to order.update_order! and adjustment.update! to adjustment.update_adjustment!
2021-05-19 09:54:22 -07:00
Matt-Yorkley
15edb5b13b
Remove more uses of adjustment source association in tests
2021-04-14 12:01:21 +01:00
Matt-Yorkley
96d8de35f2
Delete dead code Adjustment#set_included_tax!
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
d447864b7e
Update test description
2021-03-30 16:39:40 +01:00
Matt-Yorkley
08491d9ad4
Use an instance double in #compute_amount test
2021-03-30 16:39:40 +01:00
Matt-Yorkley
dbe227bd41
Use #change in adjustment spec with changing value
2021-03-30 16:39:40 +01:00
Matt-Yorkley
4b4f29641e
Add test for ReturnAuthorization#compute_amount override
2021-03-30 16:39:40 +01:00
Matt-Yorkley
fcb8145a6c
Bring in changes to Adjustment#update! and CalculatedAdjustments#update_adjustment
2021-03-30 16:39:40 +01:00
Matt-Yorkley
3c1883dac2
Remove use of :source polymorphic association for return adjustments
2021-03-30 16:39:40 +01:00
Maikel Linke
ffb4ba5ef5
Style numeric predicate use with Rubocop
2021-03-25 18:07:11 +11:00
Matt-Yorkley
f2627dff0b
Loosen scope in adjustment spec to include enterprise fees on line items
2021-03-18 13:18:20 +00:00
Matt-Yorkley
064f7582cc
Update line_item included taxes
...
Drops use of the `spree_adjustments.included_tax` database field (when summing line item tax), which we are slowly deprecating before eventual removal
2021-03-17 22:23:04 +00:00
Matt-Yorkley
2d9d293405
Replace deprecated use of :reload argument
2021-03-16 12:04:35 +00:00
Matt-Yorkley
4c64aaed77
Remove callbacks in Adjustment that call order.update!
2021-03-11 11:20:01 +00:00
Matt-Yorkley
791a47d170
Merge pull request #6858 from Matt-Yorkley/adjustments-shipping-cost
...
[Adjustments] Move shipping adjustment from order to shipment
2021-03-11 12:17:14 +01:00
Matt-Yorkley
c99a9f4ee1
Remove Adjustment#set_eligibility
2021-03-08 15:29:04 +00:00
Matt-Yorkley
d4c9d70caa
Update Adjustment specs
2021-03-04 14:27:02 +00:00
Matt-Yorkley
1aec324269
Update shipment cost spec
2021-03-04 14:27:01 +00:00
Matt-Yorkley
0e3429dc35
Merge pull request #6758 from Matt-Yorkley/enterprise-fees-refactor
...
Enterprise fees refactor
2021-02-22 17:59:18 +01:00
Matt-Yorkley
9303d61db1
Update specs
2021-02-19 11:17:58 +00:00
Maikel
173cf9e536
Merge pull request #6565 from Matt-Yorkley/adjustments-inclusive
...
[Adjustments] Improve inclusive/additional tax recording
2021-02-08 09:38:31 +11:00
Matt-Yorkley
9abf6cdcdf
Rename expensive method Order#update_distribution_charge!
...
This method is named "update distribution charge". What this method actually does is delete all of the fee adjustments on an order and all it's line items, then recreate them all from scratch. We call this from lots of different places all the time, and it's incredibly expensive. It even gets called from inside of transactions being run inside callbacks. Renaming it hopefully will add a bit of clarity.
This needs to be a lot more granular!
2021-01-29 21:52:28 +00:00
Matt-Yorkley
ff54426e30
Expand tests on additional and inclusive taxes.
2021-01-23 03:59:32 +00:00
Matt-Yorkley
173e502c98
Rename #included scope to #inclusive
...
This method name (#included) is reserved and used internally by ActiveRecord. After updating Ruby, this has changed from a silent warning to a fatal error.
2021-01-23 03:59:32 +00:00
Matt-Yorkley
8be18cd05c
Add #included and #additional scopes to Spree::Adjustment
...
We can now do things like:
```
included_tax = order.adjustments.tax.included.sum(:amount)
additional_tax = order.adjustments.tax.additional.sum(:amount)
```
2021-01-23 03:59:32 +00:00
Matt-Yorkley
0247386f82
Delete dead code Spree::Order#price_adjustments
...
This method returns the same thing as the Spree::Order#line_items_adjustments scope, but in a slightly less useful format (an array instead of a relation). The method's name is also totally inaccurate, as currently the only adjustments that appear on line items are tax adjustments for inclusive tax rates, which by definition have no effect on the price whatsoever...
2021-01-23 00:05:56 +00:00
Andy Brett
51ee21e294
Merge pull request #6556 from Matt-Yorkley/adjustments-eligible
...
[Adjustments] Delete dead code #eligible_for_originator?
2021-01-01 20:48:27 -08:00
Matt-Yorkley
70f7d76723
Delete dead code #eligible_for_originator?
...
This check is used only by Spree::Promotion objects, which are not used in OFN. There are no objects which can be originators of an adjustment that respond to #eligible? in this way, so the method always returns true.
2020-12-23 08:29:12 +00:00
Luis Ramos
2b8f0abe49
Try some mass auto-correct adding frozen-string-literal to all specs
2020-12-03 06:38:24 -08:00
Luis Ramos
8867ec977c
Bring missing factory from spree_core and use ofn's calculator
2020-09-05 16:38:37 +01:00
Luis Ramos
4931edc67c
Remove code related to promotions, we dont have promotions in OFN
2020-09-05 16:38:37 +01:00
Luis Ramos
e96428e7e2
Transpec adjustment_spec
2020-09-05 16:38:36 +01:00
Luis Ramos
b629a4f912
Make new specs pass
2020-09-05 16:38:36 +01:00
Luis Ramos
ff0aa377a1
Run rubocop autocorrect
2020-09-05 16:38:36 +01:00
Luis Ramos
aa46a4b5da
Bring models related to taxes and adjustments from spree_core
2020-09-05 16:38:36 +01:00
Luis Ramos
f62546254f
Define DefaultTax calculator outside of spree namespace the tax_rate to be used by the app and make spree specs use calculators outside the spree namespace
2020-07-07 17:26:24 +01:00
Luis Ramos
f848a89a00
Rename update_attributes to update #rails4
2020-06-22 16:51:43 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
luisramos0
04801e5c2e
Run transpec in spec/models
2019-05-09 22:25:29 +01:00
Pau Perez
caf4441fa3
Do not mutate config's state in specs
2019-02-14 17:01:43 +01:00
Pau Perez
e9173f440f
Associate shipment to appropriate order in specs
2019-02-14 17:01:43 +01:00
luisramos0
9ab99f13c4
Merge branch 'master' into 2-0-stable-jan-11th
2019-01-11 11:58:24 +00:00
Maikel Linke
a341561446
Move tax rate finding into service and spec it
...
The `#tax_rates` method is actually not present in Spree. We encapsulate
the logic in this commit and enable better unit testing. The new tests
cover a current bug: https://github.com/openfoodfoundation/openfoodnetwork/issues/3127
2018-12-19 14:31:29 +11:00
Luis Ramos
3e4f92fe92
Merge branch '2-0-stable' into 2-0-adjust-basic-spec-fix
2018-10-16 17:33:33 +01:00
luisramos0
a5522b90f6
Fix Shipment adjustments specs on adjustment_spec by setting Config values before test objects are created
2018-10-12 23:09:35 +01:00
