Matt-Yorkley
4b4450d34f
Update conditional pagination in Api::OrdersController
2021-07-14 13:19:02 +01:00
Matt-Yorkley
41f9f07a80
Simplify cases where pagination is conditional and pagination data may or may not be used
2021-07-14 13:17:33 +01:00
Matt-Yorkley
e5afa3a26e
Simplify #pagy calls without default item counts
...
Pagy will pick up the :per_page param by default now, so we don't need to specify `items: params[:per_page]` unless we want to use something beyond that param's value.
2021-07-14 13:17:33 +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
a146782bcd
Update pagination in Api::StatesController
2021-07-14 13:17:33 +01:00
Matt-Yorkley
eba60a6130
Deal with Api::OrdersController and SearchOrders service
2021-07-14 13:17:33 +01:00
Matt-Yorkley
3213c30a37
Update pagination in Api::ExchangeProductsController
2021-07-14 13:17:33 +01:00
Matt-Yorkley
6fe68322da
Update pagination in Admin::BulkLineItemsController
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
0d16be3f94
Merge pull request #7779 from Matt-Yorkley/stripe-stock-check
...
Stripe stock check
2021-07-13 14:46:34 +02:00
Matt-Yorkley
8e1631bfc7
Set adjustments associated with voided payments to ineligible.
...
Otherwise we can end up with duplicate transaction fees for voided payments.
2021-07-12 08:28:32 +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
Matt-Yorkley
e6d9545c30
Use :incomplete scope when voiding payments that can't be processed due to stock changes
2021-07-09 13:31:00 +01:00
Matt-Yorkley
9bcf0d5b38
Handle Stripe payments when checkout fails due to stock issues
...
This can occur when stock is reduced after the user is redirected to Stripe and before they are redirected back. The stock is insufficient, the order is not complete, the user is bounced back to the cart, but a *pending* Stripe payment is left on the order.
2021-07-09 13:13:20 +01:00
Jean-Baptiste Bellet
aa982fe8df
Create a new method to change the lang of the app
...
- The old method (link to `?locale=#{l.to_s}`) was not functional for path that already has query params in current path (such as `/user/spree_user/password/edit?reset_password_token=`) ;
- This seems that the best way to handle this, is to create a new route, new method that effectively set the lang (not the locale actually...) and then redirect_back (ie. using the HTTP_REFERER, with a fallback to `/`)
s
2021-07-06 10:09:37 +02:00
Andy Brett
3e860f6d54
Merge pull request #7781 from andrewpbrett/decouple-payments
...
Decouple payments
2021-07-01 18:07:01 -07:00
Nihal Mohammed
18282a6f73
Add advanced settings button to incoming and outgoing pages in OC cycle edit
2021-06-30 09:50:38 -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
b41302d5d8
update state transitions for new requires_authorization state
2021-06-17 14:23:59 -07: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
Pau Pérez Fabregat
a8efbffca6
Merge pull request #7429 from Matt-Yorkley/adjustments-taxrate
...
[Adjustments] TaxRate changes
2021-06-17 11:51:01 +02:00
Andy Brett
768c56400c
add TOS helper to application_controller.rb
2021-06-09 14:06:54 +10:00
Maikel Linke
17a3d23d68
Handle user clicking upload button early
2021-06-09 14:06:54 +10:00
Maikel Linke
690118c2bd
Add delete method to terms of service files
2021-06-09 14:06:54 +10:00
Maikel Linke
3bee9cb951
Add Rails action #new to ToS
2021-06-09 14:06:54 +10:00
Maikel Linke
abe76ccf0f
Add upload of Terms of Service files
...
Admins can upload files and view the most recent (current) one.
2021-06-09 14:06:54 +10:00
Maikel Linke
007b8cd888
Add new admin page for TOS files
...
Just the basic Rails setup without any functionality yet.
2021-06-09 14:06:53 +10:00
Andy Brett
ede966f2d1
Merge pull request #7640 from apricot12/closed_OC_bheaviour
...
Checkout made to redirect to shop front when OC closed
2021-06-08 10:30:13 -07: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
2e96982e60
Refactor conditional
...
CartService#populate already returns the value of the #valid? method by default.
2021-06-04 17:10:50 +01:00
Matt-Yorkley
6abe0b375c
Refactor stock levels check in CartController
2021-06-04 17:10:50 +01:00
Matt-Yorkley
0cfe7fdc45
Move required logic into OrderContents and improve spec
2021-06-04 17:10:50 +01:00
Matt-Yorkley
f5c08baabb
Use OrderContents in LineItemsController and move enterprise fee updating logic
2021-06-04 17:10:50 +01:00
Matt-Yorkley
398d4b2612
Tidy up public interface of CartService
...
We don't need this extra hash to be passed around
2021-06-04 17:10:50 +01:00
Matt-Yorkley
6e8fd3c3f8
Simplify CartService interface
...
There's only one place this method is called, and the "overwrite" argument is always explicitly true. It doesn't need to be there if it's mandatory.
2021-06-04 17:10:50 +01:00
Matt-Yorkley
7af5e8931f
Adapt OrderContents for use with BulkLineItemsController#update
2021-06-04 17:10:50 +01:00
Matt-Yorkley
5ff8436c1a
Adapt OrderContents#remove to allow deleting line item without passing a quantity
2021-06-04 17:10:50 +01:00
Matt-Yorkley
a5ccaf9595
Remove unnecessary code in BulkLineItemsController
...
This method isn't called from anywhere else
2021-06-04 17:10:50 +01:00
Matt-Yorkley
000e2c07f8
Use OrderContents in OrdersController
2021-06-04 17:10:50 +01:00
