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,248 Commits 18 Branches 451 Tags
fa337fcd6ea0c3bfcdc60ca910602bdd5e1fa901
Commit Graph

344 Commits

Author SHA1 Message Date
Rob H
3da2461af5 Require shipping methods to have at least one distributor 2014-07-04 14:05:44 +10:00
Rob H
51d3f65934 Remove spree's product tab for all but admin users 2014-06-23 22:01:19 +10:00
Rob H
2861191ab7 Merge branch 'sm-desc' into working 2014-06-20 09:43:58 +10:00
Rob H
0d7c682b85 Remove shipping category from admin edit shipping methods 2014-06-19 18:31:52 +10:00
Rohan Mitchell
4eee7d4901 Enterprise user can manage their enterprises' producer properties 2014-06-18 16:04:41 +10:00
Rohan Mitchell
c3cec34186 Redirect to enterprises page after updating producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
e6674d43fa Admin can reorder producer properties 2014-06-18 15:28:41 +10:00
Rohan Mitchell
27fa93dbb4 Admin can remove 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
Rob H
6809d70397 Redirect user back to enterprise edit page after saving 2014-06-18 13:18:33 +10:00
Rob H
3884b0cc1b Adding a direct link to shopfront to enterprise edit page for distributor enterprises 2014-06-18 12:37:26 +10:00
Rob H
45b16d52dd Add visible checkbox to enterprises index page to allow bulk editing of visibility 2014-06-18 11:44:47 +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
Rob H
8412d740ff Move distributors into sidebar for new & edit shipping methods screen 2014-06-12 16:10:30 +10:00
Rohan Mitchell
b970f54f53 Admin UI soft-deletes variants, not hard delete 2014-06-12 14:59:27 +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
8e960c817a Merge branch 'master' into units 2014-06-11 12:43:40 +10:00
Rohan Mitchell
12809438ac Orders and fulfilment report handles order cycles with nil opening or closing times 2014-06-11 10:33:59 +10:00
Will Marshall
94b7601d73 Patching authorization tests 2014-06-10 14:01:25 +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
05c62634fc Further overlapping elements fixes 2014-06-05 14:49:41 +10:00
Rohan Mitchell
2bedc431e8 Fix spec fragility - overlapping elements error 2014-06-05 13:43:41 +10:00
Rob H
29fbf0438b Adding all fields to new admin product spec 2014-06-04 11:42:42 +10:00
Rob H
1d5cc5dced Adding specs for new product creation 2014-05-30 16:38:29 +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
be640fd856 Patching a spec and naming something 2014-05-30 15:02:47 +10:00
Will Marshall
a7340df6a5 Removing some dud test content 2014-05-30 14:45:27 +10:00
Will Marshall
b736145552 Adding primary taxon to admin forms 
Conflicts:
	db/migrate/20140522044009_add_primary_taxon_to_products.rb
	spec/features/admin/products_spec.rb
 2014-05-30 14:31:27 +10:00
Will Marshall
2b0bdc69cd Fixing a scope issue 2014-05-30 13:01:16 +10:00
Will Marshall
638d6d2ac0 Moving around the authentication specs 2014-05-30 12:58:58 +10:00
Will Marshall
b757629bfa Minor test tweaks 2014-05-29 11:52:46 +10:00
Rohan Mitchell
cc2498bb9b Fix spec fails - group buy and available on removed from new product form 2014-05-24 18:26:02 +10:00
Rohan Mitchell
acbe49b8de Revert primary taxons 2014-05-24 17:13:01 +10:00
Will Marshall
0a8f5d91ba Adding primary taxon to admin forms 2014-05-24 09:29:26 +10:00
Rohan Mitchell
79393476b0 Revert "Adding primary taxon to admin forms" 
This reverts commit 110a6f2d14.
 2014-05-24 09:07:56 +10:00
Will Marshall
110a6f2d14 Adding primary taxon to admin forms 2014-05-23 15:59:06 +10:00
Rohan Mitchell
9b15c213d1 When an enterprise user saves an order cycle for which it manages only some of the enterprises involved, do not delete the other exchanges 2014-05-23 11:28:00 +10:00
Will Marshall
015403c282 Merge branch 'new_shop' 2014-05-22 12:40:48 +10:00
Will Marshall
c69a4a5f1a Adding social media links 2014-05-22 12:12:10 +10:00
Rohan Mitchell
a16f726377 Extract have_relationship test 2014-05-22 11:32:37 +10:00
Rohan Mitchell
c2f762d570 Enterprise user can only see relationships involving their enterprises 2014-05-22 11:27:19 +10:00
Rohan Mitchell
06955a024f Enterprise user can only create relationships with their own enterprises as parent 2014-05-22 11:02:03 +10:00
Rohan Mitchell
48a7b9c3f8 Fix specs from 'X permits Y' table format change 2014-05-22 08:50:52 +10:00
Rohan Mitchell
5d0680234d Admin can delete enterprise relationships 2014-05-21 11:29:11 +10:00
Rohan Mitchell
b9a9937541 Attempting to create a relationship with invalid data shows an error message 2014-05-21 11:29:11 +10:00
Rohan Mitchell
9b2a80c6b5 Admin can create enterprise relationships 2014-05-21 11:29:11 +10:00
Rohan Mitchell
5f4e4ebeb0 Admin can list enterprise relationships 2014-05-21 11:29:11 +10:00