luisramos0
36e3362fc1
Adding missing translation that is now being used after being brought from spree_auth_devise
2019-07-08 13:23:18 +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
0101dcdd93
Remove unused Spree::Dash from controllers brought from spree_auth_devise
2019-07-08 13:10:52 +01:00
luisramos0
9416f61fb3
Remove spree/checkout_controller.completion_route only used in spree/checkout_controller.update which is never used in OFN. Checkout update happpens in the checkout_controller.update
2019-07-08 13:04:38 +01:00
luisramos0
8efd69c3d1
Remove unnecessary checkout registration code, it's not used in OFN
2019-07-08 12:57:17 +01:00
luisramos0
dcbdfbb081
Fix rubocop issues in multiple files copied from spree_auth_devise, mostly hash rockets
2019-07-08 11:22:56 +01:00
luisramos0
92968c5efe
Merge spree/users_sessions_controller into spree/users_sessions from spree_auth_devise
2019-07-07 22:06:18 +01:00
luisramos0
c8ac64566f
Merge spree/users_controller_decorator into spree/user_controller
2019-07-07 22:04:04 +01:00
Transifex-Openfoodnetwork
633c7737e4
Updating translations for config/locales/en_ZA.yml
2019-07-08 04:04:48 +10:00
luisramos0
05a72be273
Move handle_asynchronously :send_reset_password_instructions to after send_reset_password_instructions declaration
...
This was as it was before the merge of user_decorator and user, the declaration was in the original class and the handle_asynchronously part was in the decorator which was loaded after the main user class from spree_auth_devise, this commit restores the order and fixes a spec in authentication_spec
2019-07-07 17:53:12 +01:00
luisramos0
b1cd950051
Add missing translation keys from spree_auth_devise
2019-07-07 17:12:54 +01:00
luisramos0
f557996817
Add deface overrides from spree_auth_devise for the users menu tab, the admin top bar and the shared login bar (maybe dead code this last one)
2019-07-06 22:53:20 +01:00
luisramos0
1a64a737d4
Add ActionController::Metal frorm spree_auth_devise for api authentication
2019-07-06 10:50:48 +01:00
luisramos0
7c0087cb30
Remove reference to empty spree_auth css and js files from spree_auth_devise
2019-07-06 00:02:40 +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
a413f22e12
Remove unnecessary dependency to spree/users helper
2019-07-05 22:37:07 +01:00
luisramos0
893952f46b
Merge user_mailer_decorator into user_mailer
2019-07-05 22:31:06 +01:00
luisramos0
061e3cd722
Add user mailer from spree_auth_devise
2019-07-05 22:29:51 +01:00
luisramos0
a83790951d
Add model auth_config from spree_auth_devise
2019-07-05 21:58:29 +01:00
luisramos0
4e33529845
Merge user_decorator.rb into user.rb
2019-07-05 21:58:28 +01:00
luisramos0
a2a8b330b7
Add User class from spree_auth_devise as is
2019-07-05 21:58:28 +01:00
luisramos0
9669016573
Add required views from spree_auth_devise
2019-07-05 21:58:28 +01:00
luisramos0
2755cb9ec7
Add users_tab partial from spree_auth_devise
2019-07-05 21:58:28 +01:00
luisramos0
fdcc4c2447
Remove dependency to spree auth devise
2019-07-05 21:58:07 +01:00
Pau Perez
f42bf72b32
Fix rubocop violations
...
It's not affordable to fix the failed Metrics cops in the scope of this
bug fix, but now, with a separate class, it'll be easier.
2019-07-05 18:19:58 +02:00
Pau Perez
8ab77b077b
Fix spec
...
This needs to be revisited. I'm not sure it's the most appropriate spec
as it seems to be testing just part of story.
2019-07-05 18:19:58 +02:00
Pau Perez
9b03833df0
Extract orders & fulfillments default report clasts
2019-07-05 18:19:58 +02:00
Pau Perez
fada30435f
DRY some procs from report
2019-07-05 18:19:58 +02:00
luisramos0
fc0ffda8ec
Bring routes and controllers from spree_auth_devise
2019-07-05 15:08:42 +01:00
Luis Ramos
397729ed3d
Merge pull request #4001 from pacodelaluna/3990-display-enterprise-id-in-profile
...
Display enterprise ID in profile
2019-07-05 11:14:43 +01:00
luisramos0
88312b8e4a
Make OrdersHelper.invoice_links simpler
2019-07-05 11:08:51 +01:00
luisramos0
9be3ff90f7
Make OrdersHelper.complete_order_links simpler
2019-07-05 11:06:49 +01:00
luisramos0
a5b5e5de32
Remove trailing backslash
2019-07-05 10:58:53 +01:00
luisramos0
e66dea7e03
Improve query in filter_schedules_by_enterprise_id. Makes join to OCs explicity.
2019-07-05 10:37:27 +01:00
Maikel
4c5ed2fa45
Merge pull request #3999 from openfoodfoundation/transifex
...
Transifex
2019-07-05 11:59:40 +10:00
Maikel
40c0e69f11
Merge pull request #4000 from Matt-Yorkley/v2_migrations
...
Fix failing migration by clearing schema cache
2019-07-05 10:56:26 +10:00
Transifex-Openfoodnetwork
f3837fb6af
Updating translations for config/locales/en_GB.yml
2019-07-05 05:08:46 +10:00
Pau Perez
db7b7bbde2
Fix finding supplier for a deleted product
2019-07-04 18:52:56 +02:00
luisramos0
ef61310bad
Fix long lines in order_cycle_permissions and permissions
2019-07-04 17:17:58 +01:00
luisramos0
91da0114e3
Upgrade fuubar to 241 to skip yanked 240
2019-07-04 16:09:36 +01:00
Pau Perez
ee301c5e2f
Address Code Climate (rubocop) issues
2019-07-04 17:01:06 +02:00
Pau Perez
4a67ffab25
Add a test case for reports with deleted products
2019-07-04 17:01:06 +02:00
Pau Perez
4d060815d0
Extract unscoping logic into method
...
DRYies out the code a bit.
2019-07-04 17:01:06 +02:00
Pau Perez
f91bd03c25
Add clarifying comment to report
2019-07-04 17:01:06 +02:00
Pau Perez
7de4ec2a90
Fix orders and fulfillments report
...
It bypasses the default_scope to retrieve deleted variants in the orders
and fulfillment report.
2019-07-04 17:01:06 +02:00
Pau Perez
812d8cac4a
Make complex method a bit more readable
2019-07-04 17:01:06 +02:00
Transifex-Openfoodnetwork
d1faed282f
Updating translations for config/locales/es.yml
2019-07-05 00:22:01 +10:00
Transifex-Openfoodnetwork
26195314eb
Updating translations for config/locales/ca.yml
2019-07-05 00:09:05 +10:00
François Turbelin
912483660f
Put the uid under the permalink
2019-07-04 09:51:32 +02:00
François Turbelin
d12a7c2c76
Apply last suggestions
2019-07-04 09:43:35 +02:00
