raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-25 20:46:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
7,978 Commits 21 Branches 450 Tags
113f6565be71cf2b2cf2ca0c3ee622f576f8e1fc
Commit Graph

55 Commits

Author SHA1 Message Date
Matt-Yorkley
113f6565be Enable iframes for embedded shopfronts 2017-07-26 13:56:36 +10:00
Rob Harrington
7bb58342fc Rubocop: Auto-correct Style/EmptyLineBetweenDefs offences 2017-06-23 16:49:08 +10:00
Rohan Mitchell
8f0bc367d0 Include missing helpers 2016-11-04 09:39:17 +11:00
Rohan Mitchell
b540f645c3 Split CSS to overcome IE9's 4096 rule limit 2015-06-16 11:57:50 +10:00
Maikel Linke
e35b39c7cf Handle invalid referer URLs 
Rescues URI::InvalidURIError of URL(request.referer).
 2015-06-05 12:43:49 +10:00
Rob Harrington
5940ff2b2c Don't override devise's after_sign_in_path_for, use specific before filters for user sessions and registrations controllers instead 2015-04-16 16:56:27 +10:00
Rohan Mitchell
15b05de7f2 Fix specs: Distributors require shipping and payment method 2014-11-01 10:42:38 +11:00
Rohan Mitchell
8488b8e469 When user has selected a hub that is not ready for checkout, unselect it 2014-10-31 15:02:58 +11:00
Rohan Mitchell
c21d5cc3dc Remove redirect to certified hostname - this is now performed by nginx. Fixes SSL errors. 2014-06-12 14:59:27 +10:00
Will Marshall
dbf4f503a9 Restoring my clever flash refactoring 2014-06-10 11:14:52 +10:00
Rohan Mitchell
be644bdcc3 Revert "Reworking flash messages hooray" 
This reverts commit c9d0091cd9.
 2014-06-06 16:59:47 +10:00
Will Marshall
c9d0091cd9 Reworking flash messages hooray 2014-06-06 16:41:28 +10:00
Will Marshall
368fbd2383 Patching up admin redirects to be MOAR UNIVERSAL 2014-05-30 12:52:14 +10:00
Will Marshall
151702d685 Catching order cycle expiry and redirecting 2014-05-14 11:51:25 +10:00
Rohan Mitchell
04379101e1 Change to new production hostname: openfoodnetwork.org.au 2014-05-09 16:39:39 +10:00
Will Marshall
b907616749 Renaming our partials 2014-05-02 14:47:12 +10:00
Will Marshall
6ad30d901d Tidying down shop/checkout test 2014-05-01 16:22:11 +10:00
Will Marshall
e7d6e7e564 Removing the sidebar before filter stuff, since we're not using it anymore 2014-04-30 12:15:57 +10:00
Will Marshall
74fb266748 Adding some requirement filters to the Orders controller 2014-03-21 15:18:27 +11:00
Will Marshall
d6c71d5416 Fixing a nil bug in the referrer handling on login 2014-02-27 16:24:10 +11:00
Will Marshall
19fa7200f3 Fixing the login redirection issue 2014-02-27 14:47:56 +11:00
Will Marshall
7af1d72ef9 Working login and signup forms for checkout, specs, redirect back to checkout on success 2014-02-07 16:07:18 +11:00
Rohan Mitchell
3a2394675f Rename OrderCycle#expired? to #closed? 2013-11-22 11:08:42 +11:00
Rohan Mitchell
767bda3093 Redirect /products to enterprise path, since this page did not have correct product filtering 2013-10-24 11:33:03 +11:00
Rohan Mitchell
e3307623dd When order cycle expires, clear cart and display a message (from BaseController) 2013-10-23 17:16:07 +11:00
Rohan Mitchell
761bafe375 Rename text labeling from open food web to open food network 2013-10-18 17:46:05 +11:00
Rohan Mitchell
4b7fc8b5e4 In production, redirect to hostname with the SSL certificate 2013-10-14 10:44:14 +11:00
Rohan Mitchell
072ce67b78 Redirect if distributor not chosen 2013-09-23 13:39:13 +10:00
Rohan Mitchell
36a124c10e Fix merge issues: DCV name change and application controller var name issues. 2013-07-29 11:49:43 +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
66d345d360 fix 'x more' count, disable sidebar limit (config for this to be implemented later) 2013-07-22 14:53:08 +10:00
David Cook
5b58351b73 minor changes 2013-06-28 17:04:58 +10:00
David Cook
250e76c281 Fix incorrect count of enterprises (due to bug in rails issue #5554) 2013-06-21 15:10:21 +10:00
David Cook
b0e4bef75e rename sidebar collection variables to avoid clash, fix count to be distinct 2013-06-21 10:42:42 +10:00
David Cook
1abc0dac68 rename vars again 2013-06-14 17:36:38 +10:00
David Cook
423bd52fd6 rename _count vars to _total 2013-05-22 14:03:51 +10:00
vagrant
4e7f966429 add suppliers scope, limit by 5, test 2013-05-22 13:07:30 +10:00
Rohan Mitchell
955f313abc Remove require for queries_product_distribution 2013-03-08 16:59:47 +11:00
Rohan Mitchell
c9d1573049 Remove placeholder scopes, use new Enterprise.active_distributors scope for loading sidebar distributors 2013-03-08 16:56:58 +11:00
Rohan Mitchell
e326e590db Implement and use scopes for finding products by distributor via order cycle or product distribution 2013-03-08 15:18:53 +11:00
Rohan Mitchell
265336b70c When looking up distributors for sidebar, include both those in ProductDistributions and in OrderCycles 2013-03-08 15:18:53 +11:00
Rohan Mitchell
666f110d47 Load distributor list from those in an active order cycle 2013-03-08 15:17:23 +11:00
Rohan Mitchell
34cb8bab26 View order cycle and distributor choices 2013-03-08 15:15:15 +11:00
Rohan Mitchell
2a645d04ae Move presentation to presenter, display calculator fields 2012-11-22 14:37:38 +11:00
Rohan Mitchell
c2133d70ac Rename Enterprise is_supplier scope to is_primary_producer 2012-11-01 15:02:57 +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
Rohan Mitchell
c46019d68c WIP: Move Supplier, Distributor, DistributorSet and ProductDistribution models out of Spree namespace 2012-10-25 10:45:39 +11:00
Rohan Mitchell
3dd3d8030f Display CMS pages in menu 2012-10-11 17:00:34 +11:00
Rohan Mitchell
9f013f0e37 When loading distributors for sidebar, only show those that have active products on hand 2012-08-04 17:51:08 +10:00
Rohan Mitchell
768a170bb8 Fix with_products_on_hand query for server db compatibility 2012-08-03 08:21:45 +10:00