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
3,291 Commits 21 Branches 450 Tags
75a59eb5ccdf1be448dbebc86c2b2861baa687d0
Commit Graph

504 Commits

Author SHA1 Message Date
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
Rohan Mitchell
94902268e2 Initialise enterprise country in controller, not model. Fixes address SQL load every time an enterprise is instanciated. 2014-07-04 14:39:27 +10:00
Rohan Mitchell
8f6a2575b7 Minor code formatting changes 2014-07-04 14:39:26 +10:00
Will Marshall
c57148340c Fixing spec regression 2014-07-04 14:39:26 +10:00
Will Marshall
6d4dfad336 OK address no longer being lazy-loaded 2014-07-04 14:39:26 +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
29fde37ba3 Merge branch 'bug-herd' into working 2014-07-03 14:24:39 +10:00
Rob H
934f960336 Add display as to new product page 2014-06-26 15:27:24 +10:00
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