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
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
Matt-Yorkley
eec9f27353
Move controller concern to correct directory
...
This is a controller concern, it should live in app/controllers/concerns/
2021-01-08 17:47:09 +00:00
Matt-Yorkley
139773bc22
Add inverse_of to associations between shipping methods and rates
...
See 20d913c21c
2021-01-08 15:42:58 +00:00
Matt-Yorkley
f07c2dcd84
Add inverse_of for associations involved in cart processing
...
7bac3e7b2c
and
61bd5446e1
2021-01-08 15:42:58 +00:00
Matt-Yorkley
52b43d8c23
Delete dead code
...
This method isn't called from anywhere
2021-01-07 16:03:04 +00:00
Matt-Yorkley
cca16c6e1f
Fix stock issue and update specs (now passing)
...
See: dcd5944a29
2021-01-06 20:13:38 +00:00
Andy Brett
1e9b2b34f7
Merge pull request #6545 from PauloVilarinho/add-internationalization-to-included_price_validation
...
adds translation key to the included in price validation
2021-01-02 14:55:16 -08: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
e88972b989
Merge pull request #6441 from luisramos0/ruby24
...
Bump to ruby 2.4.4
2020-12-31 15:31:45 +01: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
Pau Pérez Fabregat
9a199ae02c
Merge pull request #6540 from PauloVilarinho/add-internationalization-to-payment-method-clean-name
...
Add internationalization to payment method clean name
2020-12-18 18:06:19 +01:00