Commit Graph

295 Commits

Author SHA1 Message Date
Rob Harrington
a8dde3bbb9 Moving shopfront trial progress bar logic into enterprises helper and dealing with expiry 2014-11-26 15:16:53 +11:00
Rohan Mitchell
0b030a85ff Incrementally load products 2014-11-21 13:49:09 +11:00
Rohan Mitchell
58fdc48b9f Display products in table 2014-11-21 13:49:09 +11:00
Rohan Mitchell
680ba379c1 User can select a hub 2014-11-21 13:49:09 +11:00
Rohan Mitchell
912c60f720 Do not show producers in hubs list 2014-11-21 13:49:09 +11:00
Rohan Mitchell
2c74a94e31 Show list of hubs to select for managing variant overrides 2014-11-21 13:49:09 +11:00
Rohan Mitchell
7e4d337773 Extract DisplayProperties to a service
Conflicts:

	app/assets/javascripts/admin/bulk_product_update.js.coffee
2014-11-21 08:41:41 +11:00
Rohan Mitchell
29e49b67cc In BPE, rename producer and category JSON attrs to producer_id and category_id
Conflicts:

	spec/features/admin/bulk_product_update_spec.rb
2014-11-21 08:41:41 +11:00
Rob Harrington
d9d6b7bee4 Adding filtering to Users and Enterprises report 2014-11-14 16:36:22 +11:00
Rob Harrington
79a83ee206 Adding users and enterprises report, controller action and template 2014-11-14 16:36:22 +11:00
Rob Harrington
898af0a55e Enterprise confirmation emails can be resent, and sensible things happen if confirmation link is clicked twice 2014-11-06 21:19:21 +11:00
Rob Harrington
43d3955627 Change wording of trial option on change_type_form 2014-10-25 19:56:52 +11:00
summerscope
928e5dc474 Make styling more specific to single enterprise dashboard user only 2014-10-24 16:39:59 +11:00
Rob Harrington
80b36992f9 Merge in remote branch 2014-10-24 15:28:40 +11:00
Rob Harrington
a157528974 Adding specs for single ent dash and remove product ability for profiles 2014-10-24 15:27:08 +11:00
summerscope
2eb152f63e Change class name for big button; change labels for submit buttons 2014-10-24 14:49:09 +11:00
Rob Harrington
8ac367675f Adding big button class to CTA 2014-10-24 14:24:55 +11:00
Rob Harrington
3e002c6f82 Fiddle with text 2014-10-24 13:34:49 +11:00
Rob Harrington
b0d8290dab Add alert for visibility to single ent dash 2014-10-24 13:28:25 +11:00
Rob Harrington
8603cf685e Merge remote-tracking branch 'origin/onboarding' into onboarding 2014-10-24 13:03:04 +11:00
Rob Harrington
b182c6afc8 Merge in remote changes 2014-10-24 13:02:26 +11:00
summerscope
0d73d8f043 Fix layout add required class 2014-10-24 13:01:56 +11:00
Rob Harrington
498b51cedb Switching out chevron on Change Type button 2014-10-24 12:54:21 +11:00
summerscope
01cb39a93f Error messages specific to use case 2014-10-24 12:54:06 +11:00
summerscope
b3ac06e46c Fix icon type to match nav bar 2014-10-24 12:42:14 +11:00
summerscope
68cb3efc50 Markup fixes for single enterprise dashboard (first state) 2014-10-24 12:39:25 +11:00
Rob Harrington
d0c3502f27 Adding trial progress bar 2014-10-24 12:32:05 +11:00
summerscope
631386ced4 Tweaking markup 2014-10-24 11:48:53 +11:00
summerscope
76c6c260d1 Add row containers to make grid nesting work 2014-10-24 11:48:13 +11:00
summerscope
0b3e293b38 Remove whitespace, add alert box 2014-10-24 11:26:58 +11:00
Rob Harrington
f40b4d9d03 Different text for CTA button depending on context 2014-10-24 11:22:57 +11:00
Rob Harrington
911d1e3dc4 Add down chevron to change type button on single ent dash 2014-10-24 11:02:48 +11:00
Rob Harrington
f03c7ba02d Rename sellCtrl to changeTypeFormCtrl 2014-10-24 11:02:16 +11:00
Rob Harrington
f6b0324456 Add change type form to single enterprise dashboard 2014-10-24 10:43:04 +11:00
Rob Harrington
46ab424655 Moving welcomeCrtl to enterprise module as sellsCtrl 2014-10-24 09:10:45 +11:00
Rob Harrington
d2efd25e8d Pull out type change form into a partial 2014-10-24 08:54:08 +11:00
summerscope
cf06cab533 Tweak header to be consistent with other admin pages 2014-10-23 17:23:58 +11:00
Rohan Mitchell
ee5cd599aa Add basic details for the single enterprise dashboard 2014-10-23 16:44:16 +11:00
Rob Harrington
e1cf5ceb57 Can set producer_profile_only using welcome page 2014-10-23 16:42:00 +11:00
summerscope
4f2327f05c More styling for Next button and error message 2014-10-23 15:46:56 +11:00
Rob Harrington
e67f039791 Merging in remote changes 2014-10-23 14:53:21 +11:00
Rob Harrington
67c82e81de Fixing form on welcome page 2014-10-23 14:41:00 +11:00
summerscope
04af954432 Tweak language 2014-10-23 14:33:19 +11:00
Rob Harrington
bcc8198019 Merge in changes on remote branch 2014-10-23 14:30:56 +11:00
summerscope
d6947b119f Welcome markup make alternative markup consistent 2014-10-23 14:28:53 +11:00
Rob Harrington
77c0e36ed6 Adding input validation to welcome page 2014-10-23 14:23:50 +11:00
summerscope
694724d177 Refactoring and styling Welcome screen dashboard admin WIP 2014-10-23 14:23:35 +11:00
Rob Harrington
7d9c5f9e2c Adding form elements for submission of sells preferences on welcome page 2014-10-23 11:40:11 +11:00
summerscope
842e239893 Make selector containers anchors 2014-10-23 10:56:30 +11:00
Rob Harrington
f60a9d7bd5 Fiddling with styling 2014-10-22 19:13:17 +11:00