raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-28 21:07:16 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,117 Commits 20 Branches 451 Tags
e4c8c19fea02db8a3297d7cb677391cb9ed24042
Commit Graph

489 Commits

Author SHA1 Message Date
Will Marshall
9eb43e6c09 Removing visible scopes from enteprise distributors and producers 2014-06-26 15:26:15 +10:00
Will Marshall
9cb6987645 Refactoring the supplied_taxons query to use SQL 2014-06-25 15:18:00 +10:00
Rohan Mitchell
3687479c22 Fetch distributed_taxons in SQL 2014-06-25 14:33:19 +10:00
Rob H
9099fca11c Merge branch 'bug-herd' into working 2014-06-23 22:01:41 +10:00
Rob H
9b126df5b6 Add variant display_name to reports 2014-06-23 14:31:16 +10:00
Will Marshall
1ed634239d Major refactoring 2014-06-20 16:31:49 +10:00
Will Marshall
9951f668e8 Adding 180x180 size to logo 2014-06-19 13:00:28 +10:00
Rohan Mitchell
4eee7d4901 Enterprise user can manage their enterprises' producer properties 2014-06-18 16:04:41 +10:00
Rohan Mitchell
e6674d43fa Admin can reorder producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
94c42abf56 Admin can update producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
84cd56cfdc Admin can list and create producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
92e3546a76 Retrieve properties for a product as a hash 2014-06-18 15:22:03 +10:00
Rohan Mitchell
0139c4bda2 Set producer property 2014-06-18 15:22:03 +10:00
Rohan Mitchell
9d8629f41f Add producer property model 2014-06-18 15:22:02 +10:00
Rob H
0611947306 Merge branch 'master' into sm-makeover 2014-06-18 10:39:40 +10:00
Rob H
004548a4fe Rearrange shipping method edit page 2014-06-18 10:21:21 +10:00
Will Marshall
d6098ec2de Fixing a private method 2014-06-13 14:23:44 +10:00
Will Marshall
f7c71568df Merge branch 'laura_and_will' 
Conflicts:
	app/models/spree/variant_decorator.rb
	db/schema.rb
	spec/models/spree/product_spec.rb
	spec/models/spree/variant_spec.rb
 2014-06-13 12:42:14 +10:00
Will Marshall
7a062b0310 Reworking the variant display of units and names 2014-06-12 16:13:51 +10:00
Rob H
8412d740ff Move distributors into sidebar for new & edit shipping methods screen 2014-06-12 16:10:30 +10:00
Rohan Mitchell
836a08606c Product and variant deletion removes the product or variant from any order cycles 2014-06-12 14:59:27 +10:00
Rohan Mitchell
083220089f WIP: Delete ExchangeVariants when product is soft-deleted 2014-06-12 14:59:27 +10:00
Rohan Mitchell
e6c7acdff3 Add soft-delete method to variant 2014-06-12 14:59:26 +10:00
Rob H
9f681bd1ef Use display_as as option value for variant when it is present 2014-06-12 12:57:56 +10:00
Rob H
1a91b5a728 Move option value naming logic into separate lib class 2014-06-12 12:55:53 +10:00
Rob H
c09aeeee8f Recalculate option values on variants when product variant unit is changed 2014-06-12 12:11:20 +10:00
Rob H
f688461e84 Add fields for variant display name and display as to bpe 2014-06-12 11:49:53 +10:00
Rob H
2c78d537fa Use display_as as option value for variant when it is present 2014-06-12 11:49:52 +10:00
Rob H
e9f2a8f2cd Move option value naming logic into separate lib class 2014-06-12 11:49:52 +10:00
Rob H
8e960c817a Merge branch 'master' into units 2014-06-11 12:43:40 +10:00
Will Marshall
4d7fa8b1bf Removing payments when emptying order 2014-06-10 11:15:04 +10:00
Will Marshall
37f197205f Removing shipping method from order when emptied 2014-06-06 16:39:53 +10:00
Rob H
43c5c37326 Add fields for variant display name and display as to bpe 2014-06-06 10:10:41 +10:00
Rohan Mitchell
1d44cbf506 Show distribution charge on report 2014-06-06 09:47:16 +10:00
Rohan Mitchell
f8fa014796 LineItem.supplied_by_any 2014-06-06 09:47:15 +10:00
Rob H
3240a4e08e Use display_as as option value for variant when it is present 2014-06-04 17:23:11 +10:00
Will Marshall
df7ee03cbf Adding presenters to the social media fields 2014-06-04 17:13:18 +10:00
Rob H
1ed5dcf994 Merge branch 'master' into units 2014-06-04 15:07:28 +10:00
Rob H
8d87cfbc35 Move option value naming logic into separate lib class 2014-06-04 14:54:42 +10:00
Rohan Mitchell
60711301c1 Initialise primary taxon in migration instead of in model callback 2014-06-03 11:29:54 +10:00
Rob H
f97ef0838c Rollback variant_unit_change check, auto-set primary taxons where they exist 2014-05-30 19:20:15 +10:00
Rob H
bf4d83aecc Fix master options_text display on front end 2014-05-30 18:39:41 +10:00
Rob H
66d6de9dfc Merge master (with primary taxons restored) 2014-05-30 15:45:48 +10:00
Rob H
69376e7f4b Merge in master 2014-05-30 15:10:13 +10:00
Will Marshall
7304e24591 Switching the image dimensions 2014-05-30 14:47:53 +10:00
Will Marshall
1c31ac56ea Adding primary taxon field to product 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
 2014-05-30 14:31:03 +10:00
Rob H
d9f7865572 Can add an image from redesigned new product page 2014-05-30 11:31:53 +10:00
Will Marshall
74211cbfc7 Merge branch 'master' into fixing_modals 
Conflicts:
	app/assets/javascripts/darkswarm/all.js.coffee
	app/assets/javascripts/darkswarm/controllers/products/product_node_controller.js.coffee
	app/assets/javascripts/darkswarm/directives/modal.js.coffee
	app/views/modals/_producer.html.haml
	app/views/modals/_product.html.haml
	app/views/shop/products.rabl
 2014-05-29 11:14:16 +10:00
Will Marshall
5eb54d1ac3 Merge branch 'groups_page' into fixing_modals 2014-05-28 16:04:55 +10:00
Will Marshall
b8cc9d3343 Modding image sizing on groups 2014-05-28 16:03:42 +10:00