raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-29 21:17:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
18,863 Commits 20 Branches 451 Tags
32761baa68422dcda20b7658ef9c8c4459c1bc50
Commit Graph

2568 Commits

Author SHA1 Message Date
Matt-Yorkley
dcbe9c4011 Merge pull request #6756 from andrewpbrett/fix-sca-regression 
Fix SCA regression
 2021-01-28 19:45:08 +01:00
Maikel
8a757812e7 Merge pull request #6735 from coopdevs/enable-mail-delivery-always 
Enable mail delivery always
 2021-01-28 09:31:12 +11:00
Matt-Yorkley
f49355e5d3 Merge pull request #6724 from Matt-Yorkley/remove-price-adjustments 
Delete dead code Spree::Order#price_adjustments
 2021-01-27 23:29:38 +01:00
Pau Pérez Fabregat
c3897dd3df Merge pull request #6643 from coopdevs/customer-balance-frontoffice 
Customer balance frontoffice
 2021-01-27 19:55:56 +01:00
Andy Brett
e6e20309aa Revert "don't try to process a payment if it's pending auth" 
This reverts commit bba9e55006.
 2021-01-27 08:06:20 -08:00
Pau Perez
4a5869b60c Remove ability to toggle mail delivery 
OFN requires mails to work so there's no point in having this
conditional with the maintenance cost it entails.
 2021-01-25 13:27:44 +01: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
84689c43be Merge pull request #6534 from andrewpbrett/sca-emails 
Send email when SCA authorization is required for admin payment
 2021-01-21 13:53:35 -08:00
Andy Brett
0e7f4b2f14 Merge pull request #6537 from mkllnk/simplify-mail-config 
Simplify mail config
 2021-01-21 10:59:43 -08:00
Andy Brett
3ef4a74b84 Merge pull request #6655 from Matt-Yorkley/summing-amounts 
Improve performance on summing adjustments and payment
 2021-01-21 10:58:10 -08:00
Matt-Yorkley
d8b795ebee Merge pull request #6679 from Matt-Yorkley/soft-delete-enterprise-fees 
Soft-delete Enterprise Fees
 2021-01-21 19:57:29 +01:00
Andy Brett
bba9e55006 don't try to process a payment if it's pending auth 2021-01-21 09:18:29 -08:00
Andy Brett
affc82b2b5 update payment jobs delivery methods 2021-01-21 09:18:29 -08:00
Andy Brett
84b5fcf2ce add resend-authorization-email button to admin screen 2021-01-21 09:17:07 -08:00
Andy Brett
5c0408c68c pass paymentIntent ID to capture 2021-01-21 08:48:38 -08:00
Andy Brett
8507dacc10 pass return_url option to gateway authorize 2021-01-21 08:48:33 -08:00
Andy Brett
e31d566f7f Merge pull request #6283 from luisramos0/sets 
Move sets out of app/models to app/services/sets
 2021-01-20 19:22:15 -08:00
Andy Brett
1d4fa2983c Merge pull request #6466 from Matt-Yorkley/package-optimisation 
Optimise Shipment#to_package
 2021-01-20 19:20:56 -08:00
Pau Perez
cc9e3fe69b Replace double negation with proper list of states 
We rely now on the exhaustive list of states an order can be in after
checkout. What made this all a bit more messy is that I made up the
"checkout" order state, likely mixing it from the payment model states.

This simplifies things quite a bit and gives meaningful names to things.
 2021-01-20 18:34:31 +01:00
Pau Perez
20abaaa950 Reuse outstanding balance statement across queries 
Instead of relying on Spree::Order#outstanding_balance we make us of the
result set `balance_value` computed column. So, we ask PostgreSQL to
compute it instead of Ruby and then serialize it from that computed
column. That's a bit faster to compute that way and let's reuse logic.

We hide this new implementation under this features' toggle so it's only
used when enabled. We want hit the old behaviour by default.
 2021-01-20 18:23:22 +01:00
Pau Perez
681a009eb6 Extract outstanding balance SQL CASE/WHEN 2021-01-20 18:23:22 +01: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
c4a8a38c8d Soft-delete enterprise fees 
These objects can hold critical information related to adjustments and tax categories. If they are hard-deleted we lose vital data that's needed by associated records.
 2021-01-19 16:46:14 +00:00
Maikel
334e270a11 Merge pull request #6552 from Matt-Yorkley/adjustments-order-association 
[Adjustments] Associate all adjustments with an order
 2021-01-19 08:43:13 +11:00
Matt-Yorkley
5593da2928 Delete dead code #update_hooks 
These hooks allow Spree core to be modified by other gems and apps without changing Spree code. We don't use it. #YAGNI
 2021-01-15 16:49:45 +00:00
Pau Pérez Fabregat
f240402c43 Merge pull request #6654 from Matt-Yorkley/update-without-callbacks 
Remove #update_attributes_without_callbacks
 2021-01-15 12:24:42 +01:00
Andy Brett
7ca81f45d0 Merge pull request #6641 from Matt-Yorkley/shipping-method-soft-deletion 
Ensure ShippingMethod is correctly using soft-deletion
 2021-01-14 11:53:19 -08:00
Pau Pérez Fabregat
929ae82e00 Merge pull request #6574 from Matt-Yorkley/bye-bye-spree-paypal 
Bye Bye Spree Paypal
 2021-01-14 18:16:44 +01:00
Luis Ramos
8e65d29b02 Move sets to specific services namespace 2021-01-14 09:41:07 +00:00
Pau Pérez Fabregat
9db4f9be15 Merge pull request #6634 from Matt-Yorkley/jobs-cleanup 
Jobs cleanup
 2021-01-14 10:08:15 +01:00
Maikel
168958311a Merge pull request #6656 from Matt-Yorkley/payment-identifier 
Fix payment identifier generation
 2021-01-14 17:34:38 +11:00
Maikel
fbda1fffd7 Merge pull request #6653 from Matt-Yorkley/dead-code-available-payment 
Dead code: #has_available_payment
 2021-01-14 17:33:07 +11:00
Maikel
14842f52fc Merge pull request #6633 from Matt-Yorkley/inverse-of 
Adding inverse_of
 2021-01-14 17:25:51 +11:00
Maikel Linke
be229c9002 Simplify email config by removing unused option 
Spree used to give you more options to configure ActionMailer but our
setup is much simpler. We can remove unused code.

The removed option was never used by OFN and defaulted to true. We don't
need a database migration because the value isn't set in the database.
 2021-01-14 12:05:41 +11:00
Andy Brett
c29d57b54e Merge pull request #6369 from Matt-Yorkley/broken-variants 
Fix variant data inconsistencies
 2021-01-13 11:10:44 -08:00
Matt-Yorkley
18c9e16303 Fix payment identifier generation 
Upstream fix from Spree 2.2.

See: 4e747187d7
 2021-01-13 17:37:22 +00:00
Matt-Yorkley
7d0ec48bcf Improve performance on summing adjustments and payment 
:amount is a database field in these cases, as opposed to a method that returns a computed result. Calling `.sum(:amount)` is much more efficient here as it computes the sum at database level, as opposed to `.map(&:amount).sum`, which would fetch and instanciate all the objects first, and then sum the amounts after.
 2021-01-13 16:16:49 +00:00
Matt-Yorkley
561cf23dc1 Remove #update_attributes_without_callbacks 
This is a hacky Spree method that's removed in Spree 2.2

See: 7deba6a152
 2021-01-13 16:02:21 +00:00
Matt-Yorkley
8d338a06f3 Delete dead code #has_available_payment 
This is removed in Spree 2.2, as it serves no purpose.

See: 0617bdce30
 2021-01-13 15:48:02 +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
46ff247bc9 Ensure ShippingMethod#destroy is using soft-deletion 
25f5c2daf8

We've already applied some of the changes in this commit during previous Spree upgrade work, but there were a couple of bits missing.
 2021-01-11 15:46:38 +00:00
Andy Brett
c12abf8057 Merge pull request #6617 from Matt-Yorkley/stock-items-variant-deletion 
Stock items and variant deletion
 2021-01-09 12:12:24 -08:00
Matt-Yorkley
618738db69 Fix more Rubocop offences 2021-01-09 13:22:25 +00:00
Matt-Yorkley
7f8fe631dd Bring in Spree::PaypalExpressCheckout 2021-01-09 13:22:25 +00:00
Matt-Yorkley
2a27da1cc5 Bring in Spree::Gateway::PayPalExpress 2021-01-09 13:22:25 +00:00
Matt-Yorkley
ca42b1fff7 Remove ConfirmSignupJob 2021-01-09 11:38:29 +00:00
Matt-Yorkley
6a7f795f64 Remove WelcomeEnterpriseJob 2021-01-09 11:33:10 +00:00
Andy Brett
3877721209 Merge pull request #6631 from Matt-Yorkley/actionmailer-deliver 
[Deprecation] Replace ActionMailer#deliver with ActionMailer#deliver_now
 2021-01-08 17:42:31 -08:00
Matt-Yorkley
ff962c1c9b Change various Mailer invocations from #deliver_now to #deliver_later 2021-01-08 23:18:55 +00:00
Matt-Yorkley
3e6445c51c Replace deprecated ActionMailer#deliver with ActionMailer#deliver_now 
DEPRECATION WARNING: `#deliver` is deprecated and will be removed in Rails 5. Use `#deliver_now` to deliver immediately or `#deliver_later` to deliver through Active Job.
 2021-01-08 20:35:47 +00:00