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
3,319 Commits 18 Branches 451 Tags
22003920315ac1353133d0daadceecba714aa916
Commit Graph

679 Commits

Author SHA1 Message Date
Rob H
2200392031 Angularising Admin enterprises form 2014-07-24 10:16:54 +10:00
Rohan Mitchell
03273a76ad Merge branch 'fix_units' 2014-07-18 14:11:41 +10:00
Rohan Mitchell
7db2aff398 Generate variantUnitOptions - DRY 2014-07-18 14:10:42 +10:00
Rohan Mitchell
8484d19144 Convert variant_unit_options to a method, camelcase 2014-07-18 12:44:58 +10:00
Rohan Mitchell
04eca9591b Derive unitScales from unitNames 2014-07-18 12:39:16 +10:00
Rohan Mitchell
52b74bde91 Extract unit names from OptionValueNamer into VariantUnitManager 2014-07-18 12:39:16 +10:00
Rohan Mitchell
ed66633a93 Add comment 2014-07-18 12:39:16 +10:00
Rohan Mitchell
ab1628681e Call VariantUnitManager directly 2014-07-18 12:39:16 +10:00
Rohan Mitchell
8d5f953f78 Extract getScale from BOM controller to VariantUnitManager, extract specs as well 2014-07-18 12:39:16 +10:00
Rohan Mitchell
eafdf85c28 Extract class methods to new class VariantUnitManager 2014-07-18 12:39:11 +10:00
Rohan Mitchell
6c59ffc16f Switch to class case for OptionValueNamer 2014-07-18 10:06:13 +10:00
Rohan Mitchell
91e4f24fde Extract JS unit options into option value namer 2014-07-17 16:57:23 +10:00
Rohan Mitchell
989a14fa37 Change KL to kL, update specs for ML to kL change 2014-07-17 16:16:08 +10: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
Rohan Mitchell
75a59eb5cc Rename JS file so that it is loaded after the spree code it is overriding. Admin can't add products outside distribution to an order. 2014-07-16 11:26:22 +10:00
Rohan Mitchell
edeb820c64 Send distributor and order cycle id to order add variant autocomplete search 2014-07-16 09:33:59 +10:00
Rafael Schouten
58e6379e43 Merge branch 'master' into fix_units 
Conflicts:
	app/assets/javascripts/admin/products/units_controller.js.coffee
 2014-07-14 15:10:26 +01:00
Will Marshall
744f254353 Patching a minor bug 2014-07-11 17:02:43 +10:00
Will Marshall
500e067cfb Performance enhancements 2014-07-11 16:14:44 +10:00
Will Marshall
7bd65d7854 Performance improvements 2014-07-11 15:09:44 +10:00
Will Marshall
61dbc2cd63 Replace for shipping selector 2014-07-11 12:54:40 +10:00
Will Marshall
21d1d2d1c1 Replacing taxon directive 2014-07-11 12:53:32 +10:00
Will Marshall
190e320bad Pulling some structure out of directives 2014-07-11 12:45:08 +10:00
Will Marshall
fecc68cff8 Dereferencing product Taxons 2014-07-11 12:40:49 +10:00
Will Marshall
ef55bf97c6 Bunch of small fixes for Laura 2014-07-11 12:37:38 +10:00
Will Marshall
7dde721486 Adding taxon filtering 2014-07-10 15:26:35 +10:00
summerscope
34cb672a8d Adjust column layouts / responsive breakpoints for filter systems 2014-07-10 12:21:54 +10:00
Will Marshall
da02f9c0b0 Adding icons to shipping selectors 2014-07-10 12:02:34 +10:00
Will Marshall
409d647f62 Fixing up hubs page 2014-07-10 11:38:17 +10:00
summerscope
11ec596133 Layout adjust for taxon filters 2014-07-09 17:23:58 +10:00
summerscope
b43f687cf4 Tweak to producers - turn filters off by default 2014-07-09 16:54:35 +10:00
summerscope
d9a3d22330 Tweak labels for filter button 2014-07-09 16:53:26 +10:00
summerscope
9587b2a2ed Merge branch 'laura_and_will' of github.com:openfoodfoundation/openfoodnetwork into laura_and_will 
Conflicts:
	app/views/producers/_filters.html.haml
 2014-07-09 16:18:41 +10:00
summerscope
a4729a8d12 Tweak layout on taxon filters 2014-07-09 16:15:27 +10:00
Will Marshall
c8ee4a594c Some text changes and similar magic 2014-07-09 16:10:08 +10:00
Will Marshall
6f3f40e2e6 Adding query string to search params 2014-07-09 15:45:05 +10:00
Will Marshall
eb9ec1497c Backwards 2014-07-09 14:26:42 +10:00
Will Marshall
fb8d7907f9 Rearchitecting the thing 2014-07-09 14:07:38 +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
Will Marshall
7d39c30dbd Fixing a taxon bug 2014-07-09 10:54:40 +10:00
Will Marshall
0b27040dcb Taxon selection finesse 2014-07-09 10:53:52 +10:00
Will Marshall
eb8f59d65b Tests for the taxon filtering 2014-07-04 15:19:45 +10:00
Rohan Mitchell
30262e1969 Clean up specs, fix broken spec, remove JS log 2014-07-04 14:39:27 +10:00
Will Marshall
6d4dfad336 OK address no longer being lazy-loaded 2014-07-04 14:39:26 +10:00
Will Marshall
61d8be3ddc Removing old file, renaming one to match naming conventions 2014-07-04 14:39:26 +10:00
Will Marshall
24d3abf6d5 Adding dereferencing to taxons and reducing our data-set 2014-07-04 14:38:27 +10:00
Will Marshall
4a116570d1 adding by producer id filtering 2014-07-04 14:38:27 +10:00
Will Marshall
e858c0d434 Moving taxon filter to ID instead of name 2014-07-04 14:38:27 +10:00
Will Marshall
8b98c72336 Adding all the Angular filters required to make this work 2014-07-04 14:38:27 +10:00
Will Marshall
f335b6a576 Taxon selectors and show/hide behaviour 2014-07-04 14:09:53 +10:00