Commit Graph

1664 Commits

Author SHA1 Message Date
Rob Harrington
8248e382f3 Greying out disabled action button 2015-04-17 11:25:18 +10:00
Rob Harrington
4b182f9248 Can't delete final variant on a product from BPE 2015-04-17 11:25:18 +10:00
Rohan Mitchell
aef3fdf4b4 Merge branch 'group-pages' 2015-04-16 16:53:49 +10:00
Maikel Linke
548e3576b9 textAngular editor for group description 2015-04-15 17:13:10 +10:00
Maikel Linke
2fd25f6cc4 Injecting all enterprises into group page
The enterprises have related producers and hubs that need to be
dereferenced. Therefore, we need a bigger set of enterprises to be
loaded. Injecting all enterprises is simple and doesn't require changes
if the set of needed enterprise data is growing in future.
2015-04-10 17:42:54 +10:00
Rob Harrington
81a745420e Only check editable status of variants when actually selecting 2015-04-09 15:24:45 +10:00
Rob Harrington
69004ac477 Select all box only selects variants I have permission to edit 2015-04-09 13:29:25 +10:00
Rob Harrington
ae1681b790 Not 1! Zero! 2015-04-06 23:29:15 +10:00
Rob Harrington
36c5cdf556 Only show enterprises with fees in order cycle edit page 2015-04-06 14:08:10 +10:00
Rob Harrington
d516795774 Fetching Enterprise Fees for order cycle, using new enterprisefee serializer 2015-04-06 13:06:21 +10:00
Rob Harrington
a4b80b1f33 Implement editable scope for variants on order cycles page 2015-04-06 09:15:14 +10:00
Rob Harrington
009b25a491 Adding an editable variants scope for incoming exchanges 2015-04-05 13:59:00 +10:00
Rob Harrington
3aa5f6e023 Adding properties tab to admin enterprise edit form 2015-04-02 11:30:32 +11:00
Rob Harrington
3817ef202c Enterprises in simple OC create controller only load after OC initialises 2015-03-27 16:16:12 +11:00
Rob Harrington
aa170ef5f6 Order cycle simple create controller uses 'new' method on OC service to initialise 2015-03-27 16:16:12 +11:00
Rob Harrington
4d14acb64d Don't send non-attributes of js order_cycle object to server 2015-03-27 16:16:12 +11:00
Rob Harrington
43d2eb4d22 Adding 'new' method to admin order cycle service, for loading data from serializer for new OCs 2015-03-27 16:16:12 +11:00
Rob Harrington
9430999540 Filtering exchange variants, for outgoing exchange variant count 2015-03-27 16:16:12 +11:00
Rob Harrington
5e015f0611 Rename visibleVariants filter to visibleProductVariants 2015-03-27 16:16:11 +11:00
Rob Harrington
681dada5df Simple OC form loads coordinator into JS 2015-03-27 16:16:11 +11:00
Rob Harrington
99bd6244ed Filtering the list of variants visible within each exchange based on permissions 2015-03-27 16:16:11 +11:00
Rob Harrington
45f6042d3d Enterprises etched by for_order_cycle action now use permissions scoped using an order cycle or coordinator 2015-03-27 16:16:10 +11:00
Rob Harrington
f8a9652333 Moving SASS comments to thier own lines 2015-03-27 15:56:07 +11:00
Rohan Mitchell
d471368412 Spacing 2015-03-27 13:09:25 +11:00
Rob Harrington
d684a88697 Merge branch 'order-confirmation' into ready-to-merge 2015-03-13 18:11:53 +11:00
summerscope
d0f66a6053 Fixing label for cart popover to make it write name of product variant without page load 2015-03-13 18:10:59 +11:00
Rob Harrington
dd8c769ea9 Hiding fee breakdown on cart page for now 2015-03-13 16:50:57 +11:00
summerscope
864c9ec1da This changes the user menu labels to show Account next to user email.
Small tweak to user account page to make it less awful.
2015-03-13 16:49:26 +11:00
Rohan Mitchell
efbf2c7ffa Display extended variant name in quick cart 2015-03-13 12:58:53 +11:00
Rob Harrington
6cd6b751c8 Merge branch 'master' into order-confirmation 2015-03-12 15:34:49 +11:00
summerscope
d967905b83 Tweaking copy styles and removing references to Open Sans which not using. Silly laura mixing up repos 2015-03-10 14:59:26 +11:00
summerscope
b9a0579397 Add styling for image thumbnail - hide for small, show small thumbnail for big screens. 2015-03-10 11:35:03 +11:00
summerscope
de6abc3464 Turning off z-index this causes problems on shopping cart page. Needs testing to confirm does not break elsewhere. 2015-03-10 11:34:31 +11:00
summerscope
9a86e41942 Adding more helper classes 2015-03-05 17:20:02 +11:00
summerscope
235bb009e8 Tweaking styling for order confirmation page 2015-03-05 11:25:57 +11:00
summerscope
db2e5e7558 Add an extra class helper 2015-03-04 17:19:57 +11:00
summerscope
4867f45ee1 Add an extra style 2015-03-04 17:19:37 +11:00
Rob Harrington
8de6f983a2 User must set the coordinator first when creating an order cycle 2015-02-27 17:24:36 +11:00
summerscope
587e4ae86d WIP getting all the confirmation details right for collection, delivery, etc. 2015-02-27 16:08:20 +11:00
summerscope
87842ecaf5 More WIP confirmation email for customer and shopfront. fixing up the order summary table. overall design improvements. 2015-02-27 14:00:49 +11:00
summerscope
2ba632456f WIP email mailer updates for customer email confirmation etc. 2015-02-27 12:40:13 +11:00
Maikel Linke
3beff77164 Merge remote-tracking branch 'origin/master' into group-pages 2015-02-26 17:22:13 +11:00
Maikel Linke
1f7aec0c1d group owner select box in own tab 2015-02-26 13:09:46 +11:00
summerscope
122cf6c065 Groups index page styling for responsive use cases. 2015-02-25 10:22:33 +11:00
Rohan Mitchell
fdde55f631 Add spec for ext_url filter, refactor 2015-02-23 10:06:42 +11:00
Maikel Linke
eade689070 linkToService directive to generate external links 2015-02-22 16:15:04 +11:00
summerscope
e05d64a0b4 WIP on groups index page. Needs work from Maikel or Rohan. 2015-02-20 16:43:36 +11:00
summerscope
3aa06ee1e4 Tabs styling for groups page - making it pretty. 2015-02-20 16:14:50 +11:00
summerscope
3ab961a7e2 New mixin for gradients 2015-02-20 16:14:40 +11:00
Maikel Linke
718a5911a3 code style and cleanup 2015-02-19 10:48:39 +11:00