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,570 Commits 18 Branches 451 Tags
27e992ebcbe3cbcf2dd4e4e10f4c991f0e2a14ca
Commit Graph

267 Commits

Author SHA1 Message Date
Rob H
27e992ebcb Staggered loading of products in BPE 2014-08-08 14:05:51 +10:00
Rob H
b9f49344b4 BPE: Switch column toggle to dropdown, clean up specs 2014-08-08 14:05:51 +10:00
Rob H
1abbc7fa86 Switch data injection for BPE over to AMS 2014-08-08 14:05:50 +10:00
Rob H
30a14edb06 Adding 'Total Units' field to supplier report 2014-08-07 14:21:01 +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
fd3040d394 Call reset order callback when order completed via paypal 2014-07-25 12:44:14 +10:00
Rohan Mitchell
3b28981400 Adapt cancel redirect for better spree paypal express 2014-07-25 12:44:14 +10:00
Rohan Mitchell
3dd7b296be Show order notes (special instructions) on report and confirmation email 2014-07-24 15:13:23 +10:00
Rob H
c8ddf86a9f Add failure block to create respond_override for creating products 2014-07-23 14:56:12 +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
33611ddb20 Renaming Product to Products and starting to figure out cart 2014-07-17 15:04:39 +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
Rob H
9b126df5b6 Add variant display_name to reports 2014-06-23 14:31:16 +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
Rohan Mitchell
9dc02e5eac Add product soft-delete API action 2014-06-12 14:59:26 +10:00
Rohan Mitchell
e6c7acdff3 Add soft-delete method to variant 2014-06-12 14:59:26 +10:00
Rohan Mitchell
dc60409c85 Move paid column next to order totals 2014-06-10 10:31:53 +10:00
Rohan Mitchell
1d44cbf506 Show distribution charge on report 2014-06-06 09:47:16 +10:00
Rohan Mitchell
1a7b32d1ff Show hub and customer name on total row 2014-06-06 09:47:16 +10:00
Rohan Mitchell
673293f273 Add extra shipping columns 2014-06-06 09:47:16 +10:00
Rohan Mitchell
13e2da42eb Add producer column, remove Packed? and Shipped? columns 2014-06-06 09:47:16 +10:00
Rohan Mitchell
1fab8c1e01 In orders and fulfilment reports, rename distributor -> hub and supplier -> producer 2014-06-06 09:47:16 +10:00
Rohan Mitchell
e5f0818065 Order and fulfilment reports can filter by multiple hubs, producers and order cycles 2014-06-06 09:47:16 +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
368fbd2383 Patching up admin redirects to be MOAR UNIVERSAL 2014-05-30 12:52:14 +10:00
Will Marshall
1a47a7486e Automatically closing the accordion if the form is already valid 2014-05-30 11:58:22 +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
272cb0469f Setting up after_login redirects 2014-05-22 12:40:46 +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
36aba8049f Starting to rework login behaviour when hitting /admin 2014-05-20 16:05:28 +10:00
Rob H
93dedb690d Change overview controller to class_eval 2014-05-16 10:03:35 +10:00
Rob H
fd6f4d04df Merge branch 'master' into ent-makeover 2014-05-15 17:05:05 +10:00
Will Marshall
5f712a8984 Removing code 2014-05-14 15:16:29 +10:00
Rob H
c98d2e71d8 Add scroll pane to admin dashboard 2014-05-09 17:20:53 +10:00
Rob H
01c5822fcc Add basic dashboard to admin section 2014-05-09 15:48:58 +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
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
20a5278a75 Merge branch 'master' into bom 2014-04-17 09:23:08 +10:00
Rob H
c68aeb4c36 Only show orders I am distributing in the API 2014-04-16 14:54:50 +10:00
Rob H
2b283405e7 Only admin and users of distributors can access admin orders 2014-04-13 10:09:17 +10:00
Rohan Mitchell
aa1c28b163 Move enterprises api controller out of spree namespace 2014-04-11 19:08:55 +10:00