Commit Graph

5746 Commits

Author SHA1 Message Date
Rob Harrington
e09431fa20 Styling tweaks 2015-06-15 15:43:19 +08:00
Rob Harrington
fb11c93943 Making ul element the root of filter_selectors directive, so resolve issue with using ng-repeat element as root of a replacement directive 2015-06-15 15:43:01 +08:00
Rob Harrington
727e8a81d6 Making sure enterprise serializer serializes no taxons as an empty array 2015-06-15 15:41:25 +08:00
Rob Harrington
0e96a23a52 Fixing filters selector directive to that an allSelector watcher isn't required for generation on selectors to work 2015-06-15 12:06:23 +08:00
Rob Harrington
82d31b908f More styling tweaks 2015-06-12 16:09:53 +08:00
Rob Harrington
066c8876ff Only serializing unresolved enterprise issues, styling tweaks and fixes for index 2015-06-12 15:49:01 +08:00
Rob Harrington
795b2700b4 Merge branch 'master' into enterprise-index-revamp 2015-06-12 12:47:58 +08:00
Rob Harrington
6ab5efbe02 Last minute styling adjustments 2015-06-12 12:40:24 +08:00
Rob Harrington
59d5ebe9d4 Changes to copy 2015-06-12 12:32:17 +08:00
Rob Harrington
1fb1733644 Adding link to user guide to enterprises index and dashboard 2015-06-12 12:31:57 +08:00
Rob Harrington
775718c776 Adding status panel on enterprise index 2015-06-12 12:09:00 +08:00
Rohan Mitchell
2b763271a7 Merge branch 'master' into optimise-shopfront 2015-06-12 12:15:20 +10:00
Rohan Mitchell
4f311543ae Merge branch 'master' into enterprise-index-revamp 2015-06-12 10:26:11 +10:00
Rob Harrington
eed27ceb31 Shipping Method feature specs work with new enteprise user enterprise index 2015-06-12 03:10:50 +08:00
Rob Harrington
77432ffc41 Payment Method feature specs work with new enteprise user enterprise index 2015-06-12 03:10:37 +08:00
Rob Harrington
5d2b36c667 Enterprise Fee feature specs work with new enteprise user enterprise index 2015-06-12 03:10:14 +08:00
Rob Harrington
61beb38e9c Bringing back delayed_job on enterprise emails - acctidentally took it out earlier 2015-06-12 03:09:40 +08:00
Rob Harrington
efca4dde10 Fixing enterprises feature spec 2015-06-12 01:49:39 +08:00
Rob Harrington
d0b7550629 Removing screenshot from spec 2015-06-12 01:49:39 +08:00
Rob Harrington
6f975593fe Splitting enterprise index feature specs into their own file, reinstating old enterprise index for super admin users 2015-06-12 01:49:39 +08:00
Rob Harrington
64ed80f845 Enterprise index action load enterprise_set for super admin 2015-06-12 01:49:39 +08:00
Rob Harrington
f80a5fe558 Fixing reference to change_type_form partial from single enterprise dashboard 2015-06-12 01:49:38 +08:00
Rob Harrington
1b52564d58 Rerouting welcome page to be an enterprise action, updates to copy for package selection 2015-06-12 01:49:38 +08:00
Rob Harrington
1cd6866879 Fixing issue with auto-creation of new contact user for enterprises caused by delayed-job 2015-06-12 01:49:37 +08:00
Rob Harrington
1c1f82f4ee Using events to update index row text on save, adding alert icons for enterprises without producer or package selected 2015-06-12 01:49:37 +08:00
Rob Harrington
95073f6fe7 Adding actual link to the manage link on enterprises index 2015-06-12 01:49:37 +08:00
Rob Harrington
e575b0e490 Switching enterprise index to its own dedicated serializer, so we can spit out ownership 2015-06-12 01:49:37 +08:00
Rob Harrington
5a08344812 Changing 'shop' column and panel to 'package' 2015-06-12 01:49:37 +08:00
Rob Harrington
e3d7c00c8e Removing option of 'producer profile only' from enterprise shop panel 2015-06-12 01:49:36 +08:00
Rob Harrington
8aa55088ab Adding a parent directive to coorindate styling of panel tabs 2015-06-12 01:49:36 +08:00
Rob Harrington
a90cd0f8e0 Owners can update sells on enterprises they own 2015-06-12 01:49:36 +08:00
Rob Harrington
6b35e993bd WIP: More work on panel content, styling and data submission logic 2015-06-12 01:49:36 +08:00
Rob Harrington
a586a52c23 Shortcutting around existing Enterprise service, so that we can use it for something more useful 2015-06-12 01:49:36 +08:00
Rob Harrington
b84f5a26a1 WIP: Splitting type panel into separate producer and shop panels, playing with styling 2015-06-12 01:49:35 +08:00
Rob Harrington
451ba1c01b panel rows adjust to span the number of visible columns 2015-06-12 01:49:35 +08:00
Rob Harrington
c441c8c6cb Columns service holds a column count and notifies rootscope when it changes 2015-06-12 01:49:35 +08:00
Rob Harrington
0c36738472 Adding basic generalised panel row infrastructure to indexUtils 2015-06-12 01:49:35 +08:00
Rob Harrington
ff3d9e27ec Upgrade angular-rails-templates 2015-06-12 01:49:35 +08:00
Rob Harrington
d5f9b40707 WIP: Basic version of revamped enterprise index 2015-06-12 01:49:34 +08:00
Rob Harrington
02d3d34826 Adding basic angular infrastructure for enterprises 2015-06-12 01:49:34 +08:00
Rob Harrington
5215623864 Adding bindonce to admin 2015-06-12 01:49:34 +08:00
Rob Harrington
ed7a53968c Using clearer json_request? method for customers controller 2015-06-12 01:49:34 +08:00
Rob Harrington
c311bcdca7 Overriding enterprises index action to use AMS for json requests, and prevent collection loading for html requests 2015-06-12 01:49:33 +08:00
Rohan Mitchell
ecbf3c8fa7 Ensure we start with consistent config settings 2015-06-11 16:16:36 +10:00
Rohan Mitchell
bfeb63c8d7 Ensure that changes to Spree::Config.products_require_tax_category do not leak out of the relevant spec 2015-06-11 14:16:18 +10:00
Rohan Mitchell
6dea3fa19d Merge branch 'fix-duplicate-fees' into combined/ginerr_bugfixes_fix-duplicate-fees 2015-06-11 12:56:32 +10:00
Rohan Mitchell
075e9edbf6 Merge branch 'ginerr_bugfixes' into combined/ginerr_bugfixes_fix-duplicate-fees 2015-06-11 12:56:27 +10:00
Maikel Linke
a8b6f2942a Releasing Assets Version 1.1
The uglifier update affects only re-compiled assets. In order to replace
the broken assets (e.g. #396) with re-compiled assets, we change the
assets version number.
2015-06-11 10:54:30 +10:00
Rohan Mitchell
604360034b Make filter method private 2015-06-10 17:04:09 +10:00
Rohan Mitchell
a0fd91dc57 Do not preload_app with unicorn, update newrelic agent so that it doesn't require this setting. 2015-06-10 17:03:56 +10:00