Jean-Baptiste Bellet
4ad2a1a723
Prefer a concern that set a variable instead of a global helper
...
Therefor, for the right controllers, simply implements:
```
include WhiteLabel
before_action :hide_ofn_navigation, only: [:show, :edit]
```
This is mort robust, since we're working in a controller level, not parsing URLs...
2023-03-30 09:17:57 +11:00
Matt-Yorkley
1ee3d0f7a1
Drop embedded shops code
2022-01-26 19:58:39 +00:00
Matt-Yorkley
dfbd384c95
Refactor embedding to a Concern
2022-01-18 12:22:06 +00:00
Matt-Yorkley
1d5077061e
Remove andand
...
This old gem implemented some functionality for handling nils which is no longer needed, as it's provided natively by Ruby with the &. operator.
2021-09-08 14:28:31 +01: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
Luis Ramos
53d758ca21
Replace render text with render plain for rails 5.1
2021-03-16 23:13:58 +00:00
Matt-Yorkley
f1002b953d
Disable Javascript CSRF protection on EnterprisesController#check_permalink route
...
This route checks if an enterprise permalink is taken or not. Allowing the route to be accessed via Javascript without strict CSRF protection is reasonable. Fixes the following errors:
ActionController::InvalidCrossOriginRequest: Security warning: an embedded <script> tag on another site requested protected JavaScript. If you know what you're doing, go ahead and disable forgery protection on this action to permit cross-origin JavaScript embedding.
2020-11-27 13:59:46 +00: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
8a61257547
Rename all before_filter to before_action, it's the same function with a new name
2020-06-22 13:11:57 +01:00
Luis Ramos
c9a7a6e897
Merge branch 'master' into 3-0-stable-jun-2
2020-06-02 16:00:45 +01:00
Luis Ramos
4026e072d5
Break OrderCartReset in two steps so that memoized method current_customer (that uses memoized current_distributor) is called after reset_distributor
2020-05-26 11:13:16 +01:00
Luis Ramos
f34f693620
Merge branch 'master' into 3-0-stable-may-22
2020-05-22 22:54:19 +01:00
Luis Ramos
a438317d69
Extract order_cart_reset service from enterprises_controller
2020-05-15 19:30:00 +01:00
Luis Ramos
21d1a7bc04
Remove dead code
2020-05-15 19:29:37 +01:00
Luis Ramos
94bb95861b
If selected OC is not in the available OCs, empty the order
2020-05-15 19:29:35 +01:00
Luis Ramos
52e7ca2417
Select first default OC only if no OC is already selected
2020-05-15 14:26:56 +01:00
Luis Ramos
c3f0c0ed7f
Extract method to prepare work ahead
2020-05-15 14:25:20 +01:00
Luis Ramos
384ca310a3
Merge branch 'master' into 3-0-stable-apr3
2020-04-03 18:26:26 +01:00
Luis Ramos
1c1f066884
Extract Shop::OrderCyclesList from base_controller
2020-03-20 09:47:59 +00:00
Luis Ramos
d5cf355a11
Call fetch_order_cycles from reset_order_cycles so we dont repeat the calculation
...
BaseController#set_order_cycle cant be used in reset_order_cycle because it will empty the order if the OC is not defined previously
2020-03-20 09:47:59 +00:00
Luis Ramos
8c367a2ed2
Merge branch 'master' into 3-0-stable-mar6
2020-03-09 13:20:19 +00:00
Eduardo
4c3916a93d
redirect to shops list when an enterprise is not found
2020-02-26 19:25:38 -03:00
Matt-Yorkley
53645517af
Update deprecated #find_by_* methods
2020-02-22 11:06:51 +00:00
luisramos0
9404aacfb2
run rubocop --auto-correct
2019-11-10 18:42:43 +00:00
Maikel
5b0c8bbaef
Merge pull request #3836 from Matt-Yorkley/fast_and_furious2
...
Improve /shops, /producers, and /groups performance
2019-06-21 15:02:19 +10:00
luisramos0
02b9fca620
Remove unused spree checkout and spree cart routes
2019-06-18 10:49:19 +01:00
Matt-Yorkley
785595a951
Reduce initial queries on shop page by ~95%
2019-06-12 09:47:01 +01:00
Matt-Yorkley
0aa8b1a30e
Make shop hidden ams injection consistent with other uses
2019-06-12 09:47:01 +01:00
luisramos0
86b0d71c7e
Result of rubocop auto-correct and rebuilding rubocop_manual_todo
2019-05-28 12:57:29 +01:00
luisramos0
4a67acf954
Removing a few rubocop warnings
2019-05-28 12:55:17 +01:00
Pau Perez
ddf916814f
Reduce complexity of EnterprisesController#shop
...
As asked by Rubocop.
2019-01-03 11:17:10 +01:00
Pau Perez
51da607ab1
Fix too long line
2019-01-03 11:17:10 +01:00
Pau Perez
46760ce28c
Do not double-render when there is no stock
2019-01-03 11:17:10 +01:00
Pau Perez
cca15e75a6
Refactor to reveal how we load enterprises in shop
...
By sticking to Rails conventions we make it more obvious how (badly) we
are loading enterprises in EnterprisesController#shop and shed some
light on the obscure InjectionHelper.
This will also make it easier to improve its performance in the future as
it's among the top offenders. See https://www.skylight.io/app/applications/ibo3NOqCYMnq/1545851520/1d/endpoints/EnterprisesController%23shop?responseType=html
2019-01-03 11:17:10 +01:00
Pau Perez
b23cb55525
Fix current violations of Style/Send cop
2018-09-05 12:05:05 +02:00
Pau Perez
3161fa3801
Auto correct Rubocop's Layout/EmptyLinesAroundExceptionHandlingKeywords cop
2018-04-09 18:47:17 +02:00
Pierre de Lacroix
54e141489a
Add noindex meta tag for invisible shops and staging environment
2017-11-09 12:04:27 +11:00
Rob Harrington
620721c8cb
Use find_by_id instead of find in EnterpriseController
2017-09-23 14:58:34 +10:00
Rob Harrington
22bbe29f3d
Call single-use before_filters from actions instead
2017-09-23 14:58:34 +10:00
Rob Harrington
0e14704572
Kill empty space
2017-09-23 14:58:33 +10:00
stveep
9ac638f8ba
Fix some leftover refactoring from an earlier modification to enterprises controller (now not needed as moved to admin/enterprises)
2017-09-23 14:57:02 +10:00
Steve Pettitt
06279848c6
Stripe auth and callback working. Still need to process callback.
2017-09-23 14:57:02 +10:00
Steve Pettitt
df18329233
Starting Stripe integration
2017-09-23 14:57:01 +10:00
Matt-Yorkley
113f6565be
Enable iframes for embedded shopfronts
2017-07-26 13:56:36 +10:00
Rohan Mitchell
d3ad823d97
Remove CMS configuration, gem. Fix permalink check dependent on CMS glob path.
2016-07-29 09:18:30 +10:00
Maikel Linke
c253d73d11
Refactoring with feedback on pr #1073
2016-06-29 15:46:51 +10:00
Maikel Linke
e284ad62b2
Inject only relative enterprises into shopfront
...
Other shops displayed in producer modals are lazy loaded when opening
their modal.
2016-06-17 17:15:16 +10:00
Rob Harrington
1cb51b5c71
CodeClimate fixes for filter-products branch
2016-05-27 16:23:26 +10:00
Rob Harrington
48d4c8733d
When we load up incomplete orders, make sure that they have a user associated if the user is logged in
...
Also associate customer ONLY if one already exists. This is required to prevent unauthorised access to customer-only shopfronts.
2016-05-27 16:23:26 +10:00
Rohan Mitchell
3dcfa810fd
Display out of stock banner when viewing cart directly
2016-04-21 09:36:23 +10:00
