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
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
luisramos0
5693f44f5e
Fix shipping adjustment basic test in adjustment_spec by removing extra shipping_method from test shipment
2018-10-12 23:09:35 +01:00
luisramos0
39d232daaf
Fix Enterprise Fee tax category inheritance spec by ensuring the line item is assigned to the order when the order is created. That way the tax category from product is correctly copied to the line item
2018-10-09 19:50:35 +01:00
luisramos0
fbd2d96b05
Moved shipment and shipping_method factories with flat rate and shipping fees to traits
2018-09-17 00:51:01 +01:00
luisramos0
2f1616a286
Changed reference from order.shipping_method to order.shipments in adjustment_spec
2018-09-09 23:32:59 +01:00
luisramos0
5bcc49a61c
Removed calls to the now inexistent order.create_shipment! from specs
2018-09-09 23:16:19 +01:00
Pierre de Lacroix
f67a8c1f2d
Add tests
2017-12-01 13:37:24 +11:00
Pierre de Lacroix
a6ed4a2c6a
fix bad return value
...
in method Spree::Adjustment#find_closest_tax_rates_from_included_tax
2017-05-24 14:37:54 +10:00
Pierre de Lacroix
e854eb0426
add tests
...
for methods Spree::Order#tax_adjustment_totals
and Spree::Adjustment#find_closest_tax_rate_from_included_tax
2017-04-27 17:32:36 +10:00
Rob Harrington
59745fbc73
EnterpriseFees can inherit tax_category from product
2016-03-02 11:56:46 +11:00
Rob Harrington
137003c671
Correct calculation of tax on EnterpriseFees with TaxRates where included_in_price=false
2016-03-02 11:56:46 +11:00
Rohan Mitchell
92f7b72056
Check whether an individual adjustment has tax included
2015-10-15 09:58:06 +11:00
Rohan Mitchell
0dcd8eb8cc
Find adjustments with and without tax
2015-05-15 12:35:19 +10:00
Rohan Mitchell
9e8483348f
Fix spec - enterprise needs to charge sales tax for tax to be charged
2015-04-17 13:41:38 +10:00
Rohan Mitchell
81324f3cc4
Do not charge tax on shipments when distributor does not charge sales tax
2015-04-17 13:41:38 +10:00
Rohan Mitchell
40b4edeca1
Replace zoned_order factory with zone_with_member. In practice, former had issues with circular dependencies.
2015-03-25 16:27:29 +11:00
Rohan Mitchell
69dc92dec1
Create factories zoned_order and taxed_product
2015-03-25 16:27:29 +11:00
Rohan Mitchell
8d3f25bb39
Fix intermittent 500 error when updating the cart
2015-03-13 17:50:01 +11:00
Rohan Mitchell
381bfd383b
Allow enterprise fee with no tax category
2015-03-06 12:12:33 +11:00
Rohan Mitchell
1e18f773f5
Switch context -> describe, clarify test grammar
2015-03-06 11:15:07 +11:00
Rohan Mitchell
41792395aa
Record the tax included in per-item EnterpriseFees
2015-03-06 11:13:47 +11:00
Rohan Mitchell
98ff895f5f
Record the tax included in per-order EnterpriseFees
2015-03-06 10:38:55 +11:00
Rohan Mitchell
b5ce056d06
Fix tax calculations for determining tax included in an amount
2015-03-05 13:03:53 +11:00
Rohan Mitchell
dfb855bd14
Record the tax included in shipping.
2015-03-05 10:44:27 +11:00
Rohan Mitchell
9395f6c808
Record the tax included in adjustments. TaxRate adjustments consist of 100% tax.
2015-03-05 10:44:26 +11:00
Rohan Mitchell
8654f23a19
Move spree model decorator specs into their own dir to mirror model dir layout
2013-10-17 09:53:54 +11:00
