raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-26 20:56:48 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,200 Commits 18 Branches 451 Tags
bf61d12bfaedabb0fe1dd117a4e2b6f4f0552e64
Commit Graph

36 Commits

Author SHA1 Message Date
Rob H
ee4a1925fe Bulk Order Management works with navigation helper override 2014-09-06 00:34:27 +10:00
Rohan Mitchell
abe592c9a3 Allow Reports admin tab to be enabled/disabled through cancan :report resource 2014-08-19 14:22:19 +10:00
Will Marshall
edaba844d9 Merge branch 'laura_and_will' into new_cart 
Conflicts:
	app/views/shop/products/_form.html.haml
	app/views/shop/products/_master.html.haml
	app/views/shop/products/_variants.html.haml
 2014-07-18 17:02:19 +10:00
Rohan Mitchell
19118da82e Remove old landing page cruft 2014-07-17 14:26:07 +10:00
Will Marshall
158bdd145f All the new serializers and some specs 2014-07-17 14:23:09 +10:00
Will Marshall
547d9f9f5c Moving payment methods and shipping methods into their own services 2014-07-17 14:19:39 +10:00
Will Marshall
c640233ee5 Merge branch 'master' into laura_and_will 
Conflicts:
	app/assets/javascripts/darkswarm/filters/taxons.js.coffee
	app/models/enterprise.rb
	app/serializers/api/enterprise_serializer.rb
	db/migrate/20140702053145_add_fields_to_distributors_shipping_methods.rb
	db/schema.rb
	spec/helpers/shared_helper_spec.rb
	spec/javascripts/unit/darkswarm/filters/shipping_spec.js.coffee
	spec/javascripts/unit/darkswarm/filters/taxons_spec.js.coffee
	spec/javascripts/unit/darkswarm/services/taxon_spec.js.coffee
	spec/models/enterprise_spec.rb
 2014-07-09 11:40:54 +10:00
Rohan Mitchell
30262e1969 Clean up specs, fix broken spec, remove JS log 2014-07-04 14:39:27 +10:00
Rohan Mitchell
206275b794 Code cleanups 2014-07-04 14:39:27 +10:00
Will Marshall
24d3abf6d5 Adding dereferencing to taxons and reducing our data-set 2014-07-04 14:38:27 +10:00
Will Marshall
487b8616c0 Adding dereferencing to taxons and reducing our data-set 2014-07-04 13:51:22 +10:00
Will Marshall
9667b84c5c Finishing the transition to AMS from RABL 2014-06-26 11:07:53 +10:00
Will Marshall
476eeef69d Starting on on the map 2014-06-05 12:18:26 +10:00
Will Marshall
e44853346e Dropping current producers, switching to suppliers and using Angular 2014-05-29 16:12:58 +10:00
Will Marshall
eab9c28d2e Adding groups to this branch, also tidying up the shop stuff for Laura 2014-05-16 14:00:33 +10:00
Will Marshall
3ed569b24a Patching a couple of borked specs 2014-04-24 09:52:29 +10:00
Will Marshall
00f5d09d65 Moving our inputs to magical helpers 2014-04-10 14:48:22 +10:00
Rohan Mitchell
93db813b3a Make current_producers helper more resilient 2014-03-27 10:25:05 +11:00
Rohan Mitchell
f7d8d866eb Show two linebreaks for end of block level tags, strip whitespace from end of string 2014-03-12 13:52:13 +11:00
Rohan Mitchell
011668c0b6 Display line breaks in order confirmation email distributor info 2014-03-12 13:34:34 +11:00
Will Marshall
4a6c00e592 Removing bangs from stub since it's totes deprecated 2014-02-27 16:15:42 +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
Will Marshall
cec0ad8a83 Adding ze boilerplate 2014-02-07 13:55:25 +11:00
Will Marshall
ec72e9137a We can now hit the index page 2013-12-05 15:07:46 +11:00
Will Marshall
f525b7aea1 Adding the distributors controller 2013-12-04 15:58:25 +11:00
Will Marshall
317b2f1ced Helperizing some of the order cycles stuff 2013-11-08 15:19:27 +11:00
Will Marshall
f0d335a454 Fixing up the failing spec for distributor changes, reworking a method to SharedHelper 2013-11-07 11:47:05 +11:00
Rohan Mitchell
34638c0bf9 Remove pry from spec 2013-10-31 16:27:13 +11:00
Rohan Mitchell
a3b96070d5 Use helper instead of manually creating a subject 2013-10-31 11:40:28 +11:00
Rohan Mitchell
803594b4d7 Confirm change hub when it would empty cart 2013-09-23 10:07:25 +10:00
Rohan Mitchell
7b5eca3a50 Fix error when generating checkout email when distributor_info is nil 2013-08-20 09:19:23 +10:00
Rohan Mitchell
43f482a803 Remove use of deprecated rspec syntax 2013-08-13 09:11:26 +10:00
Rohan Mitchell
e1b2490259 Selecting an order cycle highlights valid distributor choices 2013-03-08 15:17:23 +11:00
Rohan Mitchell
72a9286457 Add helper to generate a local/remote class for order cycle selection 2013-03-08 15:17:22 +11:00
Rohan Mitchell
258559f9d0 Update the price on the product details page in real time when the variant or the quantity are changed 2012-07-01 10:07:08 +10:00
Rohan Mitchell
3ad575cb5f Display variant price differences as absolute, not relative values 2012-06-26 09:54:00 +10:00