Matt-Yorkley
7940a42e8c
Add Spree::Order#all_adjustments scope, which can be used to get all adjustments on an order, and order's line_items, etc, not just adjustments directly on the order itself.
2021-01-23 03:59:32 +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
ddfcda0c0b
Adapt imported Paypal code
...
The #additional scope from Spree 2.2 is now present, so we can tidy up this conditional.
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
a328a9bc1b
Use included boolean in tax adjustments
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
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
0f92b3c4de
Merge pull request #6685 from Matt-Yorkley/angular-csrf
...
[Rails 5] Update Angular CSRF handling
2021-01-21 11:01:06 -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
d2b2e46124
Merge pull request #6701 from Matt-Yorkley/admin-order-performance
...
Fix performance issue in loading payment methods
2021-01-21 10:58:35 -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
70f30f5224
Merge pull request #6658 from andrewpbrett/item-counter-fix
...
Further fix #5989 (Item counter accepts values higher than the available stock)
2021-01-21 10:56:18 -08: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
ce4621858d
base authorization on the payment's order
2021-01-21 09:18:29 -08:00
Andy Brett
8bcaeff6c8
resolve merge conflict; add ssl helper to base controller
2021-01-21 09:18:29 -08:00
Andy Brett
903b2e7ff4
whitelist allowed events to be sent to a Payment
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
d9b27bc556
move controller and mailer outside of spree namespace; use haml in template
2021-01-21 09:18:29 -08:00
Andy Brett
b669ccdc74
refactor admin payments controller
2021-01-21 09:17:07 -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
802e49bed3
add PaymentMailer and send email if payment auth is required
2021-01-21 08:24:01 -08:00
Cillian O'Ruanaidh
40f9b063fe
Remove ability to create new product from products page, use /admin/products/new instead.
...
It's simpler if there is just one place to add a new product. Closes #6650
This removes the 'creating directly from the new product path' test scenario because we have another 'assigning important attributes' scenario above which provides enough coverage.
2021-01-21 08:24:01 -08:00
Andy Brett
77419a1e4b
Merge pull request #6675 from cillian/single-new-product-view
...
Remove ability to create new product from products page, use /admin/products/new instead.
2021-01-20 19:23: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
ca37976661
Merge pull request #6640 from jibees/2772-loading-spinner-reusable-component
...
Create a reusable "loading spinner" component
2021-01-20 19:21:31 -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
Matt-Yorkley
a184075c5c
Fix performance issue in loading payment methods
...
This was loading and initializing every payment method in the database, and every calculator for each of those payment methods.
🔥
2021-01-19 15:33:44 +00:00
Pau Pérez Fabregat
8b01c9c8ba
Merge pull request #6279 from luisramos0/base_controller
...
Merge Spree::BaseController with ApplicationController and merge StoreController with ::BaseController
2021-01-19 15:52:47 +01:00
Luis Ramos
fc40775ca8
Make paypal controller inherit from base controller and not from old store controller
2021-01-18 23:33:05 +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
ea9ebc8a33
Update Angular CSRF handling
2021-01-16 13:41:24 +00:00
Luis Ramos
4060e7debf
Replace usages of Spree::BaseController with ApplicationController
2021-01-15 21:59:16 +00:00
Luis Ramos
7a22367b4a
Make controllers use ::Basecontroller instead of StoreController
2021-01-15 21:59:16 +00:00
Luis Ramos
23e6048bde
Merge StoreController with BaseController
2021-01-15 21:59:16 +00:00
Luis Ramos
ff8a81cee7
Remove includes already present in parent ApplicationController
2021-01-15 21:59:16 +00:00
Luis Ramos
0eab1b2339
Merge Spree::BaseController with ApplicationController
2021-01-15 21:59:16 +00:00
Matt-Yorkley
c0c7c6ec78
Update checkout helper summing and add test coverage
2021-01-15 17:29:21 +00: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
Cillian O'Ruanaidh
79668e06a7
Remove ability to create new product from products page, use /admin/products/new instead.
...
It's simpler if there is just one place to add a new product. Closes #6650
This removes the 'creating directly from the new product path' test scenario because we have another 'assigning important attributes' scenario above which provides enough coverage.
2021-01-15 10:24:50 +00: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
Andy Brett
18dcbbd892
Merge pull request #6613 from Matt-Yorkley/variant-override-serialization
...
Don't serialize all variant override objects where they are not needed
2021-01-14 10:59:11 -08:00
Andy Brett
81ea71af94
Merge pull request #6652 from jibees/6651-remove-trailing-asterisk-on-non-mandatory-field
...
remove asterisk on 'display as' field unit value for a product
2021-01-14 10:09:15 -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
Pau Pérez Fabregat
9689fe2edf
Merge pull request #6384 from andrewpbrett/fix-product-descriptions
...
correctly display '&' and ' ' in product descriptions
2021-01-14 17:00:16 +01:00
