Matt-Yorkley
2e20078c05
Delete dead code Order#billing_firstname and Order#billing_lastname
...
🔥
2021-03-18 15:54:40 +00:00
Matt-Yorkley
49f1e44999
Simplify Order#total_tax to cover all taxes from all sources
2021-03-18 14:05:29 +00:00
Matt-Yorkley
4ee0271756
Loosen scope in order enterprise fees tax total method
2021-03-18 13:18:20 +00:00
Matt-Yorkley
f67a8e4af3
Update and simplify LineItem#price_with_adjustments
2021-03-18 13:18:20 +00:00
Matt-Yorkley
8d4733b3d5
Update EnterpriseFee#clear_all_adjustments
2021-03-18 13:18:20 +00:00
Matt-Yorkley
bb46df61d4
Simplify Order#total_tax
...
We get the same value here, but without the three additional database hits to adjustments (both of these values are already present on the order object itself).
2021-03-18 13:16:19 +00:00
Matt-Yorkley
c07a4e6c55
Remove "included_tax" hack from TaxRate
...
Yay! 🎉
The values of tax amounts stored in adjustments on the order no longer require use of the (deprecated) included_tax field.
2021-03-18 13:16:19 +00:00
Matt-Yorkley
be3e184651
Merge pull request #6973 from Matt-Yorkley/adjustments-line-item-taxes
...
[Adjustments] Update line item taxes
2021-03-18 11:50:01 +01:00
Matt-Yorkley
3ed8dbe3b3
Merge pull request #7146 from Matt-Yorkley/deprecations
...
Deprecations
2021-03-18 11:25:14 +01:00
Matt-Yorkley
751b9349e8
Merge pull request #7015 from andrewpbrett/shopfront-producers
...
Only show primary producers on shopfront list of producers (fix #4218 )
2021-03-17 23:30:42 +01: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
Andy Brett
70b7143e7b
reload line items and recalculate fees after removing line item
2021-03-17 12:06:05 -07:00
Matt-Yorkley
8503e3c5f3
Merge pull request #7023 from Matt-Yorkley/ineligible-efficiency
...
Reduce unnecessary updates in Payment#revoke_adjustment_eligibility
2021-03-17 18:55:01 +01:00
Andy Brett
9d33b36799
Merge pull request #7024 from Matt-Yorkley/dead-code-auto-capture
...
DCOTW: Spree::Config[:auto_capture]
2021-03-17 09:31:00 -07:00
Luis Ramos
333a488dc8
Fix deprecation warning
2021-03-17 16:23:53 +00:00
Matt-Yorkley
39b1ae0ee8
Fix validation conditional in Spree::Product
2021-03-17 15:22:22 +00:00
Luis Ramos
da6a7da99d
Remove sanitize
...
This was added here for no specific reason I think, it's just an id, I dont think we need this 1d83809866
2021-03-17 15:22:22 +00:00
Matt-Yorkley
4505fa7fd9
Fix warning on Product variants_including_master scope
2021-03-17 15:22:22 +00:00
Matt-Yorkley
55b0751c1a
Use strings for class names on associations
2021-03-17 15:15:57 +00:00
Pau Pérez Fabregat
51f63060a4
Merge pull request #6879 from coopdevs/customer-balance-bulk-coop-report
...
Customer balance bulk coop report
2021-03-17 12:08:44 +01:00
Matt-Yorkley
2d9d293405
Replace deprecated use of :reload argument
2021-03-16 12:04:35 +00:00
Pau Pérez Fabregat
71aec23c0d
Merge pull request #7064 from coopdevs/abstract-order-balance
...
Abstract order balance in a simple PORO
2021-03-15 11:35:45 +01:00
Matt-Yorkley
6bb85e9acd
Fix payment and shipment states issue
...
For some reason the order objects were stale here when calling order.update! from either a payment or shipment callback, which was overwriting those states as nil on the order.
2021-03-11 12:23:00 +00:00
Matt-Yorkley
4ff56ce625
Update deprecated use of #uniq in OrderCyle scopes
2021-03-11 12:19:55 +00:00
Matt-Yorkley
90712647b1
Update totals when processing a return
2021-03-11 11:20:01 +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
Pau Pérez Fabregat
e341b04487
Merge pull request #6902 from openfoodfoundation/setup-postgres-gh-actions
...
Setup Github Actions as CI
2021-03-10 16:59:59 +01:00
Pau Perez
42d0f16773
Abstract order balance in a simple PORO
...
This new class lets us [Branch by
abstraction](https://www.martinfowler.com/bliki/BranchByAbstraction.html )
by encapsulating an order's balance. As a result, that's the only place
where we need to check the feature toggle, instead of every place where
`#outstanding_balance` is called (quite some). That would be very hard
to review and it'd be more likely to introduce bugs.
What I like about this is that we also managed to group together the
data and logic that we had spread in a few places and have it nicely
encapsulated. So, where we had a number, we'll now have an object.
Once we fully change all `#outstanding_balance` consumers to use this
new abstraction we'll be able to remove the methods this class replaces.
These are: `Spree::Order#outstanding_balance?`,
`Spree::Order#display_oustanding_balance` and
`OrderHelper.outstanding_balance_label`.
This is just the first step. I'll follow this up with a PR per
page/mailer/whatever where we use the balance to replace it with an
instance of `OrderBalance`. That is, splitting up what I explored in
https://github.com/openfoodfoundation/openfoodnetwork/pull/6959 but in
very small and manageable pieces.
2021-03-10 16:09:09 +01:00
Maikel Linke
ba9de403e6
Add admin option to require shoppers agree to TOS
...
This switch doesn't have any effect yet. We need to implement it in the
checkout.
2021-03-10 17:09:26 +11:00
Andy Brett
05a074d33a
Merge pull request #7041 from Matt-Yorkley/adjustments-set-eligibility
...
[Adjustments] Remove Adjustment#set_eligibility
2021-03-09 13:33:21 -08:00
Andy Brett
bc7469c7aa
fix order test
2021-03-09 16:22:46 +01:00
Pau Pérez Fabregat
6b111561e8
Merge pull request #7000 from Matt-Yorkley/dead-code-tax-total
...
DCOTW: Order#tax_total
2021-03-08 16:57:59 +01:00
Matt-Yorkley
c99a9f4ee1
Remove Adjustment#set_eligibility
2021-03-08 15:29:04 +00:00
Pau Pérez Fabregat
876c378e4f
Merge pull request #7028 from Matt-Yorkley/dead-code-available-shipment
...
DCOTW: Order#has_available_shipment
2021-03-08 15:25:39 +01:00
Matt-Yorkley
af29c67ea5
Update Order#ship_total
2021-03-06 14:14:56 +00:00
Matt-Yorkley
f894473e03
Delete dead code: Order#item_count
2021-03-06 00:04:46 +00:00
Matt-Yorkley
68e752ef32
Delete dead code: Order#has_available_shipment
2021-03-05 23:42:08 +00:00
Matt-Yorkley
365700615a
Remove dead code: Spree::Config.auto_capture
...
We set this value to `true` unconditionally in an initializer, and then check the value in various places via Spree::Config. It's never false, and it's not configurable, so we can just drop it and remove the related conditionals. 🔥
2021-03-05 16:03:07 +00:00
Matt-Yorkley
a670771037
Reduce duplicate updates in Payment#revoke_adjustment_eligibility
...
This was triggering two separate updates, and each of those updates could trigger callbacks, and those could trigger other callbacks. Here we're doing the same thing, but with one update.
2021-03-05 15:12:41 +00:00
Andy Brett
a431c03eb1
only show primary producers on shopfront list of producers
2021-03-04 14:32:55 -08:00
Matt-Yorkley
1afcd70510
Simplify Order#total_tax
2021-03-04 14:27:02 +00:00
Matt-Yorkley
945605e3a8
Rename Shipment #adjustment to #fee_adjustment for clarity
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f956aca82f
Use shipping fee adjustment as single source of truth, and persist it on the shipment :cost field when it changes.
2021-03-04 14:27:02 +00:00
Matt-Yorkley
aa16c64f20
Update Order#finalize! to include all adjustments
2021-03-04 14:27:02 +00:00
Matt-Yorkley
c0b33de0f0
Move #adjustment_label to shipment
2021-03-04 14:27:02 +00:00
Matt-Yorkley
f0aa43e198
Update Order shipment adjustments fetching
2021-03-04 14:27:01 +00:00
Matt-Yorkley
f5d3e22730
Add shipment_adjustments association to Order
2021-03-04 14:27:01 +00:00
Matt-Yorkley
4c57addb02
Move shipping fee adjustment from the order to the shipment
2021-03-04 14:27:01 +00:00
Matt-Yorkley
551cb9a2d2
Remove Shipment#cost method
...
Cost is now recorded on the shipment record itself
2021-03-04 14:27:01 +00:00
