tienda 1.1.2 → 2.0.1

data/app/models/tienda/order.rb

@@ -13,17 +13,17 @@ module Tienda
     require_dependency 'tienda/order/delivery'
 
     # All items which make up this order
-    has_many :order_items, :dependent => :destroy, :class_name => 'Tienda::OrderItem'
-    accepts_nested_attributes_for :order_items, :allow_destroy => true, :reject_if => Proc.new { |a| a['ordered_item_id'].blank? }
+    has_many :order_items, dependent: :destroy, class_name: 'Tienda::OrderItem'
+    accepts_nested_attributes_for :order_items, allow_destroy: true, reject_if: Proc.new { |a| a['ordered_item_id'].blank? }
 
     # All products which are part of this order (accessed through the items)
-    has_many :products, :through => :order_items, :class_name => 'Tienda::Product', :source => :ordered_item, :source_type => 'Tienda::Product'
+    has_many :products, through: :order_items, class_name: 'Tienda::Product', source: :ordered_item, source_type: 'Tienda::Product'
 
     # Validations
-    validates :token, :presence => true
-    with_options :if => Proc.new { |o| !o.building? } do |order|
-      order.validates :email_address, :format => {:with => /\A\b[A-Z0-9\.\_\%\-\+]+@(?:[A-Z0-9\-]+\.)+[A-Z]{2,6}\b\z/i}
-      order.validates :phone_number, :format => {:with => /\A[\d\ \-x\(\)]{7,}\z/}
+    validates :token, presence: true
+    with_options if: Proc.new { |o| !o.building? } do |order|
+      order.validates :email_address, format: { with: /\A\b[A-Z0-9\.\_\%\-\+]+@(?:[A-Z0-9\-]+\.)+[A-Z]{2,6}\b\z/i }
+      order.validates :phone_number, format: { with: /\A[\d\ \-x\(\)]{7,}\z/ }
     end
 
     # Set some defaults
@@ -82,7 +82,7 @@ module Tienda
     end
 
     def self.ransackable_attributes(auth_object = nil)
-      ["id", "billing_postcode", "billing_address1", "billing_address2", "billing_address3", "billing_address4", "first_name", "last_name", "company", "email_address", "phone_number", "consignment_number", "status", "received_at"] + _ransackers.keys
+      ['id', 'billing_postcode', 'billing_address1', 'billing_address2', 'billing_address3', 'billing_address4', 'first_name', 'last_name', 'company', 'email_address', 'phone_number', 'consignment_number', 'status', 'received_at'] + _ransackers.keys
     end
 
     def self.ransackable_associations(auth_object = nil)

data/app/models/tienda/order_item.rb

@@ -6,17 +6,17 @@ module Tienda
     # The associated order
     #
     # @return [Tienda::Order]
-    belongs_to :order, :class_name => 'Tienda::Order', :touch => true
+    belongs_to :order, class_name: 'Tienda::Order', touch: true
 
     # The item which has been ordered
-    belongs_to :ordered_item, :polymorphic => true
+    belongs_to :ordered_item, polymorphic: true
 
     # Any stock level adjustments which have been made for this order item
-    has_many :stock_level_adjustments, :as => :parent, :dependent => :nullify, :class_name => 'Tienda::StockLevelAdjustment'
+    has_many :stock_level_adjustments, as: :parent, dependent: :nullify, class_name: 'Tienda::StockLevelAdjustment'
 
     # Validations
-    validates :quantity, :numericality => true
-    validates :ordered_item, :presence => true
+    validates :quantity, numericality: true
+    validates :ordered_item, presence: true
 
     validate do
       unless in_stock?
@@ -46,13 +46,13 @@ module Tienda
     # @param quantity [Fixnum] the number of items to order
     # @return [Tienda::OrderItem]
     def self.add_item(ordered_item, quantity = 1)
-      raise Errors::UnorderableItem, :ordered_item => ordered_item unless ordered_item.orderable?
+      raise Errors::UnorderableItem, ordered_item: ordered_item unless ordered_item.orderable?
       transaction do
-        if existing = self.where(:ordered_item_id => ordered_item.id, :ordered_item_type => ordered_item.class.to_s).first
+        if existing = self.where(ordered_item_id: ordered_item.id, ordered_item_type: ordered_item.class.to_s).first
           existing.increase!(quantity)
           existing
         else
-          new_item = self.create(:ordered_item => ordered_item, :quantity => 0)
+          new_item = self.create(ordered_item: ordered_item, quantity: 0)
           new_item.increase!(quantity)
           new_item
         end
@@ -79,7 +79,7 @@ module Tienda
       transaction do
         self.quantity += amount
         unless self.in_stock?
-          raise Tienda::Errors::NotEnoughStock, :ordered_item => self.ordered_item, :requested_stock => self.quantity
+          raise Tienda::Errors::NotEnoughStock, ordered_item: self.ordered_item, requested_stock: self.quantity
         end
         self.save!
         self.order.remove_delivery_service_if_invalid
@@ -195,7 +195,7 @@ module Tienda
     # @return [Boolean]
     def in_stock?
       if self.ordered_item && self.ordered_item.stock_control?
-        self.ordered_item.stock >= unallocated_stock
+        self.ordered_item.stock_count >= unallocated_stock
       else
         true
       end
@@ -231,7 +231,7 @@ module Tienda
     # Allocate any unallocated stock for this order item. There is no return value.
     def allocate_unallocated_stock!
       if self.ordered_item.stock_control? && self.unallocated_stock != 0
-        self.ordered_item.stock_level_adjustments.create!(:parent => self, :adjustment => 0 - self.unallocated_stock, :description => "Order ##{self.order.number}")
+        self.ordered_item.stock_level_adjustments.create!(parent: self, adjustment: 0 - self.unallocated_stock, description: "Order ##{self.order.number}")
       end
     end
 

data/app/models/tienda/product.rb

@@ -3,8 +3,6 @@ require 'roo'
 module Tienda
   class Product < ActiveRecord::Base
 
-    self.table_name = 'tienda_products'
-
     # Add dependencies for products
     require_dependency 'tienda/product/product_attributes'
     require_dependency 'tienda/product/variants'
@@ -17,49 +15,61 @@ module Tienda
     attachment :fifth_image
     attachment :data_sheet
 
+    # To preserve backwards compatibility
+    alias_attribute :stock, :stock_count
+
     # The product's category
     #
     # @return [Tienda::ProductCategory]
-    belongs_to :product_category, :class_name => 'Tienda::ProductCategory'
+    belongs_to :product_category, class_name: 'Tienda::ProductCategory'
 
     # The product's tax rate
     #
     # @return [Tienda::TaxRate]
-    belongs_to :tax_rate, :class_name => "Tienda::TaxRate"
+    belongs_to :tax_rate, class_name: "Tienda::TaxRate"
 
     # Ordered items which are associated with this product
-    has_many :order_items, :dependent => :restrict_with_exception, :class_name => 'Tienda::OrderItem', :as => :ordered_item
+    has_many :order_items, dependent: :restrict_with_exception, class_name: 'Tienda::OrderItem', as: :ordered_item
 
     # Orders which have ordered this product
-    has_many :orders, :through => :order_items, :class_name => 'Tienda::Order'
+    has_many :orders, through: :order_items, class_name: 'Tienda::Order'
 
     # Stock level adjustments for this product
-    has_many :stock_level_adjustments, :dependent => :destroy, :class_name => 'Tienda::StockLevelAdjustment', :as => :item
+    has_many :stock_level_adjustments, dependent: :destroy
 
     # Validations
-    with_options :if => Proc.new { |p| p.parent.nil? } do |product|
-      product.validates :product_category_id, :presence => true
-      product.validates :description, :presence => true
-      product.validates :short_description, :presence => true
+    with_options if: Proc.new { |p| p.parent.nil? } do |product|
+      product.validates :product_category_id, presence: true
+      product.validates :description, presence: true
+      product.validates :short_description, presence: true
     end
-    validates :name, :presence => true
-    validates :permalink, :presence => true, :uniqueness => true, :permalink => true
-    validates :sku, :presence => true
-    validates :weight, :numericality => true
-    validates :price, :numericality => true
-    validates :cost_price, :numericality => true, :allow_blank => true
+    validates :name, presence: true
+    validates :permalink, presence: true, uniqueness: true, permalink: true
+    validates :sku, presence: true
+    validates :weight, numericality: true
+    validates :price, numericality: true
+    validates :cost_price, numericality: true, allow_blank: true
 
     # Before validation, set the permalink if we don't already have one
     before_validation { self.permalink = self.name.parameterize if self.permalink.blank? && self.name.is_a?(String) }
 
     # All active products
-    scope :active, -> { where(:active => true) }
+    scope :active, -> { where(active: true) }
+
+    # All inactive products
+    scope :inactive, -> { where(active: false) }
+
+    # All in stock products
+    scope :in_stock, -> { where('stock_count > 0') }
+
+    # All not in stock products
+    scope :no_stock, -> { where(stock_count: 0) }
 
     # All featured products
-    scope :featured, -> {where(:featured => true)}
+    scope :featured, -> { where(featured: true) }
 
     # All products ordered with default items first followed by name ascending
-    scope :ordered, -> {order(:default => :desc, :name => :asc)}
+    scope :ordered, -> { order(default: :desc, name: :asc) }
 
     # Return the name of the product
     #
@@ -88,14 +98,7 @@ module Tienda
     #
     # @return [Boolean]
     def in_stock?
-      self.default_variant ? self.default_variant.in_stock? : (stock_control? ? stock > 0 : true)
-    end
-
-    # Return the total number of items currently in stock
-    #
-    # @return [Fixnum]
-    def stock
-      self.stock_level_adjustments.sum(:adjustment)
+      self.default_variant ? self.default_variant.in_stock? : (stock_control? ? stock_count > 0 : true)
     end
 
     # Return all product images
@@ -113,8 +116,8 @@ module Tienda
     #
     # @return [Enumerable]
     def self.with_attributes(key, values)
-      product_ids = Tienda::ProductAttribute.searchable.where(:key => key, :value => values).pluck(:product_id).uniq
-      where(:id => product_ids)
+      product_ids = Tienda::ProductAttribute.searchable.where(key: key, value: values).pluck(:product_id).uniq
+      where(id: product_ids)
     end
 
     # Imports products from a spreadsheet file
@@ -133,35 +136,16 @@ module Tienda
           if product = find_by(name: row["name"])
             # Dont import products with the same name but update quantities if they're not the same
             qty = row["qty"].to_i
-            if qty > 0 && qty != product.stock
-              product.stock_level_adjustments.create!(description: I18n.t('tienda.import'), adjustment: qty)
-            end
+            product.stock_level_adjustments.create!(description: I18n.t('tienda.import'), adjustment: qty) if qty > 0 && qty != product.stock
           else
-            product = new
-            product.name = row["name"]
-            product.sku = row["sku"]
-            product.description = row["description"]
-            product.short_description = row["short_description"]
-            product.weight = row["weight"]
-            product.price = row["price"].nil? ? 0 : row["price"]
-
-            product.product_category_id = begin
-              if Tienda::ProductCategory.find_by(name: row["category_name"]).present?
-                # Find and set the category
-                Tienda::ProductCategory.find_by(name: row["category_name"]).id
-              else
-                # Create the category
-                Tienda::ProductCategory.create(name: row["category_name"]).id
-              end
-            end
-
+            product = new(row)
+            product.product_category_id =
+              Tienda::ProductCategory.find_or_create_by(name: row['category_name']).id
             product.save!
 
             # Create quantities
             qty = row["qty"].to_i
-            if qty > 0
-              product.stock_level_adjustments.create!(description: I18n.t('tienda.import'), adjustment: qty)
-            end
+            product.stock_level_adjustments.create!(description: I18n.t('tienda.import'), adjustment: qty) if qty > 0
           end
         end
       end

data/app/models/tienda/stock_level_adjustment.rb

@@ -1,19 +1,21 @@
 module Tienda
   class StockLevelAdjustment < ActiveRecord::Base
-
-    # The orderable item which the stock level adjustment belongs to
-    belongs_to :item, :polymorphic => true
+    # The product which the stock level adjustment belongs to
+    belongs_to :product
 
     # The parent (OrderItem) which the stock level adjustment belongs to
-    belongs_to :parent, :polymorphic => true
+    belongs_to :parent, polymorphic: true
+
+    # Save stock cache into Products table
+    counter_culture :product, column_name: :stock_count, delta_column: :adjustment
 
     # Validations
-    validates :description, :presence => true
-    validates :adjustment, :numericality => true
+    validates :description, presence: true
+    validates :adjustment, numericality: true
     validate { errors.add(:adjustment, I18n.t('tienda.activerecord.attributes.stock_level_adjustment.must_be_greater_or_equal_zero')) if adjustment == 0 }
 
     # All stock level adjustments ordered by their created date desending
-    scope :ordered, -> { order(:id => :desc) }
+    scope :ordered, -> { order(id: :desc) }
 
   end
 end

data/app/models/tienda/tax_rate.rb

@@ -1,23 +1,21 @@
 module Tienda
   class TaxRate < ActiveRecord::Base
 
-    self.table_name = 'tienda_tax_rates'
-
     include Tienda::AssociatedCountries
 
     # The order address types which may be used when choosing how to apply the tax rate
     ADDRESS_TYPES = ['billing', 'delivery']
 
     # Validations
-    validates :name, :presence => true
-    validates :address_type, :inclusion => {:in => ADDRESS_TYPES}
-    validates :rate, :numericality => true
+    validates :name, presence: true
+    validates :address_type, inclusion: {in: ADDRESS_TYPES}
+    validates :rate, numericality: true
 
     # All products which are assigned to this tax rate
-    has_many :products, :dependent => :restrict_with_exception, :class_name => 'Tienda::Product'
+    has_many :products, dependent: :restrict_with_exception, class_name: 'Tienda::Product'
 
     # All delivery service prices which are assigned to this tax rate
-    has_many :delivery_service_prices, :dependent => :restrict_with_exception, :class_name => 'Tienda::DeliveryServicePrice'
+    has_many :delivery_service_prices, dependent: :restrict_with_exception, class_name: 'Tienda::DeliveryServicePrice'
 
     # All tax rates ordered by their ID
     scope :ordered, -> { order(:id)}

data/app/models/tienda/user.rb

@@ -6,9 +6,9 @@ module Tienda
     has_secure_password
 
     # Validations
-    validates :first_name, :presence => true
-    validates :last_name, :presence => true
-    validates :email_address, :presence => true
+    validates :first_name, presence: true
+    validates :last_name, presence: true
+    validates :email_address, presence: true
 
     # The user's first name & last name concatenated
     #
@@ -39,7 +39,7 @@ module Tienda
     # @param paassword [String]
     # @return [Tienda::User]
     def self.authenticate(email_address, password)
-      user = self.where(:email_address => email_address).first
+      user = self.where(email_address: email_address).first
       return false if user.nil?
       return false unless user.authenticate(password)
       user

data/app/validators/permalink_validator.rb

@@ -1,6 +1,6 @@
 class PermalinkValidator < ActiveModel::EachValidator
   def validate_each(record, attribute, value)
-    unless value =~ /\A[a-zA-Z0-9-_]+\Z/
+    unless value =~ /\A[a-zA-Z0-9\-_]+\Z/
       record.errors.add(attribute, :wrong_format)
     end
   end

data/app/views/layouts/tienda/application.html.haml

@@ -1,34 +1,41 @@
 !!!
-%html
+%html{lang: I18n.locale}
   %head
+    %meta{charset: "utf-8"}/
+    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}/
+    %meta{content: "width=device-width, initial-scale=1", name: "viewport"}/
     %title #{@page_title} - Tienda
-    = stylesheet_link_tag 'tienda/application'
+    %meta{content: "http://gonzalo.robaina.me", name: "author"}/
+    =# stylesheet_link_tag 'tienda/application'
+    / Bootstrap Styles
+    %link{href: '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css', rel: 'stylesheet'}
+    / FontAwesome Styles
+    %link{href: '//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', rel: 'stylesheet'}
+    / Morris Chart and Custom Styles
+    = stylesheet_link_tag 'tienda/morris-0.4.3.min', 'tienda/custom-styles'
+    / Google Fonts
+    %link{:href => "http://fonts.googleapis.com/css?family=Open+Sans", :rel => "stylesheet", :type => "text/css"}/
     = javascript_include_tag 'tienda/application'
     = csrf_meta_tags
     :javascript
       window.Tienda = {}
       window.Tienda.currencyUnit = "#{h Tienda.settings.currency_unit}";
-  %body
-    %nav.sidebar
-      %header.logo
-        %h1= link_to "Tienda", root_path
-        %p v#{Tienda::VERSION}
-      %p.logged= t('.logged_in_as', user_name: current_user.full_name)
+  %body{class: body_class}
+    #wrapper
+      = render 'navbar'
 
-      %ul
-        - for item in Tienda::NavigationManager.find(:admin_primary).items
-          %li= navigation_manager_link item
+      = render 'sidebar'
 
-        %li= link_to t('.logout'), [:logout], :method => :delete
+      #page-wrapper
+        #page-inner
+          = yield
 
-    %header.main
-      = yield :header
-
-    #content
-      = display_flash
-      %section.main
-        = yield
-
-    %footer
-      %p.store= link_to "← #{t('.goto')} #{Tienda.settings.store_name}".html_safe, '/'
+          %footer
+            %p
+              Powered by Tienda Gem by:
+              %a{:href => "http://gonzalo.robaina.me"} Gonzalo Robaina
+              | Template by:
+              %a{:href => "http://webthemez.com"} WebThemez
 
+  %script{src: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"}
+  = javascript_include_tag 'tienda/jquery.metisMenu', 'tienda/raphael-2.1.0.min', 'tienda/morris'

data/app/views/layouts/tienda/sub.html.haml

@@ -1,10 +1,48 @@
 !!!
-%html.login
+%html{lang: I18n.locale}
   %head
+    %meta{charset: "utf-8"}/
+    %meta{content: "IE=edge", "http-equiv" => "X-UA-Compatible"}/
+    %meta{content: "width=device-width, initial-scale=1", name: "viewport"}/
     %title #{@page_title} - Tienda
-    %meta{:name => 'viewport', :content => 'width=device-width, initial-scale=1.0'}
-    = stylesheet_link_tag 'tienda/sub'
+    %meta{content: "http://gonzalo.robaina.me", name: "author"}/
+    =# stylesheet_link_tag 'tienda/application'
+    / Bootstrap Styles
+    %link{href: '//maxcdn.bootstrapcdn.com/bootstrap/3.3.4/css/bootstrap.min.css', rel: 'stylesheet'}
+    / FontAwesome Styles
+    %link{href: '//maxcdn.bootstrapcdn.com/font-awesome/4.3.0/css/font-awesome.min.css', rel: 'stylesheet'}
+    / Morris Chart and Custom Styles
+    = stylesheet_link_tag 'tienda/morris-0.4.3.min', 'tienda/custom-styles'
+    / Google Fonts
+    %link{href: 'http://fonts.googleapis.com/css?family=Open+Sans', rel: 'stylesheet', type: 'text/css'}/
     = javascript_include_tag 'tienda/application'
-  %body
-    #content
-      = yield
+    = csrf_meta_tags
+    :javascript
+      window.Tienda = {}
+      window.Tienda.currencyUnit = "#{h Tienda.settings.currency_unit}";
+  %body{class: body_class}
+
+    .container-fluid
+      .row
+        .col-md-4.col-md-offset-4
+          .jumbotron
+            %h1 Tienda
+
+      .row
+        .col-md-4.col-md-offset-4
+          .well
+            = yield
+
+      %footer
+        .row
+          .col-md-4.col-md-offset-4
+            %em Powered by
+            %br
+            Tienda Gem by:
+            %a{:href => "http://gonzalo.robaina.me"} Gonzalo Robaina
+            %br
+            Template by:
+            %a{:href => "http://webthemez.com"} WebThemez
+
+  %script{src: "https://maxcdn.bootstrapcdn.com/bootstrap/3.3.4/js/bootstrap.min.js"}
+  = javascript_include_tag 'tienda/jquery.metisMenu', 'tienda/raphael-2.1.0.min', 'tienda/morris'

data/app/views/tienda/application/_navbar.html.haml

@@ -0,0 +1,164 @@
+%nav.navbar.navbar-default.top-navbar{:role => "navigation"}
+  .navbar-header
+    %button.navbar-toggle{"data-target" => ".sidebar-collapse", "data-toggle" => "collapse", :type => "button"}
+      %span.sr-only Toggle navigation
+      %span.icon-bar
+      %span.icon-bar
+      %span.icon-bar
+    %a.navbar-brand{href: root_path}
+      %i.fa.fa-shopping-cart
+      Tienda
+  %ul.nav.navbar-top-links.navbar-right
+    -# %li.dropdown
+    -#   %a.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :href => "#"}
+    -#     %i.fa.fa-envelope.fa-fw
+    -#     %i.fa.fa-caret-down
+    -#   %ul.dropdown-menu.dropdown-messages
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %strong John Doe
+    -#           %span.pull-right.text-muted
+    -#             %em Today
+    -#         %div Lorem Ipsum has been the industry's standard dummy text ever since the 1500s...
+    -#     %li.divider
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %strong John Smith
+    -#           %span.pull-right.text-muted
+    -#             %em Yesterday
+    -#         %div Lorem Ipsum has been the industry's standard dummy text ever since an kwilnw...
+    -#     %li.divider
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %strong John Smith
+    -#           %span.pull-right.text-muted
+    -#             %em Yesterday
+    -#         %div Lorem Ipsum has been the industry's standard dummy text ever since the...
+    -#     %li.divider
+    -#     %li
+    -#       %a.text-center{:href => "#"}
+    -#         %strong Read All Messages
+    -#         %i.fa.fa-angle-right
+    -#   / /.dropdown-messages
+    -# / /.dropdown
+    -# %li.dropdown
+    -#   %a.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :href => "#"}
+    -#     %i.fa.fa-tasks.fa-fw
+    -#     %i.fa.fa-caret-down
+    -#   %ul.dropdown-menu.dropdown-tasks
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %p
+    -#             %strong Task 1
+    -#             %span.pull-right.text-muted 60% Complete
+    -#           .progress.progress-striped.active
+    -#             .progress-bar.progress-bar-success{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => "60", :role => "progressbar", :style => "width: 60%"}
+    -#               %span.sr-only 60% Complete (success)
+    -#     %li.divider
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %p
+    -#             %strong Task 2
+    -#             %span.pull-right.text-muted 28% Complete
+    -#           .progress.progress-striped.active
+    -#             .progress-bar.progress-bar-info{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => "28", :role => "progressbar", :style => "width: 28%"}
+    -#               %span.sr-only 28% Complete
+    -#     %li.divider
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %p
+    -#             %strong Task 3
+    -#             %span.pull-right.text-muted 60% Complete
+    -#           .progress.progress-striped.active
+    -#             .progress-bar.progress-bar-warning{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => "60", :role => "progressbar", :style => "width: 60%"}
+    -#               %span.sr-only 60% Complete (warning)
+    -#     %li.divider
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %p
+    -#             %strong Task 4
+    -#             %span.pull-right.text-muted 85% Complete
+    -#           .progress.progress-striped.active
+    -#             .progress-bar.progress-bar-danger{"aria-valuemax" => "100", "aria-valuemin" => "0", "aria-valuenow" => "85", :role => "progressbar", :style => "width: 85%"}
+    -#               %span.sr-only 85% Complete (danger)
+    -#     %li.divider
+    -#     %li
+    -#       %a.text-center{:href => "#"}
+    -#         %strong See All Tasks
+    -#         %i.fa.fa-angle-right
+    -#   / /.dropdown-tasks
+    -# / /.dropdown
+    -# %li.dropdown
+    -#   %a.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :href => "#"}
+    -#     %i.fa.fa-bell.fa-fw
+    -#     %i.fa.fa-caret-down
+    -#   %ul.dropdown-menu.dropdown-alerts
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %i.fa.fa-comment.fa-fw
+    -#           New Comment
+    -#           %span.pull-right.text-muted.small 4 min
+    -#     %li.divider
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %i.fa.fa-twitter.fa-fw
+    -#           3 New Followers
+    -#           %span.pull-right.text-muted.small 12 min
+    -#     %li.divider
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %i.fa.fa-envelope.fa-fw
+    -#           Message Sent
+    -#           %span.pull-right.text-muted.small 4 min
+    -#     %li.divider
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %i.fa.fa-tasks.fa-fw
+    -#           New Task
+    -#           %span.pull-right.text-muted.small 4 min
+    -#     %li.divider
+    -#     %li
+    -#       %a{:href => "#"}
+    -#         %div
+    -#           %i.fa.fa-upload.fa-fw
+    -#           Server Rebooted
+    -#           %span.pull-right.text-muted.small 4 min
+    -#     %li.divider
+    -#     %li
+    -#       %a.text-center{:href => "#"}
+    -#         %strong See All Alerts
+    -#         %i.fa.fa-angle-right
+      / /.dropdown-alerts
+    / /.dropdown
+    %li.dropdown
+      %a.dropdown-toggle{"aria-expanded" => "false", "data-toggle" => "dropdown", :href => "#"}
+        %i.fa.fa-user.fa-fw
+        %i.fa.fa-caret-down
+      %ul.dropdown-menu.dropdown-user
+        %li
+          %a{:href => "#"}
+            %i.fa.fa-user.fa-fw
+            User Profile
+        %li
+          %a{:href => "#"}
+            %i.fa.fa-gear.fa-fw
+            Settings
+        %li.divider
+        %li
+          %a{href: logout_path, data: { method: :delete }}
+            %i.fa.fa-sign-out.fa-fw
+            = t('.logout')
+      / /.dropdown-user
+    / /.dropdown
+/ /. NAV TOP

data/app/views/tienda/application/_sidebar.html.haml

@@ -0,0 +1,6 @@
+%nav.navbar-default.navbar-side{:role => "navigation"}
+  .sidebar-collapse
+    %ul#main-menu.nav
+      - for item in Tienda::NavigationManager.find(:admin_primary).items
+        %li= navigation_manager_link item
+/ /. NAV SIDE