shoppe 0.0.14 → 0.0.15

data/app/models/shoppe/product_attribute.rb

@@ -1,51 +1,53 @@
-class Shoppe::ProductAttribute < ActiveRecord::Base
+module Shoppe
+  class ProductAttribute < ActiveRecord::Base
   
-  # Set the table name
-  self.table_name = 'shoppe_product_attributes'  
+    # Set the table name
+    self.table_name = 'shoppe_product_attributes'  
   
-  # Validations
-  validates :key, :presence => true
+    # Validations
+    validates :key, :presence => true
   
-  # Relationships
-  belongs_to :product, :class_name => 'Shoppe::Product'
+    # Relationships
+    belongs_to :product, :class_name => 'Shoppe::Product'
   
-  # Scopes
-  scope :searchable, -> { where(:searchable => true) }
-  scope :public, -> { where(:public => true) }
+    # Scopes
+    scope :searchable, -> { where(:searchable => true) }
+    scope :public, -> { where(:public => true) }
   
-  # Return the the available options as a hash
-  def self.grouped_hash
-    all.group_by(&:key).inject(Hash.new) do |h, (key, attributes)|
-      h[key] = attributes.map(&:value).uniq
-      h
+    # Return the the available options as a hash
+    def self.grouped_hash
+      all.group_by(&:key).inject(Hash.new) do |h, (key, attributes)|
+        h[key] = attributes.map(&:value).uniq
+        h
+      end
     end
-  end
   
-  # Create/update attributes for a product based on the provided hash of
-  # keys & values
-  def self.update_from_array(array)
-    existing_keys = self.pluck(:key)
-    index = 0
-    array.each do |hash|
-      next if hash['key'].blank?
-      index += 1
-      params = hash.merge({
-        :searchable => hash['searchable'].to_s == '1',
-        :public => hash['public'].to_s == '1',
-        :position => index
-      })
-      if existing_attr = self.where(:key => hash['key']).first
-        if hash['value'].blank?
-          existing_attr.destroy
-          index -= 1
+    # Create/update attributes for a product based on the provided hash of
+    # keys & values
+    def self.update_from_array(array)
+      existing_keys = self.pluck(:key)
+      index = 0
+      array.each do |hash|
+        next if hash['key'].blank?
+        index += 1
+        params = hash.merge({
+          :searchable => hash['searchable'].to_s == '1',
+          :public => hash['public'].to_s == '1',
+          :position => index
+        })
+        if existing_attr = self.where(:key => hash['key']).first
+          if hash['value'].blank?
+            existing_attr.destroy
+            index -= 1
+          else
+            existing_attr.update_attributes(params)
+          end
         else
-          existing_attr.update_attributes(params)
+          attribute = self.create(params)
         end
-      else
-        attribute = self.create(params)
       end
+      self.where(:key => existing_keys - array.map { |h| h['key']}).delete_all
     end
-    self.where(:key => existing_keys - array.map { |h| h['key']}).delete_all
-  end
   
+  end
 end

data/app/models/shoppe/product_category.rb

@@ -1,22 +1,24 @@
-class Shoppe::ProductCategory < ActiveRecord::Base
+module Shoppe
+  class ProductCategory < ActiveRecord::Base
   
-  # Set the table name
-  self.table_name = 'shoppe_product_categories'
+    # Set the table name
+    self.table_name = 'shoppe_product_categories'
   
-  # Attachments
-  attachment :image
+    # Attachments
+    attachment :image
   
-  # Relationships
-  has_many :products, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Product'
+    # Relationships
+    has_many :products, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Product'
   
-  # Validations
-  validates :name, :presence => true
-  validates :permalink, :presence => true, :uniqueness => true
+    # Validations
+    validates :name, :presence => true
+    validates :permalink, :presence => true, :uniqueness => true
 
-  # Scopes
-  scope :ordered, -> { order(:name) }
+    # Scopes
+    scope :ordered, -> { order(:name) }
   
-  # Set the permalink
-  before_validation { self.permalink = self.name.parameterize if self.permalink.blank? && self.name.is_a?(String) }
+    # Set the permalink
+    before_validation { self.permalink = self.name.parameterize if self.permalink.blank? && self.name.is_a?(String) }
   
+  end
 end

data/app/models/shoppe/stock_level_adjustment.rb

@@ -2,11 +2,10 @@ module Shoppe
   class StockLevelAdjustment < ActiveRecord::Base
     
     # Relationships
-    belongs_to :product
+    belongs_to :item, :polymorphic => true
     belongs_to :parent, :polymorphic => true
     
     # Validations
-    validates :product_id, :presence => true
     validates :description, :presence => true
     validates :adjustment, :numericality => true
     validate { errors.add(:adjustment, "must be greater or less than zero") if adjustment == 0 }

data/app/models/shoppe/tax_rate.rb

@@ -12,8 +12,8 @@ module Shoppe
     validates :rate, :numericality => true
     
     # Relationships
-    has_many :products, :dependent => :restrict_with_exception
-    has_many :delivery_service_prices, :dependent => :restrict_with_exception
+    has_many :products, :dependent => :restrict_with_exception, :class_name => 'Shoppe::Product'
+    has_many :delivery_service_prices, :dependent => :restrict_with_exception, :class_name => 'Shoppe::DeliveryServicePrice'
     
     # Scopes
     scope :ordered, -> { order("shoppe_tax_rates.id")}

data/app/models/shoppe/user.rb

@@ -1,41 +1,43 @@
-class Shoppe::User < ActiveRecord::Base
+module Shoppe
+  class User < ActiveRecord::Base
 
-  # Set the table name
-  self.table_name = 'shoppe_users'
+    # Set the table name
+    self.table_name = 'shoppe_users'
   
-  # Self explanatory I think!
-  has_secure_password
+    # Self explanatory I think!
+    has_secure_password
   
-  # Validations
-  validates :first_name, :presence => true
-  validates :last_name, :presence => true
-  validates :email_address, :presence => true
+    # Validations
+    validates :first_name, :presence => true
+    validates :last_name, :presence => true
+    validates :email_address, :presence => true
   
-  # The user's first name & last name concatenated
-  def full_name
-    "#{first_name} #{last_name}"
-  end
+    # The user's first name & last name concatenated
+    def full_name
+      "#{first_name} #{last_name}"
+    end
   
-  # The user's first name & initial of last name concatenated
-  def short_name
-    "#{first_name} #{last_name[0,1]}"
-  end
+    # The user's first name & initial of last name concatenated
+    def short_name
+      "#{first_name} #{last_name[0,1]}"
+    end
   
-  # Reset the user's password to something random and e-mail it to them
-  def reset_password!
-    self.password = SecureRandom.hex(8)
-    self.password_confirmation = self.password
-    self.save!
-    Shoppe::UserMailer.new_password(self).deliver
-  end
+    # Reset the user's password to something random and e-mail it to them
+    def reset_password!
+      self.password = SecureRandom.hex(8)
+      self.password_confirmation = self.password
+      self.save!
+      Shoppe::UserMailer.new_password(self).deliver
+    end
   
-  # Attempt to authenticate a user based on email & password. Returns the 
-  # user if successful otherwise returns false.
-  def self.authenticate(email_address, password)
-    user = self.where(:email_address => email_address).first
-    return false if user.nil?
-    return false unless user.authenticate(password)
-    user
-  end
+    # Attempt to authenticate a user based on email & password. Returns the 
+    # user if successful otherwise returns false.
+    def self.authenticate(email_address, password)
+      user = self.where(:email_address => email_address).first
+      return false if user.nil?
+      return false unless user.authenticate(password)
+      user
+    end
   
+  end
 end

data/app/views/shoppe/orders/index.html.haml

@@ -23,9 +23,8 @@
         →
         = f.text_field :received_at_lteq, :class => 'small'
     %dl.right
-      %dt= f.label :products_title_cont, "Contains product"
-      %dd= f.text_field :products_title_cont
-
+      %dt= f.label :products_name_cont, "Contains product"
+      %dd= f.text_field :products_name_cont
       %dt= f.label :email_address_cont, "E-Mail Address"
       %dd= f.text_field :email_address_cont
       %dt= f.label :phone_number_cont, "Phone Number"
@@ -57,7 +56,7 @@
             %td
               %ul
                 - for item in order.order_items
-                  %li #{item.quantity} x #{item.product.title}
+                  %li #{item.quantity} x #{item.ordered_item.full_name}
             %td= number_to_currency order.total
             %td= boolean_tag order.paid?
 

data/app/views/shoppe/orders/show.html.haml

@@ -36,10 +36,10 @@
           %dl.form
             %dt.padding= label_tag 'payment_method', 'Payment Method'
             %dd= text_field_tag 'payment_method', '', :class => 'text'
-          %dl
+          %dl.form
             %dt.padding= label_tag 'payment_reference', 'Payment Reference'
             %dd= text_field_tag 'payment_reference', '', :class => 'text'
-          %dl
+          %dl.form
             %dd= submit_tag "Mark as paid", :class => 'button green button-mini'
       
       - if @order.accepted? && !@order.shipped?
@@ -47,7 +47,7 @@
           %dl.form
             %dt.padding= label_tag 'consignment_number', 'Consignment Number'
             %dd= text_field_tag 'consignment_number', '', :class => 'text'
-          %dl
+          %dl.form
             %dd= submit_tag "Mark as shipped", :class => 'button green button-mini'
       
       - if @order.paid? && !(@order.accepted? || @order.rejected?)
@@ -104,8 +104,8 @@
           - for item in @order.order_items
             %tr
               %td.qty= item.quantity
-              %td.product= link_to item.product.title, [:edit, item.product]
-              %td.sku= item.product.sku
+              %td.product= item.ordered_item.full_name
+              %td.sku= item.ordered_item.sku
               %td.money= number_to_currency item.total_cost
               %td.money= number_to_currency item.sub_total
               %td.money= number_to_currency item.tax_amount

data/app/views/shoppe/products/_form.html.haml

@@ -7,8 +7,8 @@
   
     .splitContainer
       %dl.third
-        %dt= f.label :title
-        %dd= f.text_field :title, :class => 'text'
+        %dt= f.label :name
+        %dd= f.text_field :name, :class => 'text focus'
       %dl.third
         %dt= f.label :permalink
         %dd= f.text_field :permalink, :class => 'text'
@@ -66,22 +66,35 @@
         %dd
           = attachment_preview @product.data_sheet
           %p= f.file_field :data_sheet_file
-        
-  = field_set_tag "Pricing" do
-    .splitContainer
-      %dl.third
-        %dt= f.label :price
-        %dd= f.text_field :price, :class => 'text'
-      %dl.third
-        %dt= f.label :cost_price
-        %dd= f.text_field :cost_price, :class => 'text'
-      %dl.third
-        %dt= f.label :tax_rate_id
-        %dd= f.collection_select :tax_rate_id, Shoppe::TaxRate.ordered, :id, :description, {:include_blank => true}, {:class => 'chosen-with-deselect', :data => {:placeholder => "No tax"}}
+     
+  - unless @product.has_variants?   
+    = field_set_tag "Pricing" do
+      .splitContainer
+        %dl.third
+          %dt= f.label :price
+          %dd= f.text_field :price, :class => 'text'
+        %dl.third
+          %dt= f.label :cost_price
+          %dd= f.text_field :cost_price, :class => 'text'
+        %dl.third
+          %dt= f.label :tax_rate_id
+          %dd= f.collection_select :tax_rate_id, Shoppe::TaxRate.ordered, :id, :description, {:include_blank => true}, {:class => 'chosen-with-deselect', :data => {:placeholder => "No tax"}}
+  
+    = field_set_tag "Stock Control" do
+      .splitContainer
+        %dl.half
+          %dt= f.label :weight
+          %dd= f.text_field :weight, :class => 'text'
       
+        %dl.half
+          %dt= f.label :stock_control
+          %dd.checkbox
+            = f.check_box :stock_control
+            = f.label :stock_control, "Enable stock control for this product?"
+
   = field_set_tag "Website Properties" do
     .splitContainer
-      
+
       %dl.half
         %dt= f.label :active, "On sale?"
         %dd.checkbox
@@ -93,18 +106,6 @@
           = f.check_box :featured
           = f.label :featured, "If checked, this product will appear on your homepage"
 
-  = field_set_tag "Stock Control" do
-    .splitContainer
-      %dl.half
-        %dt= f.label :weight
-        %dd= f.text_field :weight, :class => 'text'
-      
-      %dl.half
-        %dt= f.label :stock_control
-        %dd.checkbox
-          = f.check_box :stock_control
-          = f.label :stock_control, "Enable stock control for this product?"
-  
   %p.submit
     - unless @product.new_record?
       %span.right= link_to "Delete", @product, :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this product?"}

data/app/views/shoppe/products/_table.html.haml

@@ -0,0 +1,42 @@
+.table
+  %table.data
+    %thead
+      %tr
+        %th{:width => '20%'} SKU
+        %th{:width => '40%'} Name
+        %th{:width => '25%'} Price/Variants
+        %th{:width => '15%'} Stock
+    %tbody
+      - if products.empty?
+        %tr.empty
+          %td{:colspan => 4} No products to display.
+      - else
+        - for category, products in products
+          %tr
+            %th{:colspan => 4}= category.name
+          - for product in products
+            %tr
+              %td= product.sku
+              %td= link_to product.name, [:edit, product]
+              - if product.has_variants?
+                %td.table{:colspan => 2}
+                  %table.data
+                    - for variant in product.variants
+                      %tr
+                        %td{:width => '40%'}= link_to variant.name, edit_product_variant_path(product, variant)
+                        %td{:width => '30%'}= number_to_currency variant.price
+                        %td{:width => '30%'}
+                          - if variant.stock_control?
+                            %span.float-right= link_to "Edit", stock_level_adjustments_path(:item_type => variant.class, :item_id => variant.id), :class => 'edit', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
+                            = boolean_tag(variant.in_stock?, nil, :true_text => variant.stock, :false_text => 'No stock')
+                          - else
+                            ∞
+              - else
+                %td= number_to_currency product.price
+                %td
+                  - if product.stock_control?
+                    %span.float-right= link_to "Edit", stock_level_adjustments_path(:item_type => product.class, :item_id => product.id), :class => 'edit', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
+                    = boolean_tag(product.in_stock?, nil, :true_text => product.stock, :false_text => 'No stock')
+                  - else
+                    ∞
+                  

data/app/views/shoppe/products/edit.html.haml

@@ -1,7 +1,8 @@
 - @page_title = "Products"
 = content_for :header do
   %p.buttons
-    = link_to "Stock levels", [:stock_levels, @product], :class => 'button' 
+    = link_to "Variants", [@product, :variants], :class => 'button'
+    = link_to "Stock levels", stock_level_adjustments_path(:item_id => @product.id, :item_type => @product.class), :class => 'button', :rel => 'dialog', :data => {:dialog_width => 700, :dialog_behavior => 'stockLevelAdjustments'}
     = link_to "Back to product list", :products, :class => 'button'
   %h2.products Products
 = render 'form'

data/app/views/shoppe/products/index.html.haml

@@ -4,27 +4,4 @@
   %p.buttons= link_to "New product", :new_product, :class => 'button green'  
   %h2.products Products
 
-.table
-  %table.data
-    %thead
-      %tr
-        %th{:width => '20%'} SKU
-        %th{:width => '50%'} Name
-        %th{:width => '15%'} Price
-        %th{:width => '15%'} Stock
-    %tbody
-      - if @products.empty?
-        %tr.empty
-          %td{:colspan => 4} No products to display.
-      - else
-        - for category, products in @products
-          %tr
-            %th{:colspan => 4}= category.name
-          - for product in products
-            %tr
-              %td= product.sku
-              %td= link_to product.title, [:edit, product]
-              %td= number_to_currency product.price
-              %td
-                %span.float-right= link_to "Edit", stock_levels_product_path(product), :class => 'edit'
-                = product.stock_control? ? boolean_tag(product.in_stock?, nil, :true_text => product.stock, :false_text => 'No stock') : ''
+= render 'table', :products => @products