Merge pull request #6 from ombushop/bugfix/store-messages

Fixed store messages

layout/theme.liquid

@@ -145,24 +145,22 @@
     <!-- end facebook code -->
 
       <!-- admin bar -->
+
+
       {% if current_user %}
-        {% if current_user.is_admin? %}
+        {% if current_user.is_admin? || current_user.is_wholesale? || current_user.is_customer? %}
         <div id="admin-bar" class="top-bar">
           <div id="login-bar">
-            <span class="shop-name"><i class="icon-shopping-cart icon-white"></i> {{ current_user.shop.name }}</span> <span class="user-email"><i class="icon-user icon-white"></i> {{ current_user.email }}</span> <div class="btn-group"><a href="/admin" title="Ir al administrador" class="btn btn-inverse" target="_blank"><i class="icon-briefcase icon-white"></i> Admin</a> <a href="{{ current_path }}" title="Recargar la tienda" class="btn active btn-inverse"><i class="icon-shopping-cart icon-white"></i> Tienda</a></div>
-            <a href="/logout" class="btn btn-inverse"><i class="icon-off icon-white"></i> Salir</a>
-          </div>
-        </div>
-        {% else %}
-          {% unless current_user.is_anonymous? %}
-        <!-- if mayorista -->
-        <div id="admin-bar" class="top-bar">
-          <div id="login-bar">
-            <span class="shop-name"><i class="icon-shopping-cart icon-white"></i> {{ current_user.shop.name }}</span> <span class="user-email"><i class="icon-user icon-white"></i> {{ current_user.email }} (mayorista)</span>
+            <span class="shop-name"><i class="icon-shopping-cart icon-white"></i> {{ current_user.shop.name }}</span> <span class="user-email"><i class="icon-user icon-white"></i> {{ current_user.email }} {% if current_user.is_wholesale? %}(mayorista) {% endif %}</span>
+            {% if current_user.is_admin? %}
+              <div class="btn-group">
+                <a href="/admin/overview" title="Ir al administrador" class="btn btn-inverse" target="_blank"><i class="icon-briefcase icon-white"></i> Admin</a>
+                <a href="{{ current_path }}" title="Recargar la tienda" class="btn active btn-inverse"><i class="icon-shopping-cart icon-white"></i> Tienda</a>
+              </div>
+            {% endif %}
             <a href="/logout" class="btn btn-inverse"><i class="icon-off icon-white"></i> Salir</a>
           </div>
         </div>
-          {% endunless %}
         {% endif %}
       {% endif %}
       <!-- end admin bar -->