raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-03-05 02:41:33 +00:00
Code Issues Packages Projects Releases Wiki Activity
12,629 Commits 20 Branches 455 Tags
a57504ba1fef7c828c5d286a5fb9797240ea297e
Commit Graph

1134 Commits

Author SHA1 Message Date
Will Marshall
20d7484134 Merge branch 'master' into laura_and_will 
Conflicts:
	app/assets/javascripts/darkswarm/services/order.js.coffee
 2014-07-28 13:43:31 +10:00
Will Marshall
a5f478bde7 Ajax submission of max quantity 2014-07-28 13:33:13 +10:00
Rob H
c4e50dbb13 Change error message for blank Product Category 2014-07-23 15:46:17 +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
d7a5eb47f3 Store all images in a consistent path, compatible with development, and support S3 all round 2014-07-17 11:07:34 +10:00
Rohan Mitchell
c40c586b6f Store taxon icons in a path consistent with products 2014-07-17 10:23:07 +10:00
Will Marshall
cd033c300e Reworking order populator and controller to handle replacement of line items rather than addition 2014-07-16 16:00:28 +10:00
Rohan Mitchell
b7a08bcb9b Add Spree::Variant.in_order_cycle 2014-07-16 09:33:59 +10:00
Rohan Mitchell
0ecfee79d4 Add Spree::Variant.in_distributor 2014-07-16 09:33:59 +10:00
Rob H
fa337fcd6e Prevent display_as and display_name from being used when blank 2014-07-10 17:04:35 +10:00
Rohan Mitchell
ba964d54d9 Update spree and spree_auth_devise 2014-07-04 17:07:58 +10:00
Will Marshall
0177a56408 Caching address and touching enterprise on save 2014-07-04 14:39:26 +10:00
Will Marshall
23034a55d4 Adding tests and full touch behaviour for caching 2014-07-04 14:39:26 +10:00
Will Marshall
3195e20b65 cleaning up touches 2014-07-04 14:38:27 +10:00
Will Marshall
8b439c4e69 Temporary/demonstration caching behaviour, INCOMPLETE 2014-07-04 14:38:27 +10:00
Rob H
3da2461af5 Require shipping methods to have at least one distributor 2014-07-04 14:05:44 +10:00
Rob H
934f960336 Add display as to new product page 2014-06-26 15:27:24 +10:00
Rob H
9b126df5b6 Add variant display_name to reports 2014-06-23 14:31:16 +10:00
Rohan Mitchell
4eee7d4901 Enterprise user can manage their enterprises' producer properties 2014-06-18 16:04:41 +10:00
Rohan Mitchell
92e3546a76 Retrieve properties for a product as a hash 2014-06-18 15:22:03 +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
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
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