Jean-Baptiste Bellet
4acc942100
Add appropriate distributors and suppliers to the packing report
...
ie. the ones that are distributing/supplying products the current user is distributing/supplying
- As the orders_and_fullfillment reports already had the right filled distributors and suppliers, use the same method: add_appropriate_distributors_and_suppliers
2021-07-27 18:06:30 +02:00
Matt-Yorkley
886e03af2f
Merge pull request #7805 from Matt-Yorkley/adjustments-admin
...
[Adjustments] Admin adjustments
2021-07-27 12:23:29 +02:00
Matt-Yorkley
69e4670a17
Tidy up building default address objects
2021-07-25 22:47:40 +01:00
Matt-Yorkley
41757254d6
Recalculate taxes when an order's customer details are changed
2021-07-25 22:47:40 +01:00
Matt-Yorkley
d55079f474
Extract comment-method
2021-07-25 22:47:40 +01:00
Matt-Yorkley
18d98500e9
Update pagination in Admin::ZonesController
2021-07-14 13:17:33 +01:00
Matt-Yorkley
a821117b83
Update pagination in Admin::UsersController
2021-07-14 13:17:33 +01:00
Matt-Yorkley
1dddaf9b14
Remove dead code in Admin::ProductsController
...
This is related to some of the data-loading for index actions inherited from Spree's Admin::ResourceController, but we don't actually use it any more...
2021-07-14 13:17:33 +01:00
Nihal Mohammed
e5bdaa603a
Setup pagy
2021-07-14 13:17:33 +01:00
Matt-Yorkley
f037bda1de
Replace callback for applying tax to an admin adjustment
...
🎉
2021-07-09 21:49:35 +01:00
Matt-Yorkley
0c369b618d
Remove code that guesses what the tax rate might be
...
🎉
2021-07-09 21:49:35 +01:00
Matt-Yorkley
65eb33ad9e
Only update totals and states in AdjustmentsController
...
Avoids unnecessary updating of all other adjustments
2021-07-09 21:49:35 +01:00
Matt-Yorkley
e8d610f9df
Remove dead code AdjustmentsController#enable_updates
2021-07-09 21:49:35 +01:00
Andy Brett
718f9c4af8
Merge pull request #7848 from jibees/7842-locale-management-on-user_passwords-controller
...
Handle lang management on user passwords controller
2021-07-09 08:55:09 -07:00
Andy Brett
aa8067f96b
process payments separately from completing the order
2021-06-29 11:54:48 -07:00
Andy Brett
d2701226b6
complete order immediately before adding payment
2021-06-29 11:45:33 -07:00
Jean-Baptiste Bellet
0a6d959742
Set locale to the user passwords controller
...
- Thus this use the same locale that the one which was set previously (if it's different from the browser one)
2021-06-28 10:19:46 +02:00
Andy Brett
07a2a584c3
remove calls to ssl_allowed as well
2021-06-24 12:06:34 -07:00
Andy Brett
334b9b520a
removed deprecated calls to force_ssl; rely on config.force_ssl
2021-06-24 11:58:33 -07:00
Pau Pérez Fabregat
db993652c4
Merge branch 'master' into payment-states
2021-06-18 12:20:26 +02:00
Luis Ramos
e52937c113
Use rubocop auto correct to add frozen string literal to all files
...
This is an unsafe auto corection, we will need to trust our build here
2021-06-17 23:07:26 +01:00
Andy Brett
527f4e2cb3
move payment to requires_authorization if cvv_result is present
2021-06-17 14:23:59 -07:00
Andy Brett
31738ceb49
rename and consolidate authorization? methods
2021-06-17 14:23:59 -07:00
Luis Ramos
23627c5453
Run rubocop -a (safe corrections) removing all exceptions so all possible fixes are applied
...
9290 issues fixed
2021-06-17 22:19:26 +01:00
Matt-Yorkley
0f5c39317a
Re-apply taxes in Admin::OrdersController#update
...
Ensures taxes are updated properly when hitting the "Update and Recalculate Fees" button on the order edit page.
2021-06-06 20:16:03 +01:00
Matt-Yorkley
2d76c2730a
Update shipment updating
2021-06-04 17:10:50 +01:00
Matt-Yorkley
000e2c07f8
Use OrderContents in OrdersController
2021-06-04 17:10:50 +01:00
Matt-Yorkley
d5d76d9b9a
Move private controller methods to private
2021-06-04 17:10:50 +01:00
Andy Brett
b23530be4c
Merge pull request #7736 from Matt-Yorkley/ssl-in-dev
...
Remove Spree::Config[:allow_ssl_in_development_and_test]
2021-06-04 07:21:05 -07:00
Maikel
4dacdb180f
Merge pull request #7617 from luisramos0/layout61
...
[Rails 6.1] Make admin layout path relative
2021-06-04 12:26:40 +10:00
Matt-Yorkley
7d38bec26d
Remove Spree::Config[:allow_ssl_in_development_and_test]
...
Unconditionally disables forced https-redirects in dev and test
2021-06-03 20:52:09 +01:00
Matt-Yorkley
834140f0a2
Don't dump massive binary PDF data into the job queue
...
Here we were rendering an entire PDF, then passing that PDF into the job queue as an *argument* containing the entire binary of the PDF in a massive string. This means the job object itself would contain that entire PDF. That's bad queueing!
We now create the PDF *during* the job (not before it), and pass simple arguments.
2021-05-29 16:06:29 +01:00
Andy Brett
b367001b95
Merge pull request #7641 from luisramos0/order_path
...
[Rails 6.1] Fix view specs
2021-05-24 14:41:32 -07:00
Pau Pérez Fabregat
8c81c14c8d
Merge pull request #7580 from apricot12/Remove-LineItems-N+1
...
Removed N+1 queries while counting line_items
2021-05-20 11:42:14 +02:00
Andy Brett
70ac719725
Merge pull request #7649 from andrewpbrett/payments-when-out-of-stock
...
Check stock before doing anything related to admin payments
2021-05-19 14:45:38 -07:00
Luis Ramos
b2e97fe1d2
Rename order.update! to order.update_order! and adjustment.update! to adjustment.update_adjustment!
2021-05-19 09:54:22 -07:00
Andy Brett
4b352da402
Merge pull request #7630 from apricot12/persistent_flash_after_reload
...
Persistent flash after reload
2021-05-18 12:55:37 -07:00
Andy Brett
5169ee91ea
add comment for before_action
2021-05-18 10:42:19 -07:00
Andy Brett
5917accdd2
refactor using Extract Method
2021-05-18 10:38:35 -07:00
Pau Pérez Fabregat
5f9679655c
Merge pull request #7645 from Matt-Yorkley/stripe-payment-processing
...
Stripe payment processing
2021-05-17 16:17:21 +02:00
Matt-Yorkley
2b9f9fce86
Fix flash session memory-effect when showing errors after payment processing
...
We're not doing a redirect after setting this flash message, so we need to ensure it's discarded after the current page load.
2021-05-16 20:11:45 +01:00
Matt-Yorkley
5805104d13
Tidy up controller and add explanatory comment
2021-05-16 12:19:04 +01:00
Andy Brett
0a880a2bf3
flip conditional order for performance
2021-05-15 07:08:07 -07:00
Andy Brett
ca38948e21
check stock before doing anything related to admin payments
2021-05-14 17:42:37 -07:00
Luis Ramos
b1896733ca
Fix routes
2021-05-14 00:08:20 +01:00
Matt-Yorkley
82a6befce7
Delete dead code in OrdersController#update_distribution
...
I can't see any evidence that these params ever get sent to this action...
2021-05-13 15:29:53 +01:00
Nihal Mohammed
c930b2ee60
Fix persistet flash after /cart page reload
2021-05-13 05:57:25 +05:30
Nihal Mohammed
367cee593f
Move eager loading line_items to controller
2021-05-13 01:12:13 +05:30
Luis Ramos
b265fbf9a0
Remove initial slash from admin layout, this fixes a problem with layouts cant be loaded from absolute paths
2021-05-11 22:34:15 +01:00
Pau Perez
9a63f38790
I18n-ize error messages.
2021-05-06 16:34:29 +02:00
