Commit Graph

8189 Commits

Author SHA1 Message Date
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
Rob H
29cf40a5bf Add visual indication that no payment/shipping/fees exist to enterprise index 2014-04-24 15:35:59 +10:00
Rob H
43106d5db8 Add explanation to top of BOM 2014-04-24 15:10:45 +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
summerscope
4b95b9979e Homepage styling and pretties 2014-04-24 14:12:27 +10:00
Rob H
c86586fc16 Remove collection date from admin enterprises index 2014-04-24 13:57:56 +10:00
summerscope
47468127c2 New pictures added 2014-04-24 13:56:30 +10:00
summerscope
7b794324d3 Adding pretty pictures 2014-04-24 13:53:08 +10:00
Rob H
b59aa53158 Add edit order button to BOM 2014-04-24 13:49:28 +10:00
Rohan Mitchell
b649d6ef69 Authorise access to OrderCycles API 2014-04-24 13:20:16 +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
d16d970952 BPE uses soft-delete 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
Rohan Mitchell
4cbe434573 Remove trailing relations on destruction for EnterpriseFee and Variant 2014-04-24 13:20:15 +10:00
Will Marshall
5ea97b0919 Merge branch 'darkswarm_home' of github.com:openfoodfoundation/openfoodnetwork into darkswarm_home 2014-04-24 11:06:46 +10:00
summerscope
7c11a4082f Styling tagline 2014-04-24 10:46:55 +10:00
Will Marshall
c060019873 Adding a learn more modal, restructuring partials 2014-04-23 16:48:53 +10:00
Will Marshall
0479a0a55d Fixing bugs, improving dates 2014-04-23 15:46:14 +10:00
Will Marshall
16251fe5ea Merging with master 2014-04-23 14:43:39 +10:00
Will Marshall
2981412540 Adding some specs, next order cycle, better CSS 2014-04-23 14:38:41 +10:00
Will Marshall
8027af2bb7 Adding active boolean and sorting 2014-04-23 13:22:30 +10:00
Will Marshall
f5b32ebd3f Better handling of the home page hubs 2014-04-23 12:58:34 +10:00
Rob H
131b4ac073 Hack fix for our API controllers not being able to access Spree's Rabl Responder 2014-04-23 12:31:30 +10:00
Rob H
b37a701d39 Merge branch 'api_fixes' into bom 2014-04-23 12:03:01 +10:00
Rob H
353b26c3df Hack fix for our API controllers not being able to access Spree's Rabl Responder 2014-04-23 12:02:11 +10:00
Will Marshall
c5f8e2e123 Better temp text 2014-04-23 11:49:27 +10:00
Will Marshall
8e67be6e4f More minor presentation changes 2014-04-22 17:19:13 +10:00
Will Marshall
078a23a152 More prettification 2014-04-22 17:08:40 +10:00
Will Marshall
baa2065238 Tweaking filter to be case insensitive 2014-04-22 16:10:13 +10:00
Will Marshall
8b7d2641f9 Starting to prettify with Laura 2014-04-22 15:46:14 +10:00
Will Marshall
fb072ad1a5 Tweaking debounce, adding it to Shop 2014-04-18 16:56:14 +10:00
Will Marshall
35a792b3ca Debouncing things 2014-04-18 16:53:43 +10:00
Will Marshall
99d743f7cf Some very basic specs 2014-04-18 16:35:06 +10:00
Will Marshall
240b600bfa Adding a No Results case 2014-04-18 16:15:21 +10:00
Will Marshall
f3e30d10ba Starting some bones for Laura 2014-04-18 16:10:19 +10:00
Will Marshall
66d5f08b99 Adding custom filtering to home page 2014-04-18 15:17:12 +10:00
Will Marshall
5778a51bf6 Switching to placeholders and so on 2014-04-18 13:08:45 +10:00
Will Marshall
6753b96f29 Adding darkswarm variant of home page, getting Angular skeleton into place, taking shit off window 2014-04-18 13:01:36 +10:00
Will Marshall
c0228e0cc3 Patching the admin JS 2014-04-18 11:37:19 +10:00
Will Marshall
a5a3f9fe43 Fixing up some minor spec bugs 2014-04-17 17:22:30 +10:00
Will Marshall
e2d3207a51 Namespacing accordion state by ID 2014-04-17 15:34:57 +10:00
Rob H
78fad1cc85 Make more orders load for BOM 2014-04-17 15:19:48 +10:00
Will Marshall
202b45fc5f Aligning text left in Order Summary 2014-04-17 15:15:14 +10:00
Will Marshall
c6395a686a Adding flash notifications 2014-04-17 15:08:01 +10:00
Rob H
1b5080ceb4 Remove render 2014-04-17 12:28:28 +10:00
Rob H
5345e8d339 Add accessible_by scope to enterprises model and accessible action to enterprises API 2014-04-17 12:23:09 +10:00