Commit Graph

1512 Commits

Author SHA1 Message Date
Rohan Mitchell
91d9b546d2 Merge branch 'foreign-keys' 2014-04-25 16:06:54 +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
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
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
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
Will Marshall
3b440ed027 Minor JS tweaks 2014-04-17 11:47:59 +10:00
Will Marshall
f2a048bf6e Adding another autofocus 2014-04-17 10:50:49 +10:00
Rob H
20a5278a75 Merge branch 'master' into bom 2014-04-17 09:23:08 +10:00
Rob H
83e3172901 Add accessible action to order_cycles controller for listing order_cycles by enterprises invloved 2014-04-16 18:27:50 +10:00
Will Marshall
a7c2849e6b Moving icons around, adding a useful comment 2014-04-16 16:24:03 +10:00
Will Marshall
171c8c6ed1 Merging in with master 2014-04-16 16:16:15 +10:00
Will Marshall
20e1392736 Focusing appropriate fields as we move through the form 2014-04-16 16:13:04 +10:00
Will Marshall
d83367486b Adding icons to checkout, focusing on first input in each panel when selected 2014-04-16 16:07:19 +10:00
Rob H
c68aeb4c36 Only show orders I am distributing in the API 2014-04-16 14:54:50 +10:00
Will Marshall
2b9b51de60 Don't cache things in window 2014-04-16 11:55:16 +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
Rohan Mitchell
8ad7cac639 Do not need to protect here, since we're clearing all unit option values earlier in this method 2014-04-11 19:08:55 +10:00
Rohan Mitchell
47ac097eb7 Do not show deleted variants on shopfront 2014-04-11 19:08:55 +10:00
Will Marshall
19b8cee38e Patching up some more bugs, adding workflow 2014-04-11 17:58:32 +10:00
Will Marshall
2d9be9ea06 Fixing the scope issue 2014-04-11 17:49:51 +10:00
Will Marshall
9cb56c61ae Patching a bug in which carts get emptied 2014-04-11 17:32:39 +10:00
Will Marshall
2e0485c064 Getting the entire order into localStorage: one bug with radio boxes 2014-04-11 17:24:32 +10:00
Will Marshall
c8012e7045 Improving panel workflow, moving back to simple format for Order service 2014-04-11 16:43:21 +10:00
Will Marshall
5268938d49 Focusing on the first form field 2014-04-11 13:41:43 +10:00
Will Marshall
96913ad922 Changing the order confirmation text with Kirsten 2014-04-11 13:33:13 +10:00
Will Marshall
65c15ca20b Changing message for order cycle selector popup 2014-04-11 13:12:40 +10:00
Will Marshall
6e35dc7168 Merging with master 2014-04-11 13:09:22 +10:00
Will Marshall
33cf05ab83 Manually bringing over the login links for checkout 2014-04-11 12:37:32 +10:00
Will Marshall
cf3681b934 Moving over the new checkout authentication 2014-04-11 12:26:36 +10:00
Rob H
c01050361e Use coffeescript syntactic sugar 2014-04-11 10:33:49 +10:00
Rob H
ff531f0e18 Producers can only list line items which contain products they supply 2014-04-11 09:39:01 +10:00