tienda 2.0.1 → 2.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 869f733fb0cbb73c7cb3bbbc89f0b5b3d9434937
-  data.tar.gz: 42789f8109b671efb78b8dea797aff4d31158386
+  metadata.gz: 75f31e72ee89918573cb2806723fc533734645a9
+  data.tar.gz: 76d33082565183722512ea4cbfdac5d63243410e
 SHA512:
-  metadata.gz: 68386024a0cbd7e311b75bbac5ff6242cb1b99193e9a00aef5180f7ed34a837f78f2ea9d3b44f5e0ee38f7f7a37a55f533373c1e20648bc691ecb5b074daf2ec
-  data.tar.gz: eea936572ee550b284c7540dc12ad71c6d3a37d0809dbc2099f98116b8cbc7088013fc63a3782b737e02b93cd977bab2a168e5d1a6e7a9522b2d86d322d91630
+  metadata.gz: 4e37424a4dbce21b3484ebaf1899d709ff4f14b3c9bd8e4444a2b9a3fb0fb47243a77eb8bbd2eb553936e4d0c9696939fba981eef11ba17190fd8ce65bb4185a
+  data.tar.gz: 04c0e881b1f0e3a417a0d56433802dd51af397f4b5253de5131579962768816ac5bf0a9a13a9c2606d42191a1d859f4ca622cc6588e070d57dcba564045610c1

data/app/assets/javascripts/tienda/application.coffee

@@ -12,7 +12,7 @@ $ ->
   $('.tienda_products_index, .tienda_variants_index').on('ajax:success', '#new_stock_level_adjustment', (e, data, status, xhr) ->
     quantity = parseInt($(this).find('#stock_level_adjustment_adjustment').val())
     product = $(this).find('#item_id').val()
-    stock_label = $('a.btn-sm[href*=' + product + ']').closest('td').find('b');
+    stock_label = $('a.btn-sm[href*=' + product + ']').closest('td').find('b')
     old_quantity = parseInt(stock_label.text())
     $('#stockModal').modal('hide')
     if isNaN(old_quantity)
@@ -80,21 +80,6 @@ $ ->
 #     window.open($(this).attr('href'), 'despatchnote', 'width=700,height=800')
 #     false
 #
-#   # Close dialog
-#   $('body').on 'click', 'a[rel=closeDialog]', Nifty.Dialog.closeTopDialog
-#
-#   # Open AJAX dialogs
-#   $('a[rel=dialog]').on 'click', ->
-#     element = $(this)
-#     options = {}
-#     options.width = element.data('dialog-width') if element.data('dialog-width')
-#     options.offset = element.data('dialog-offset') if element.data('dialog-offset')
-#     options.behavior = element.data('dialog-behavior') if element.data('dialog-behavior')
-#     options.id = 'ajax'
-#     options.url = element.attr('href')
-#     Nifty.Dialog.open(options)
-#     false
-#
 #   # Format money values to 2 decimal places
 #   $('div.moneyInput input').each formatMoneyField
 #   $('body').on('blur', 'div.moneyInput input', formatMoneyField)
@@ -106,44 +91,3 @@ $ ->
 #   value = $(this).val().replace /,/, ""
 #   $(this).val(parseFloat(value).toFixed(2)) if value.length
 #
-# #
-# # Stock Level Adjustment dialog beavior
-# #
-# Nifty.Dialog.addBehavior
-#   name: 'stockLevelAdjustments'
-#   onLoad: (dialog,options)->
-#     $('input[type=text]:first', dialog).focus()
-#     $(dialog).on 'submit', 'form', ->
-#       form = $(this)
-#       $.ajax
-#         url: form.attr('action')
-#         method: 'POST'
-#         data: form.serialize()
-#         dataType: 'text'
-#         success: (data)->
-#           $('div.table', dialog).replaceWith(data)
-#           $('input[type=text]:first', dialog).focus()
-#         error: (xhr)->
-#           if xhr.status == 422
-#             alert xhr.responseText
-#           else
-#             alert 'An error occurred while saving the stock level.'
-#       false
-#     $(dialog).on 'click', 'nav.pagination a', ->
-#       $.ajax
-#         url: $(this).attr('href')
-#         success: (data)->
-#           $('div.table', dialog).replaceWith(data)
-#       false
-#
-# #
-# # Always fire keyboard shortcuts when focused on fields
-# #
-# Mousetrap.stopCallback = -> false
-#
-# #
-# # Close dialogs on escape
-# #
-# Mousetrap.bind 'escape', ->
-#   Nifty.Dialog.closeTopDialog()
-#   false

data/app/controllers/tienda/dashboard_controller.rb

@@ -7,11 +7,11 @@ module Tienda
       @last_30_days_orders = {}
       end_date = Date.today
       start_date = end_date - 30.days
-      last_30_days_orders = Tienda::Order.group('DATE(created_at)').where(created_at: start_date..end_date).count
+      last_30_days_orders = Tienda::Order.received.group('DATE(created_at)').where(created_at: start_date..end_date).count
       (start_date..end_date).each do |day|
         @last_30_days_orders[day] = last_30_days_orders[day] || 0
       end
-      @sales_by_category = Tienda::Order.joins(products: [:product_category]).where(created_at: start_date..end_date).group('tienda_product_categories.name').count
+      @sales_by_category = Tienda::Order.received.joins(products: [:product_category]).where(created_at: start_date..end_date).group('tienda_product_categories.name').count
       @users_count = Tienda::User.count
     end
 

data/app/controllers/tienda/product_categories_controller.rb

@@ -5,10 +5,11 @@ module Tienda
     before_filter { params[:id] && @product_category = Tienda::ProductCategory.find(params[:id]) }
 
     def index
-      @product_categories = Tienda::ProductCategory.ordered.all
+      @product_categories = Tienda::ProductCategory.root.ordered.includes(:children)
     end
 
     def new
+      @parents = Tienda::ProductCategory.all
       @product_category = Tienda::ProductCategory.new
     end
 
@@ -22,6 +23,7 @@ module Tienda
     end
 
     def edit
+      @parents = Tienda::ProductCategory.all
     end
 
     def update
@@ -40,7 +42,7 @@ module Tienda
     private
 
     def safe_params
-      params[:product_category].permit(:name, :permalink, :description, :image_file)
+      params[:product_category].permit(:name, :permalink, :description, :image_file, :parent_id)
     end
 
   end

data/app/helpers/tienda/product_categories_helper.rb

@@ -0,0 +1,56 @@
+module Tienda
+  module ProductCategoriesHelper
+
+    def product_category_spacing(category, relative_depth)
+      ("<span style='display:inline-block;width:#{relative_depth}em;'></span>").html_safe
+    end
+
+    def product_category_rows(category, current_category = nil, link_to_current = true, relative_depth = 0)
+      if category.present? && category.children.any?
+        relative_depth += 1
+        String.new.tap do |s|
+          category.children.ordered.each do |child|
+            s << '<tr><td>'
+            if child == current_category
+              if link_to_current == false
+                s << "#{product_category_spacing child, relative_depth} &#8627; #{child.name} (#{t('shoppe.product_category.nesting.current_category')})"
+              else
+                s << "#{product_category_spacing child, relative_depth} &#8627; #{link_to(child.name, [:edit, child]).html_safe} (#{t('shoppe.product_category.nesting.current_category')})"
+              end
+            else
+              s << "#{product_category_spacing child, relative_depth} &#8627; #{link_to(child.name, [:edit, child]).html_safe}"
+            end
+            s << '</td></tr>'
+            s << product_category_rows(child, current_category, link_to_current, relative_depth)
+          end
+        end.html_safe
+      else
+        ''
+      end
+    end
+
+    def product_categories_options_for_select(selected = nil, disable = nil)
+      String.new.tap do |s|
+        Tienda::ProductCategory.root.ordered.includes(:children).each do |category|
+          s << product_categories_options_for_select_recursive(category, 0, selected, disable)
+        end
+      end.html_safe
+    end
+
+    def product_categories_options_for_select_recursive(category, depth, selected, disable)
+      if category.present?
+        String.new.tap do |s|
+          s << "<option value='#{category.id}'#{' selected' if selected == category.id}#{' disabled' if disable == category.id}>#{' &#8627; ' * depth}#{category.name}</option>"
+          if category.children.any?
+            depth += 1
+            category.children.ordered.each do |child|
+              s << product_categories_options_for_select_recursive(child, depth, selected, disable)
+            end
+          end
+        end.html_safe
+      else
+        ''
+      end
+    end
+  end
+end

data/app/models/tienda/product.rb

@@ -21,18 +21,18 @@ module Tienda
     # The product's category
     #
     # @return [Tienda::ProductCategory]
-    belongs_to :product_category, class_name: 'Tienda::ProductCategory'
+    belongs_to :product_category
 
     # The product's tax rate
     #
     # @return [Tienda::TaxRate]
-    belongs_to :tax_rate, class_name: "Tienda::TaxRate"
+    belongs_to :tax_rate
 
     # 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, 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
 
     # Stock level adjustments for this product
     has_many :stock_level_adjustments, dependent: :destroy
@@ -108,6 +108,20 @@ module Tienda
       nifty_attachments.select { |attachment| attachment.role != "data_sheet" }
     end
 
+    # Return all product categories
+    #
+    # @return [Array]
+    def categories
+      parent_category_id = product_category.id
+      cats = []
+      while parent_category_id != nil
+        c = Tienda::ProductCategory.find(parent_category_id)
+        cats << c
+        parent_category_id = c.parent_id
+      end
+      cats
+    end
+
     # Search for products which include the given attributes and return an active record
     # scope of these products. Chainable with other scopes and with_attributes methods.
     # For example:

data/app/models/tienda/product_category.rb

@@ -1,20 +1,23 @@
 module Tienda
   class ProductCategory < ActiveRecord::Base
 
-    self.table_name = 'tienda_product_categories'
-
     # Categories have an image attachment
     attachment :image
 
     # All products within this category
-    has_many :products, :dependent => :restrict_with_exception, :class_name => 'Tienda::Product'
+    has_many :products, dependent: :restrict_with_exception
+    # Sub Categories relationships
+    has_many :children, class_name: 'Tienda::ProductCategory', foreign_key: :parent_id
+    belongs_to :parent, class_name: 'Tienda::ProductCategory'
 
     # Validations
-    validates :name, :presence => true
-    validates :permalink, :presence => true, :uniqueness => true, :permalink => true
+    validates :name, presence: true
+    validates :permalink, presence: true, uniqueness: true, permalink: true
 
     # All categories ordered by their name ascending
     scope :ordered, -> { order(:name) }
+    scope :root, -> { where(parent_id: nil) }
+    scope :sub_categories, -> { where.not(parent_id: nil) }
 
     # Set the permalink on callback
     before_validation { self.permalink = self.name.parameterize if self.permalink.blank? && self.name.is_a?(String) }

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

@@ -7,14 +7,12 @@
     %title #{@page_title} - Tienda
     %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"}/
+    = stylesheet_link_tag 'tienda/custom-styles'
+
+    %link{href: '//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.css', rel: 'stylesheet'}
+    %link{href: 'http://fonts.googleapis.com/css?family=Open+Sans', rel: 'stylesheet', type: 'text/css'}/
     = javascript_include_tag 'tienda/application'
     = csrf_meta_tags
     :javascript
@@ -38,4 +36,6 @@
               %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'
+  %script{src: "//cdnjs.cloudflare.com/ajax/libs/raphael/2.1.0/raphael-min.js"}
+  %script{src: "//cdnjs.cloudflare.com/ajax/libs/morris.js/0.5.1/morris.min.js"}
+  = javascript_include_tag 'tienda/jquery.metisMenu'

data/app/views/tienda/product_categories/_form.html.haml

@@ -5,11 +5,15 @@
       = t('tienda.product_category.category_details')
     .panel-body
       .row
-        .col-md-6
+        .col-md-4
+          .form-group
+            = f.label :name, t('tienda.product_category.parent')
+            = f.select :parent_id, product_categories_options_for_select(@product_category.parent_id, @product_category.id), {prompt: true}, {class: 'form-control'}
+        .col-md-4
           .form-group
             = f.label :name, t('tienda.product_category.name')
             = f.text_field :name, class: 'focus form-control'
-        .col-md-6
+        .col-md-4
           .form-group
             = f.label :permalink, t('tienda.product_category.permalink')
             = f.text_field :permalink, class: 'form-control'

data/app/views/tienda/product_categories/index.html.haml

@@ -24,6 +24,7 @@
           %tr.empty
             %td= t('tienda.product_category.no_categories')
         - else
-          - for cat in @product_categories
+          - @product_categories.each do |cat|
             %tr
               %td= link_to cat.name, [:edit, cat]
+            = product_category_rows(cat)

data/config/initializers/assets.rb

@@ -5,5 +5,5 @@ Rails.application.config.assets.version = '1.0'
 
 # Precompile additional assets.
 # application.js, application.css, and all non-JS/CSS in app/assets folder are already added.
-Rails.application.config.assets.precompile += %w( tienda/morris-0.4.3.min.css tienda/custom-styles.css )
-Rails.application.config.assets.precompile += %w( tienda/jquery.metisMenu.js tienda/raphael-2.1.0.min.js tienda/morris.js tienda/custom-scripts.js )
+Rails.application.config.assets.precompile += %w( tienda/custom-styles.css )
+Rails.application.config.assets.precompile += %w( tienda/jquery.metisMenu.js )

data/db/migrate/20150605232554_add_parent_id_to_categories.rb

@@ -0,0 +1,5 @@
+class AddParentIdToCategories < ActiveRecord::Migration
+  def change
+    add_column :tienda_product_categories, :parent_id, :int, index: true
+  end
+end

data/lib/tienda/version.rb

@@ -1,3 +1,3 @@
 module Tienda
-  VERSION = '2.0.1'
+  VERSION = '2.0.2'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: tienda
 version: !ruby/object:Gem::Version
-  version: 2.0.1
+  version: 2.0.2
 platform: ruby
 authors:
 - Gonzalo Robaina
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-06-04 00:00:00.000000000 Z
+date: 2015-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -400,21 +400,14 @@ files:
 - app/assets/images/tienda/statuses/shipped.svg
 - app/assets/images/tienda/table-tear-off.png
 - app/assets/javascripts/tienda/application.coffee
-- app/assets/javascripts/tienda/chosen.jquery.js
-- app/assets/javascripts/tienda/custom-scripts.js
-- app/assets/javascripts/tienda/custom.js
 - app/assets/javascripts/tienda/jquery.metisMenu.js
 - app/assets/javascripts/tienda/jquery_ui.js
-- app/assets/javascripts/tienda/morris.js
-- app/assets/javascripts/tienda/mousetrap.js
 - app/assets/javascripts/tienda/order_form.coffee
-- app/assets/javascripts/tienda/raphael-2.1.0.min.js
 - app/assets/stylesheets/tienda/application.scss
 - app/assets/stylesheets/tienda/chosen.scss
 - app/assets/stylesheets/tienda/custom-styles.scss
 - app/assets/stylesheets/tienda/dialog.scss
 - app/assets/stylesheets/tienda/elements.scss
-- app/assets/stylesheets/tienda/morris-0.4.3.min.css
 - app/assets/stylesheets/tienda/printable.scss
 - app/assets/stylesheets/tienda/reset.scss
 - app/assets/stylesheets/tienda/sub.scss
@@ -436,6 +429,7 @@ files:
 - app/controllers/tienda/users_controller.rb
 - app/controllers/tienda/variants_controller.rb
 - app/helpers/tienda/application_helper.rb
+- app/helpers/tienda/product_categories_helper.rb
 - app/mailers/tienda/order_mailer.rb
 - app/mailers/tienda/user_mailer.rb
 - app/models/tienda/country.rb
@@ -530,6 +524,7 @@ files:
 - db/migrate/20150517195800_remove_stock_level_item_polymorphism.rb
 - db/migrate/20150517212100_update_stock_counter_cache.rb
 - db/migrate/20150603235417_add_document_to_orders.rb
+- db/migrate/20150605232554_add_parent_id_to_categories.rb
 - db/seeds.rb
 - db/seeds_data/poe400.jpg
 - db/seeds_data/snom-870-blk.jpg