2680 Commits

Author	SHA1	Message	Date
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
Matt-Yorkley	23910dbab4	Use OrderContents in BulkLineItemsController ... We should move towards *all* operations on an order's line items being done exclusively through this service.	2021-06-04 17:10:50 +01:00
Matt-Yorkley	d99e598e7a	Delete dead code in CartController ... The two conditionals in #populate_variant_attributes here are never actually true, so the subsequent code paths are never reached.	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
Jean-Baptiste Bellet	6842cbfda4	Force content type to "text/html" ... - Force the content type to be `text/html` (instead of `application/json`)	2021-05-25 15:30:21 +02:00
Matt-Yorkley	74f27544f7	Merge pull request #7647 from andrewpbrett/default-country-codes ... Use correct default country code	2021-05-25 11:21:34 +02: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	7df2915fbd	add DefaultCountry service	2021-05-18 12:44:53 -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	c7f80d86a8	Merge pull request #7638 from Matt-Yorkley/dead-code-order-distribution ... Delete dead code in OrdersController#update_distribution	2021-05-15 12:40:25 -07: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