From caaf2842dcd46a2fca17f72cdc75b2c4d1a6d3a4 Mon Sep 17 00:00:00 2001
From: Lance Edgar <lance@edbob.org>
Date: Sun, 3 Jun 2018 00:44:10 -0500
Subject: [PATCH] Rearrange menu a bit, add rattail-corepos dependency

---
 rattail_demo/web/templates/menu.mako | 30 ++++++++++------------------
 setup.py                             |  1 +
 2 files changed, 12 insertions(+), 19 deletions(-)

diff --git a/rattail_demo/web/templates/menu.mako b/rattail_demo/web/templates/menu.mako
index d6f1e25..566da83 100644
--- a/rattail_demo/web/templates/menu.mako
+++ b/rattail_demo/web/templates/menu.mako
@@ -22,7 +22,7 @@
         </li>
     % endif
 
-    % if request.has_any_perm('products.list', 'vendors.list', 'brands.list', 'families.list', 'reportcodes.list'):
+    % if request.has_any_perm('products.list', 'vendors.list', 'departments.list', 'subdepartments.list', 'brands.list', 'families.list', 'reportcodes.list'):
         <li>
           <a>Products</a>
           <ul>
@@ -32,6 +32,12 @@
             % if request.has_perm('vendors.list'):
                 <li>${h.link_to("Vendors", url('vendors'))}</li>
             % endif
+            % if request.has_perm('departments.list'):
+                <li>${h.link_to("Departments", url('departments'))}</li>
+            % endif
+            % if request.has_perm('subdepartments.list'):
+                <li>${h.link_to("Subdepartments", url('subdepartments'))}</li>
+            % endif
             % if request.has_perm('brands.list'):
                 <li>${h.link_to("Brands", url('brands'))}</li>
             % endif
@@ -62,23 +68,6 @@
         </li>
     % endif
 
-    % if request.has_any_perm('stores.list', 'departments.list', 'subdepartments.list'):
-        <li>
-          <a>Company</a>
-          <ul>
-            % if request.has_perm('stores.list'):
-                <li>${h.link_to("Stores", url('stores'))}</li>
-            % endif
-            % if request.has_perm('departments.list'):
-                <li>${h.link_to("Departments", url('departments'))}</li>
-            % endif
-            % if request.has_perm('subdepartments.list'):
-                <li>${h.link_to("Subdepartments", url('subdepartments'))}</li>
-            % endif
-          </ul>
-        </li>
-    % endif
-
     % if request.has_any_perm('batch.handheld.list', 'batch.inventory.list'):
         <li>
           <a>Batches</a>
@@ -110,10 +99,13 @@
         </li>
     % endif
 
-    % if request.has_any_perm('users.list', 'userevents.list', 'roles.list', 'emailprofiles.list', 'datasync.list', 'settings.list', 'upgrades.list'):
+    % if request.has_any_perm('stores.list', 'users.list', 'userevents.list', 'roles.list', 'emailprofiles.list', 'datasync.list', 'settings.list', 'upgrades.list'):
         <li>
           <a>Admin</a>
           <ul>
+            % if request.has_perm('stores.list'):
+                <li>${h.link_to("Stores", url('stores'))}</li>
+            % endif
             % if request.has_perm('users.list'):
                 <li>${h.link_to("Users", url('users'))}</li>
             % endif
diff --git a/setup.py b/setup.py
index b617c03..18e4bc7 100644
--- a/setup.py
+++ b/setup.py
@@ -45,6 +45,7 @@ requires = [
 
     'invoke',                           # 0.22.1
     'psycopg2',                         # 2.6.2
+    'rattail-corepos',                  # 0.1.0
     'Tailbone',                         # 0.5.49
     'xlrd',                             # 1.0.0
 ]