raggedstaff/openfoodnetwork
1
0
Fork 0
mirror of https://github.com/openfoodfoundation/openfoodnetwork synced 2026-01-30 21:27:17 +00:00
Code Issues Packages Projects Releases Wiki Activity
4,200 Commits 18 Branches 452 Tags
bf61d12bfaedabb0fe1dd117a4e2b6f4f0552e64
Commit Graph

105 Commits

Author SHA1 Message Date
Rohan Mitchell
bf61d12bfa Merge branch 'simple-order-cycles' 
Conflicts:
	app/views/admin/order_cycles/_row.html.haml
 2014-10-23 12:11:34 +11:00
Rohan Mitchell
f7c1340f99 Admin can view an order cycle in the simple edit form 2014-10-23 11:08:27 +11:00
Rohan Mitchell
d47db903fb Add basic styling to simple order cycle interface 2014-10-22 19:12:51 +11:00
Rafael Schouten
b71a40ae6d show all permitted enterprises in order cycle summery 2014-10-18 03:26:57 +11:00
Rafael Schouten
577cb06371 make navCallback actually versatile 2014-10-18 01:42:29 +11:00
Rohan Mitchell
deedafde9a WIP: Simple order cycle form loads and displays correct info 2014-10-17 16:55:55 +11:00
Rohan Mitchell
d8b648d531 Extract name and timing form from order cycles 2014-10-17 16:51:03 +11:00
Rohan Mitchell
f060da9c8d Rename angular app order_cycle -> admin.order_cycles 2014-10-17 14:13:27 +11:00
Rohan Mitchell
694dd0c329 Enterprise user selling own produce only sees simple order cycle listing 2014-10-17 10:52:36 +11:00
Rohan Mitchell
913c167fdf Revert 5ede8d1, reinstating a4be0ff..7b89e6a 2014-09-05 15:10:12 +10:00
Rob H
5ede8d169f Revert a4be0ff..7b89e6a for deployment 2014-08-28 14:32:57 +10:00
Rohan Mitchell
a5debc19dc Permit edits to exchanges involving enterprises permitted via E2E relationships 2014-08-28 10:09:50 +10:00
Rohan Mitchell
628d87b69a Add to OC permission allows adding distributors to order cycle 2014-08-28 10:09:50 +10:00
Rohan Mitchell
5ef13d3c5a Change 'add products to OC' permission into the more general 'add enterprise to OC' 2014-08-28 10:09:50 +10:00
Rohan Mitchell
099a5b0b7b Show E2E related enterprise exchanges in OC 2014-08-28 10:09:50 +10:00
Rohan Mitchell
8548a1a67e Determine producer options on order cycle screen through OpenFoodNetwork::Permissions class 2014-08-28 10:09:50 +10:00
Rob H
0785509bc4 Add plus icon to new order cycles button 2014-06-20 17:00:36 +10:00
Rob H
d6341b65e5 Add edit button to Order cycles index 2014-06-20 16:22:55 +10:00
Rob H
0527900453 Change text of OC collection details 2014-06-19 18:02:05 +10:00
Rob H
3c24be3c0b Change text of OC delivery instructions placeholder 2014-06-19 17:57:23 +10:00
Rohan Mitchell
7d73f7d7f2 Fix reversed checkbox value for select all variants on order cycle admin page 2014-05-29 17:21:52 +10:00
Rohan Mitchell
85db8859bb On admin order cycle edit page, do not show exchanges for enterprises the user doesn't manage 2014-04-24 15:51:39 +10:00
Rohan Mitchell
2603256a17 Extract admin order cycle index row into partial 2014-04-24 14:53:32 +10:00
Rohan Mitchell
d0585b4d05 Admin order cycle listing does not show order cycles that enterprise users don't have access to 2014-04-24 14:43:33 +10:00
Rohan Mitchell
e792107d7b Make order cycle specs more robust 2014-04-09 15:02:40 +10:00
Rohan Mitchell
9e74a72985 Fix silent fail when order cycle coordinator not filled out 2014-04-02 10:35:16 +11:00
Rohan Mitchell
466b10e797 Select all distributed products on order cycle admin page 2014-03-28 15:34:26 +11:00
Rohan Mitchell
fddfdf8050 Select all supplied products on order cycle admin page 2014-03-28 15:34:26 +11:00
Rohan Mitchell
b8147474e8 Add label tags around order cycle admin checkboxes and labels 2014-03-28 15:34:26 +11:00
Rohan Mitchell
3104d285ca Order cycle admin JS uses exchanges.incoming instead of role 2014-03-27 09:30:53 +11:00
Rohan Mitchell
811b0cb36a Admin can remove a master variant from an order cycle when further variants have been added 2014-03-20 10:27:55 +11:00
Rohan Mitchell
fd81b143b5 Sort suppliers and distributors by name on order cycle edit page 2014-03-20 10:27:55 +11:00
Will Marshall
dec33ebda4 Fixing the HTML in the admin section 2013-11-28 16:13:13 +11:00
Rohan Mitchell
94c33e5f45 Colour order cycle rows based on their status 2013-11-22 11:31:04 +11:00
Rohan Mitchell
f75879bec1 Put order cycle variants in a tooltip 2013-11-22 10:03:49 +11:00
Rohan Mitchell
8980284390 Reorder OC admin index table columns 2013-11-15 12:09:26 +11:00
Rohan Mitchell
6e0dfbd88b Make order cycle admin open and close time columns wider 2013-11-01 16:50:48 +11:00
Rohan Mitchell
12061fd485 Order cycle admin does not allow save until page is loaded 2013-10-23 14:59:50 +11:00
Rohan Mitchell
b8320a9bb6 Rename some directives and internal login details 2013-10-19 09:45:38 +11:00
Rohan Mitchell
631bc631fb Do not show order cycle debug info in production 2013-10-16 10:39:32 +11:00
Rohan Mitchell
1d4198d402 Removing a supplier exchange removes variants from distribution 2013-09-30 09:46:39 +10:00
Rohan Mitchell
d100d12ebe When a variant is removed from supply to an order cycle, remove it from distribution also 2013-09-20 11:11:59 +10:00
Rohan Mitchell
00fe10e847 Reposition order cycle admin debug info 2013-09-20 09:29:26 +10:00
Rohan Mitchell
8a092697ee Enterprise manager can clone an order cycle 2013-08-22 17:11:53 +10:00
Rohan Mitchell
f1fa90d7c3 Clone order cycles 2013-08-22 16:53:11 +10:00
Andrew Spinks
82726d032c Add enterprise roles for order cycles. 2013-08-16 11:34:07 +10:00
Rohan Mitchell
19e7537b64 Style order cycle fees 2013-08-16 10:36:41 +10:00
Rohan Mitchell
290607b5bf CrUD for order cycle exchange fees 2013-08-16 10:22:29 +10:00
Rohan Mitchell
715ec9b21a Send enterprise id along with exchange enterprise fees 2013-08-16 10:22:29 +10:00
Rohan Mitchell
f67a6fa3fb Extract coordinator fees to partial 2013-08-14 09:48:45 +10:00