1948 Commits

Author	SHA1	Message	Date
Pau Pérez Fabregat	bd19d8b0bd	Merge pull request #5042 from luisramos0/api_base ... Make explicit the namespace of the BaseController for api controllers	2020-03-26 11:21:27 +01:00
Luis Ramos	ac0a62e962	Merge pull request #5050 from Matt-Yorkley/bullet_tweaks ... Performance tweaks 2	2020-03-25 18:32:49 +00:00
Luis Ramos	2c5db8935b	Merge pull request #5022 from Matt-Yorkley/performance_tweaks ... Performance tweaks	2020-03-25 15:42:07 +00:00
Matt-Yorkley	d847560d7c	Fix rubocop issues	2020-03-25 10:15:03 +01:00
Matt-Yorkley	ac38b2735c	Eager-load data in OrdersController	2020-03-23 22:38:57 +01:00
Matt-Yorkley	5b481c19cc	Eager-load country in Producers controller	2020-03-23 19:33:15 +01:00
Luis Ramos	a29f263041	Make explicit the namespace of the BaseController for api controllers	2020-03-22 09:55:07 +00:00
Matt-Yorkley	7baa875a91	Fix big N+1 issues in enterprises#edit for superadmin ... The page is usable now as superadmin. Roughly 10x faster...	2020-03-19 23:41:47 +01:00
Matt-Yorkley	3de887e1d8	Remove some N+1s relating to address (found with bullet gem)	2020-03-19 23:41:47 +01:00
Maikel	c4e4beb912	Revert "Inner join visible orders"	2020-03-19 12:01:00 +11:00
Luis Ramos	5da47b3f19	Merge pull request #4757 from luisramos0/stripe_sca_extra ... StripeSCA - Handle further SCA auth request when checking out	2020-03-16 16:45:28 +00:00
Luis Ramos	1049525e50	Merge pull request #4963 from luisramos0/variants_fix ... Fix 2 broken buttons in the product variants list page	2020-03-12 23:48:50 +00:00
Matt-Yorkley	933b5f1606	Fix reloading issue in dev environment ... I constantly get `NameError: uninitialized constant Spree::AuthenticationHelpers` when touching local files and then reloading a page, and have to restart my rails server every time (in development). I read the other day that this is the best way to fix the issue, and it seems to work...	2020-03-11 15:31:25 +01:00
Pau Pérez Fabregat	802ac647e3	Merge pull request #4879 from coopdevs/inner-join-visible-orders ... Inner join visible orders	2020-03-10 22:54:03 +01:00
Luis Ramos	676d949972	Make variants collection show deleted again by bypassing the default scope that removed deleted variants	2020-03-10 14:21:20 +00:00
Pau Pérez Fabregat	5811f3ead1	Merge pull request #4905 from luisramos0/untouch ... Remove some live but elderly debug code	2020-03-10 09:17:13 +01:00
Pau Pérez Fabregat	be7b3d5a12	Merge pull request #4809 from jeduardo824/redirect-to-shops-when-shop-does-not-exist ... redirect to shops list when an enterprise is not found	2020-03-06 18:39:00 +01:00
Pau Perez	461b1b26f3	Add controller tests to cover totals by supplier	2020-03-05 17:45:06 +01:00
Luis Ramos	af8369ae1b	Remove 5 years old debug code ... This reverts ab9bc7b1dc, it can be added if the issue happens again	2020-03-03 10:56:57 +00:00
luisramos0	3fcf286516	Extract PostCheckoutActions from checkout controller	2020-03-02 17:30:12 +00:00
luisramos0	19042e0d37	Make checkout controller able to receive a redirect from stripe with a payment_intent as parameter	2020-03-02 17:30:12 +00:00
luisramos0	e3ffe8fe6b	Add Checkout Stripe redirect logic to get users redirected to stripe authentication pages provided by the stripe API	2020-03-02 17:30:12 +00:00
luisramos0	d91578ab80	Rename checkout payment redirect to checkout paypal redirect	2020-03-02 17:30:12 +00:00
luisramos0	873dcc373f	Small refactoring to make next commit easier	2020-03-02 17:30:12 +00:00
luisramos0	1289c3f1a2	Fix rubocop issues in credit_cards_controller	2020-03-02 17:29:30 +00:00
Luis Ramos	c37218fdc5	Merge pull request #4719 from luisramos0/stripe_card_to_pm ... Make StripeSCA payment method work with existing credit cards (the ones saved through the Stripe Charges API)	2020-03-02 17:22:07 +00:00
Luis Ramos	dad21a52b2	Merge pull request #4672 from luisramos0/stripe_sca_method ... Add new Stripe payment method compatible with the new Stripe Payment Intents API	2020-03-02 17:19:05 +00:00
Eduardo	4c3916a93d	redirect to shops list when an enterprise is not found	2020-02-26 19:25:38 -03:00
Pau Pérez Fabregat	a396a7f0af	Merge pull request #4818 from luisramos0/delete_dead_code ... Delete dead code after PRs 4512 and 4508	2020-02-25 13:32:23 +01:00
Luis Ramos	a3a61967a8	Merge pull request #4621 from luisramos0/spree_backend_js ... OFN without spree_backend 🎉	2020-02-22 10:24:50 +00:00
Luis Ramos	1bdeda4a21	Delete dead code after PRs 4512 and 4508	2020-02-21 12:25:07 +00:00
luisramos0	1afd712ff4	Make StripeSCA store cards (and delete them) on the Stripe platform account and not the Stripe Connected account (the sellers accounts) ... This is important so that cards can be re-used across sellers in OFN	2020-02-21 10:56:32 +00:00
luisramos0	b3ac5d8f41	Improve code readability a little	2020-02-21 10:52:56 +00:00
luisramos0	38fd028a9f	Fix some rubocop issues from previous commit	2020-02-21 10:52:56 +00:00
luisramos0	c7b01c37af	Fix a problem in credit cards controller spec and test case where stripe_account_id must be included in the stripe api call	2020-02-21 10:52:55 +00:00
luisramos0	1b820ea85c	Fix rubocop issues in credit_cards_controller	2020-02-21 10:52:55 +00:00
luisramos0	a52c4b542c	Make destroy stored cards work for stripe SCA by setting stripe account id before making the call to the stripe api ... This account id cannot be sent when dealing with the old StripeConnect gateway	2020-02-21 10:52:29 +00:00
luisramos0	f691d1aafd	Add new payment method StripeSCA that will use the Stripe Payment Intents API instead of the Stripe Charges API that the current StripeConnect gatreway uses	2020-02-21 10:52:29 +00:00
Luis Ramos	323ca906bc	Merge pull request #4759 from pacodelaluna/order-admin-products ... Order admin products	2020-02-13 11:33:05 +00:00
Luis Ramos	c43b34e0fa	Merge pull request #4760 from luisramos0/checkout_ctrl ... Merge Spree::CheckoutController with CheckoutController and clean it up	2020-02-13 11:31:15 +00:00
François Turbelin	4c7bd4d6a8	Fix mess with order	2020-02-13 06:38:13 +01:00
François Turbelin	523b266308	Put back created_at desc as default order	2020-02-13 06:38:13 +01:00
François Turbelin	212413c8b3	Avoid mutable q params	2020-02-13 06:38:13 +01:00
François Turbelin	b248dc598e	Cosmetics	2020-02-13 06:38:13 +01:00
François Turbelin	89d2750fc4	Set default value at backend side	2020-02-13 06:38:13 +01:00
François Turbelin	7100111f93	Fix specs and cosmetics	2020-02-13 06:38:13 +01:00
François Turbelin	56f9adc5b7	Filter Admin products by name asc	2020-02-13 06:38:13 +01:00
luisramos0	858d2cc6c2	Add doc to Spree::CheckoutController to make it more obvious why this controller exists	2020-02-07 11:50:23 +00:00
luisramos0	2acf8e5125	Remove config_locale from base controller, in OFN we dont have separate locales for frontoffice and backoffice	2020-02-05 16:02:43 +00:00
Luis Ramos	9313a57d19	Merge pull request #4511 from luisramos0/backend_ctrl_search ... Bring spree_backend search controller to OFN	2020-02-05 15:54:30 +00:00