raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-02-10 23:07:47 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,323 Commits 20 Branches 453 Tags
03b59eae75dda5cbb945bd35cecfb56db870d021
Commit Graph

85 Commits

Author SHA1 Message Date
Rohan Mitchell
94d50f220f Display an error message to admin when there are hubs in order cycles that are not ready for checkout 2014-10-31 12:22:02 +11:00
Rob Harrington
7113875a45 Adding welcome page to overview controller 2014-10-22 16:49:32 +11:00
Rob Harrington
3d938b3450 Shifting dashboard rendering from partials to templates 2014-10-22 12:30:07 +11:00
Rob Harrington
8bf472e970 Split dashboard into single and multiple enterprise views 2014-10-22 12:21:25 +11:00
Rafael Schouten
b821107c27 bugfix migration ad specs 2014-09-27 18:14:10 +10:00
Rohan Mitchell
b7708d750b Check authorisation for bulk update products 2014-09-05 15:10:15 +10:00
Rob H
d80166e80d Restrict access to show_provider_preferences action on payment methods controller 2014-08-08 17:47:50 +10:00
Rob H
f19af52556 WIP: angularised provider settings for payment method works on create (for admin only at this stage) 2014-08-08 17:47:50 +10:00
Rob H
f430267304 Specs for show_provider_preferences 2014-08-08 17:47:50 +10:00
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
Rohan Mitchell
3b28981400 Adapt cancel redirect for better spree paypal express 2014-07-25 12:44:14 +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
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
42b951c972 Variants controller #search filters by distribution 2014-07-16 10:31:12 +10:00
Rohan Mitchell
f18141c9bb Use controller login helpers 2014-07-16 10:29:58 +10:00
Rohan Mitchell
9dc02e5eac Add product soft-delete API action 2014-06-12 14:59:26 +10:00
Rob H
8e960c817a Merge branch 'master' into units 2014-06-11 12:43:40 +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
634af96a66 Update reports controller spec for multi-order-cycle params 2014-06-06 09:47:16 +10:00
Rob H
66a47f053c Amend products controller spec to include requirement for primary_taxon_id 2014-05-30 16:21:04 +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
20873b6e45 Patching a minor regression spec 2014-05-30 14:21:21 +10:00
Will Marshall
368fbd2383 Patching up admin redirects to be MOAR UNIVERSAL 2014-05-30 12:52:14 +10:00
Will Marshall
5b58bf2c71 Adding our own custom unauthorized page 2014-05-30 11:24:37 +10:00
Rob H
9b10a2cb94 Added 'Add Another' link to new product page. Altered redirects 2014-05-29 12:13:55 +10:00
Will Marshall
391b1da04c adding session token to order test 2014-05-21 10:46:03 +10:00
Will Marshall
ef91f8d17f Redirecting if cart is empty and activating the empty cart link 2014-05-20 16:05:28 +10:00
Will Marshall
5f712a8984 Removing code 2014-05-14 15:16:29 +10:00
Rohan Mitchell
3c8757034a Enterprise user can soft-delete a variant. BUT, only its own variants. 2014-04-24 13:20:16 +10:00
Rohan Mitchell
7931a2e8da Test managed products API access for all user types 2014-04-24 13:20:16 +10:00
Rohan Mitchell
6c86254a90 Extract sign_in_as_user method, test managed orders API access for normal user and enterprise user 2014-04-24 13:20:16 +10:00
Rohan Mitchell
95a6e34523 Spec access denied to regular user when soft-deleting variants 2014-04-24 13:20:16 +10:00
Rohan Mitchell
e6d988ff34 Nest variant soft delete route under product resource 2014-04-24 13:20:16 +10:00
Rohan Mitchell
e28a450875 Add API call to soft-delete a variant 2014-04-24 13:20:16 +10:00
Rob H
2eb21a024c Tiny fixes to API orders controller spec 2014-04-16 18:24:17 +10:00
Rob H
c68aeb4c36 Only show orders I am distributing in the API 2014-04-16 14:54:50 +10:00
Rob H
ff531f0e18 Producers can only list line items which contain products they supply 2014-04-11 09:39:01 +10:00
Rob H
e64bfe8ba3 Fix failing API Orders spec 2014-04-10 16:26:24 +10:00
Rob H
ab14bf70ab Merge branch 'bpe_issues' into bom 2014-03-27 15:39:37 +11:00
Rob H
cd1086ce05 WIP: Bulk calculation box work with shared resources 2014-03-26 16:44:26 +11:00
Will Marshall
74fb266748 Adding some requirement filters to the Orders controller 2014-03-21 15:18:27 +11:00
Rob H
cbd3722380 Merge branch 'master' into bom 2014-03-21 13:47:50 +11:00
Rob H
f2729f9e80 Add more columns to BOM 2014-03-21 13:46:48 +11:00
Rob H
ed0b7da20f BOM page has a fancy calculation box for managing group buys 2014-03-20 14:40:24 +11:00
Rohan Mitchell
0d97397084 Fix fragile specs (ordering) 2014-03-12 15:00:20 +11:00
Rob H
b6bd07abd3 BOM: show name from billing address 2014-03-07 12:56:39 +11:00
Rob H
43a4a3dd5a Alter on_hand counts for products to fix broken specs 2014-03-06 13:14:06 +11:00
Rob H
0726d591ac BOM: can filter by order cycle 2014-03-06 10:50:27 +11:00
Rob H
9373dcea3d Merge branch 'master' into bom 2014-01-31 12:32:23 +08:00