Commit Graph

42 Commits

Author SHA1 Message Date
Matt-Yorkley
6219b3f0c3 Revert "Revert "Fix JS render-blocking in Darkswarm""
This reverts commit ffeca41e
2019-07-10 17:14:08 +01:00
Maikel
ffeca41ef4 Revert "Fix JS render-blocking in Darkswarm" 2019-07-10 10:24:25 +10:00
Matt-Yorkley
fbb97c3db8 Fix JS render-blocking in Darkswarm 2019-07-02 13:43:20 +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
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
Matt-Yorkley
5200937165 Safari/iOS iframe issue fix 2017-07-26 13:56:36 +10:00
Rob Harrington
1766da9d60 Adding ng-cloak directive to changeable orders banner 2017-05-19 15:54:55 +10:00
Rob Harrington
74d8dc48b4 Rewriting shopfront alert regarding changeable orders to be dynamic 2017-05-18 15:35:07 +10:00
Rob Harrington
b55036e165 Adding alert to shopfront to alert user to presence of orders open for editing 2017-05-05 14:20:57 +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
Maikel Linke
df36386757 Require customer instead of user
If a shop requires a login, then a customer needs to be logged in, not
just any user.
2016-03-24 18:24:46 +11:00
Maikel Linke
a48b992ec0 Shops can require users to login
Enterprise users have a new option to restrict their shopfronts to
logged in users only. If a guest visits one of these shopfornts, the
guest is prompted to login and is not shown any products.

Closes #849.
2016-03-18 16:46:28 +11:00
Maikel Linke
d562f6537e Cleaner opengraph meta tags 2016-01-20 15:42:01 +11:00
ludivinecp
a611e73bed Opengraph facebook: images and description for shops and groups and home => ok 2016-01-15 14:03:33 +11:00
Maikel Linke
85c99102dd i18n: Replacing all language strings in app/view/
Languages strings were moved to config/locale/en.yml. All views contain
according calls to t() now.
2015-08-28 16:59:23 +10:00
Rohan Mitchell
679531fe2a Prompt for clear cart when order cycle changes 2015-07-31 16:56:08 +10:00
Rohan Mitchell
4f2389e257 Remove legacy enterprises views - index, suppliers, distributors, show 2015-07-10 09:42:09 +10:00
Rohan Mitchell
02d68c662b Add titles to all darkswarm pages 2015-06-16 15:31:35 +10:00
Rohan Mitchell
5c3a59acab ng-cloak order cycles selector, tabs and shopfront 2015-05-29 16:39:41 +10:00
Rob Harrington
3ec3441cfa Replacing all uses of the old enterprise shop url helper 2015-01-22 10:19:43 +11:00
Rob Harrington
39889390ef Altering shop page routing so that shop url is copy-and-pastable 2015-01-22 10:19:42 +11:00
Rohan Mitchell
159d0a9dbe Remove most references to suburbs - previously used by new_landing_page, no longer used. 2014-07-17 14:26:04 +10:00
Will Marshall
406f8033fe Partialising the _distributor render 2013-11-06 15:36:39 +11:00
Rohan Mitchell
094485bc2d Sort enterprises by name, display direct-from-the-farm links separately at top 2013-10-31 15:52:22 +11:00
Rohan Mitchell
eb997c94a2 Mark inactive distributors on supplier distributors list 2013-10-31 14:59:47 +11:00
Rohan Mitchell
758676c1ea When visiting supplier page without selecting a distributor, provide choice of distributors that distribute their products 2013-10-31 14:49:26 +11:00
Rohan Mitchell
a136161dd6 When showing enterprise, do not show enterprise name when we're in this enterprise - fix duplicate name in header 2013-09-10 12:57:35 +10:00
alexs333
999bc2697a Implemented simlified shop flow. 2013-09-04 20:33:18 +10:00
alexs
cfffced652 Fixed the bug in the enterprise geo search. 2013-08-15 16:33:41 +10:00
alexs
0705c7af36 Added vertical separators for search results. 2013-08-15 11:37:50 +10:00
alexs
bdc8387346 Added base for shop front (enterprise). 2013-08-14 17:31:25 +10:00
alexs
6b760f3068 Added feedback info for search criteria. 2013-08-14 10:37:25 +10:00
alexs
779befe3cf Links to the enterpise pages. 2013-08-13 11:40:35 +10:00
alexs
f2f507c5c7 Suburb auto-complete functionality for the new landing page. 2013-08-12 17:34:56 +10:00
alexs
b5cc2ab4cf Added postcode search that redirect to page with map view. 2013-08-09 13:20:22 +10:00
alexs
f45ed42bdb Skeleton for the search results. 2013-08-08 11:42:45 +10:00
Rohan Mitchell
7640eb497a Merge branch 'supplied-active-products-on-hand'
Conflicts:
	app/controllers/application_controller.rb
	app/models/enterprise.rb
	app/views/spree/products/_source_sidebar.html.haml
	spec/features/consumer/distributors_spec.rb
	spec/models/enterprises_spec.rb
2013-07-29 11:05:42 +10:00
David Cook
7121860416 new view to display all distributors 2013-06-21 10:53:24 +10:00
Rohan Mitchell
63768df3d7 Replace distributor info box on product details and checkout pages with rich text field 2013-04-26 13:30:21 +10:00
Rohan Mitchell
6d84cf7613 Merge branch 'master' into enterprises
Conflicts:
	app/controllers/enterprises_controller.rb
	app/views/spree/checkout/_distributor.html.haml
	db/schema.rb
	spec/lib/open_food_web/group_buy_report_spec.rb
2012-11-01 11:02:02 +11:00
Rohan Mitchell
9d5c127f0d Add enterprises controller that supercedes suppliers and distributors controllers. Add to cart consumer spec passes. 2012-10-31 16:47:01 +11:00