Matt-Yorkley
ba81bd8395
Remove after_action callback in Admin:OrdersController
2021-02-19 11:17:59 +00:00
Matt-Yorkley
5c5d687c9b
Remove hacks for working around closed adjustments
...
The enterprise fees are recreated and the shipping and payment fees are updated. The rest of the deleted code is not necessary (eg #with_open_adjustments). Everything else that needs to happen here is already done automatically (eg updating order totals).
2021-02-19 11:17:59 +00:00
Matt-Yorkley
8466ab5675
Extract more OFN fee-handling code from Spree::Order class
2021-01-29 22:51:21 +00:00
Matt-Yorkley
793baca44f
Update fees on single line item and then order fees in LineItemsController#delete
...
Fees on other line items are left alone (not recreated), and whatever fees on the order are updated.
2021-01-29 21:53:11 +00:00
Matt-Yorkley
ce5f9a9a94
Update existing closed order fees when deleting line items on completed orders in LineItemsController#delete
...
Whatever fee adjustments there are on other line items should be left alone (not recreated), and whatever fee adjustments are already on the order should just be updated.
2021-01-29 21:53:11 +00:00
Matt-Yorkley
58c7c90624
Refactor methods for updating closed adjustments
2021-01-29 21:53:11 +00:00
Matt-Yorkley
dffa4d4f39
Update order methods delegation
2021-01-29 21:53:09 +00:00
Matt-Yorkley
3ecdfca9cf
Rename fee adjustment clear-all method
2021-01-29 21:52:28 +00:00
Matt-Yorkley
9abf6cdcdf
Rename expensive method Order#update_distribution_charge!
...
This method is named "update distribution charge". What this method actually does is delete all of the fee adjustments on an order and all it's line items, then recreate them all from scratch. We call this from lots of different places all the time, and it's incredibly expensive. It even gets called from inside of transactions being run inside callbacks. Renaming it hopefully will add a bit of clarity.
This needs to be a lot more granular!
2021-01-29 21:52:28 +00:00
Matt-Yorkley
785cdf9bdc
Extract order fees logic to service
2021-01-29 21:52:27 +00:00
Matt-Yorkley
e7866db7b1
Improve efficiency in applying enterprise fees in Order#update_distribution_charge!
2021-01-29 18:32:26 +00:00
Matt-Yorkley
c65f623ed8
Memoize and simplify objects being checked in Order#provided_by_order_cycle?
2021-01-28 01:02:57 +00: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
Matt-Yorkley
7525620d6c
Merge pull request #6070 from Matt-Yorkley/responsive-admin
...
Full-width admin layout
2021-01-27 12:45:06 +01:00
Matt-Yorkley
feca9e7838
Improve hubs sidebar in payment methods edit
2021-01-27 11:38:01 +00:00
Matt-Yorkley
398b4a09a1
Improve enterprise fees calculator fields
2021-01-27 11:38:01 +00:00
Matt-Yorkley
366588de95
Improve <legend> element centering
2021-01-27 11:38:01 +00:00
Matt-Yorkley
b5ab6cbf69
Improve button spacing in enterprises submenu
2021-01-27 11:38:01 +00:00
Matt-Yorkley
e762c1d02f
Adjust buttons layout on enterprise shipping and payment methods page
2021-01-27 11:38:01 +00:00
Matt-Yorkley
f72cd6222f
Adjust variant columns in inventory pages
2021-01-27 11:38:01 +00:00
Matt-Yorkley
539ff228e0
Adjust form layout on order cycle edit form (simple view)
2021-01-27 11:38:01 +00:00
Matt-Yorkley
afdb5e8c6f
Add a max-width of 1400px for huge monitors (1600px or more)
2021-01-27 11:38:01 +00:00
Matt-Yorkley
d40ec2d63c
Adjust order cycle edit form layout
2021-01-27 11:38:01 +00:00
Matt-Yorkley
0d99656b1b
Adjust dashboard layout
2021-01-27 11:38:01 +00:00
Matt-Yorkley
52cfa0a103
Remove old Javascript hacks for the main menu and replace with flex-based CSS properties
2021-01-27 11:38:01 +00:00
Matt-Yorkley
d886b1dcea
Tweak some styles and layout classes
2021-01-27 11:38:01 +00:00
Matt-Yorkley
29e74017a6
Replace fixed 960 grid
2021-01-27 11:38:01 +00:00
Pau Pérez Fabregat
9fe2cb1a30
Merge pull request #6681 from luisramos0/css
...
[Rails 5] Make the app work in rails 5
2021-01-27 12:08:27 +01: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
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
