Luis Ramos
6cc91d457e
Merge pull request #5796 from coopdevs/remove-conlicting-spree-route
...
Remove conflicting and duplicate route
2020-07-23 14:29:12 +01:00
Pau Perez
9be199a6cc
Remove conflicting and duplicate route
...
This Spree route conflicts with the one we define:
```
get "/login", to: redirect("/#/login")
```
for whatever reason there are 7 users that managed to hit the Spree one
instead of ours when confirming their signup email. It's not clear to me
though when this `/login?validation=confirmed` is really hit. The
confirmation email link passes a token in the query params and this is
not the case.
The idea is that `GET /login` makes the login modal to show up instead
of Devise's default behaviour (through inheritance) of showing a login
form page. OFN was never prepared to handle this as this bug proofs.
2020-07-21 13:27:06 +02:00
Luis Ramos
001d40d691
Move require_login_then_redirect_to to the only place where it is called
...
This fixes a class loading issue where orders controllers was getting a undefined method require_login_then_redirect_to
2020-07-17 14:35:42 +01:00
Luis Ramos
3599cb2047
Make unauthorized in ControllerHelpers::Auth the same as in Spree::Admin::BaseController
...
It adapts the method in ControllerHelpers::Auth to also use the after_login mechanism.
Ideally we would remove one of the two after_login mechanisms after_login and spree_user_return_to but they might still be in use.
2020-07-15 14:54:53 +01:00
Luis Ramos
bf3150ddc8
Delete spree_user_signup which is from spree promotions code that we dont use
2020-07-15 14:53:35 +01:00
Luis Ramos
1666ffb191
Remove try_spree_current_user
...
This can be done because the method is defined in OFN's ApplicationController, so spree_current_user is available in all controllers
2020-07-15 14:53:35 +01:00
Luis Ramos
046c5f6585
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
97f00153ad
Bring controller_helpers/ssl.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
643a82c73c
Fix easy rubocop issues, some early returns make the indentation changes
2020-07-15 14:53:08 +01:00
Luis Ramos
a3ea4b757d
Merge decorator into the class brought from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
1167a1a9bb
Bring ControllerHelpers respond_with from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
20f610fbee
Merge controller_helpers/order with decorator
2020-07-15 14:53:08 +01:00
Luis Ramos
d5744572f7
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
23ff9d6fbb
Bring controller_helpers/order to OFN
2020-07-15 14:53:08 +01:00
Luis Ramos
10849504c3
Fix easy rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
2452202e92
Move lib/spree/core/controller_helpers/common.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
96839a03aa
Move lib/spree/core/controller_helpers.rb from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
4ee30d7cac
Remove spree.root route and respective controller. Also move
...
unauthorized route to main app.
This route is no longer used in OFN
2020-07-15 14:53:08 +01:00
Luis Ramos
7e75581da6
Merge class brought from spree with decorator
2020-07-15 14:53:08 +01:00
Luis Ramos
c8dd841c48
Fix some rubocop issues
2020-07-15 14:53:08 +01:00
Luis Ramos
2ea026ea31
Bring controller helper auth from spree
2020-07-15 14:53:08 +01:00
Luis Ramos
758bb17142
Fix some easy rubocop issues and add some exceptions to to manual todo list
2020-07-02 21:24:15 +01:00
Luis Ramos
1b28592f58
Now that the stock code is on out side we can clean up!
...
Remove everything related to splitters (including bringing environment.rb so we remove the splitters variable from it
2020-07-02 21:24:14 +01:00
Luis Ramos
92d0a5b735
Change default user from spree@example.com to ofn@example.com
2020-05-03 10:12:43 +01:00
luisramos0
a8a6fce385
Prefix root_path with main_app so that ofn's route is used. The spree root path will no longer be defined when spree_backend is dropped
2019-12-28 18:45:57 +00:00
luisramos0
9404aacfb2
run rubocop --auto-correct
2019-11-10 18:42:43 +00:00
luisramos0
5846593637
Remove dependency to spree_api rabl responders, we should only use AMS from now on
2019-10-28 16:00:36 +00:00
luisramos0
25451eed6b
Bring api spec helpers from spree_api into ofn/api_helper
2019-07-31 09:36:48 +01:00
luisramos0
2ae75ce13e
Add ControllerSetup from spree_api as it is used in spree/api/base_controller
2019-07-31 09:35:46 +01:00
luisramos0
e897eb0439
Remove Spree::BaseController.class_eval, these methods are already in the application helper through spree::application_helpers
...
We can ignore the difference in spree_logout_path as spree.logout_path is the user_sessions#destroy route
2019-07-08 13:59:26 +01:00
luisramos0
10e123a9c4
Move spree/authentication_helpers injection from spree initializers directly to the application_controller
...
Also, switch from using send to public_send making rubocop happier
2019-07-08 13:11:57 +01:00
luisramos0
17448699f9
Bring devise initializer from spree_auth_devise and fix spree initializer details
2019-07-05 22:45:59 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
Matt-Yorkley
8aa6b2c0ac
Stub spree_api_key on Spree::LegacyUser when signing in as regular user
2018-11-08 00:07:24 +00:00
Hugo Daniel
bc9af7c45f
Add an API key for admin user
2018-11-07 16:47:35 +01:00
Luis Ramos
3e4f92fe92
Merge branch '2-0-stable' into 2-0-adjust-basic-spec-fix
2018-10-16 17:33:33 +01:00
luisramos0
4380ff7bd7
Drop calculated_adjustments_decorator. This file was introduced in ofn's a0b740f52d. The change is already in spree 2.0.4, see here 2c82aab566 (diff-00aa4190da81ca29804a406252f1d0f4)
2018-10-12 23:09:36 +01:00
Pau Pérez Fabregat
20077c99b5
Merge pull request #2618 from coopdevs/enable-style-send-cop
...
Favor #public_send over #send using Rubocop's cop
2018-09-20 19:03:40 +02:00
Maikel Linke
a447fe4f40
Require lib file where needed
...
We can't always rely on other parts of the code been loaded first. We
need to declare dependencies so that they are always present.
I just ran into this problem in my dev environment.
2018-09-13 12:01:16 +10:00
Kristina Lim
f9533f8fb8
Refactor redirecting back after requiring login
2018-09-06 19:46:17 +10:00
Pau Perez
b23cb55525
Fix current violations of Style/Send cop
2018-09-05 12:05:05 +02:00
Pau Perez
daf12d1300
Revert "Refactor Order#current_order argument"
...
This reverts commit ae935202be .
2018-06-05 18:42:41 +02:00
Hugo Daniel
abe5d3596c
Refactor Order#current_order argument
2018-04-17 16:10:41 +02:00
Pierre de Lacroix
0fb66ab258
Fix CodeClimate issues
2017-12-01 13:37:30 +11:00
Pierre de Lacroix
a49c21cfd1
Add instance switch to enable number localization
2017-12-01 13:37:24 +11:00
Pierre de Lacroix
920900b619
Add Spree::LocalizedNumber module
2017-12-01 13:37:24 +11:00
Rob Harrington
c835b4eb1a
Replacing stub_model objects with actual factory generated instances
2017-11-10 08:47:12 +11:00
Rohan Mitchell
3135ef6b7f
Reinstate explicit class name Spree::Calculator on calculated_adjustments association
2017-09-08 23:55:48 +10:00
Rohan Mitchell
858576d870
CalculatedAdjustments requires include first
2017-09-08 23:55:48 +10:00
Rob Harrington
7bb58342fc
Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences
2017-06-23 16:49:08 +10:00