Matt-Yorkley
cb039fd880
Delete dead code Adjustment#display_included_tax
2021-07-09 21:49:36 +01:00
Matt-Yorkley
12c9914d1b
Delete old Adjustment scopes #with_tax and #without_tax
2021-07-09 21:49:36 +01:00
Matt-Yorkley
c60554a14a
Update display of associated tax amounts
2021-07-09 21:49:35 +01:00
Matt-Yorkley
ad1b9f3f2f
Update Adjustment#has_tax?
2021-07-09 21:49:35 +01:00
Matt-Yorkley
c16e008ba1
Delete dead code Adjustment#set_absolute_included_tax!
2021-07-09 21:49:35 +01:00
Matt-Yorkley
9e1d8ab369
Introduce legacy tax handing in Order::Updater whenever order totals change
...
This will remove legacy tax adjustments, recalculate any relevant taxes for items in the order and re-apply them in non-legacy tax adjustments
2021-06-06 20:20:41 +01:00
Matt-Yorkley
2de442f44d
Move taxing of enterprise fees to TaxRate
2021-06-06 20:16:03 +01:00
Luis Ramos
341f6c9f62
Now that adjustment.update! has been renamed to adjustment.update_adjustment! we can use AR's update! on adjustment
2021-05-19 09:54:25 -07: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
Pau Pérez Fabregat
c1da97527a
Merge pull request #7420 from Matt-Yorkley/adjustments-controller
...
Adjustments controller index
2021-04-22 19:15:28 +02:00
Matt-Yorkley
50da77c6db
Hide tax rate selection when editing non-admin adjustments
2021-04-15 13:59:05 +01:00
Maikel Linke
1364b878fe
Add ApplicationRecord for customisations
...
Rails 5 introduced this new class to confine application-specific monkey
patches to our models only, and not leak into other libraries using
ActiveRecord::Base.
https://bigbinary.com/blog/application-record-in-rails-5
2021-04-15 15:59:03 +10:00
Matt-Yorkley
b6038c01a3
Remove references to Adjustment source
2021-04-14 12:01:21 +01:00
Matt-Yorkley
6474323282
Remove source association from Spree::Adjustment
2021-04-14 12:01:21 +01:00
Pau Pérez Fabregat
0900bcadb2
Merge pull request #7330 from Matt-Yorkley/adjustments-deleted-originator
...
Update unscoping of deleted_at on Adjustment originator association
2021-04-09 09:15:46 +02:00
Pau Pérez Fabregat
0e2855ea60
Merge pull request #7328 from Matt-Yorkley/dead-scope
...
Remove included_tax scope from Adjustment
2021-04-09 09:03:47 +02:00
Matt-Yorkley
2ed1aaf575
Update unscoping of deleted_at on originator association
2021-04-07 00:26:01 +01: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
96d8de35f2
Delete dead code Adjustment#set_included_tax!
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
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
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
Matt-Yorkley
4c64aaed77
Remove callbacks in Adjustment that call order.update!
2021-03-11 11:20:01 +00:00
Matt-Yorkley
c99a9f4ee1
Remove Adjustment#set_eligibility
2021-03-08 15:29:04 +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
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
0e82160b76
Touch the updated_at column when updating records via #update_column
...
#update_column(s) skips callbacks (which is useful), but it doesn't change the updated_at field on the record by default (which we should be doing in these cases).
This change is made in Spree 2.2 here: b367c629ce
2021-01-30 12:49:38 +00:00
Matt-Yorkley
58c7c90624
Refactor methods for updating closed adjustments
2021-01-29 21:53:11 +00:00
Matt-Yorkley
4d4c055577
Loosen Spree::Adjustment#tax scope to include any tax adjustments
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
6a9505cf67
Ensure adjustments can access soft-deleted originators
...
Note: originator is generally an EnterpriseFee or a TaxRate
2021-01-19 16:46:14 +00:00
Matt-Yorkley
ca4de40fa2
Associate all adjustments with an order
...
This change is introduced in the adjustments updates from Spree 2.2 and used heavily in new scopes and methods (not included here).
2021-01-11 17:35:35 +00: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
6e8fe080cb
Fix easy rubocop issues
2020-09-05 18:39:56 +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
51ed9a6b78
Fix comment and point out that it's a fix to a spree issue
2020-09-05 16:38:36 +01:00
Luis Ramos
967380c542
Fix easy rubocop issues
2020-09-05 16:38:36 +01:00
Luis Ramos
ff0aa377a1
Run rubocop autocorrect
2020-09-05 16:38:36 +01:00
Luis Ramos
da683e3ecf
Merge decorators with original code from spree_core
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
