shoppe 0.0.15 → 0.0.16

data/app/models/shoppe/delivery_service_price.rb

@@ -1,3 +1,20 @@
+# == Schema Information
+#
+# Table name: shoppe_delivery_service_prices
+#
+#  id                  :integer          not null, primary key
+#  delivery_service_id :integer
+#  code                :string(255)
+#  price               :decimal(8, 2)
+#  cost_price          :decimal(8, 2)
+#  tax_rate_id         :integer
+#  min_weight          :decimal(8, 2)
+#  max_weight          :decimal(8, 2)
+#  created_at          :datetime
+#  updated_at          :datetime
+#  country_ids         :text
+#
+
 module Shoppe
   class DeliveryServicePrice < ActiveRecord::Base
 

data/app/models/shoppe/order.rb

@@ -1,3 +1,50 @@
+# == Schema Information
+#
+# Table name: shoppe_orders
+#
+#  id                        :integer          not null, primary key
+#  token                     :string(255)
+#  first_name                :string(255)
+#  last_name                 :string(255)
+#  company                   :string(255)
+#  billing_address1          :string(255)
+#  billing_address2          :string(255)
+#  billing_address3          :string(255)
+#  billing_address4          :string(255)
+#  billing_postcode          :string(255)
+#  billing_country_id        :integer
+#  email_address             :string(255)
+#  phone_number              :string(255)
+#  status                    :string(255)
+#  received_at               :datetime
+#  accepted_at               :datetime
+#  shipped_at                :datetime
+#  created_at                :datetime
+#  updated_at                :datetime
+#  delivery_service_id       :integer
+#  delivery_price            :decimal(8, 2)
+#  delivery_cost_price       :decimal(8, 2)
+#  delivery_tax_rate         :decimal(8, 2)
+#  delivery_tax_amount       :decimal(8, 2)
+#  paid_at                   :datetime
+#  accepted_by               :integer
+#  shipped_by                :integer
+#  consignment_number        :string(255)
+#  rejected_at               :datetime
+#  rejected_by               :integer
+#  ip_address                :string(255)
+#  payment_reference         :string(255)
+#  payment_method            :string(255)
+#  notes                     :text
+#  separate_delivery_address :boolean          default(FALSE)
+#  delivery_address1         :string(255)
+#  delivery_address2         :string(255)
+#  delivery_address3         :string(255)
+#  delivery_address4         :string(255)
+#  deilvery_postcode         :string(255)
+#  delivery_country_id       :integer
+#
+
 module Shoppe
   class Order < ActiveRecord::Base
 
@@ -17,7 +64,8 @@ module Shoppe
   
     # Relationships
     belongs_to :delivery_service, :class_name => 'Shoppe::DeliveryService'
-    belongs_to :country, :class_name => 'Shoppe::Country'
+    belongs_to :billing_country, :class_name => 'Shoppe::Country', :foreign_key => 'billing_country_id'
+    belongs_to :delivery_country, :class_name => 'Shoppe::Country', :foreign_key => 'delivery_country_id'
     belongs_to :accepter, :class_name => 'Shoppe::User', :foreign_key => 'accepted_by'
     belongs_to :rejecter, :class_name => 'Shoppe::User', :foreign_key => 'rejected_by'
     belongs_to :shipper, :class_name => 'Shoppe::User', :foreign_key => 'shipped_by'
@@ -30,14 +78,23 @@ module Shoppe
     with_options :if => Proc.new { |o| !o.building? } do |order|
       order.validates :first_name, :presence => true
       order.validates :last_name, :presence => true
-      order.validates :address1, :presence => true
-      order.validates :address3, :presence => true
-      order.validates :address4, :presence => true
-      order.validates :postcode, :presence => true
-      order.validates :country, :presence => true
+      order.validates :billing_address1, :presence => true
+      order.validates :billing_address3, :presence => true
+      order.validates :billing_address4, :presence => true
+      order.validates :billing_postcode, :presence => true
+      order.validates :billing_country, :presence => true
       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
+    with_options :if => :separate_delivery_address? do |order|
+      order.validates :delivery_name, :presence => true
+      order.validates :delivery_address1, :presence => true
+      order.validates :delivery_address3, :presence => true
+      order.validates :delivery_address4, :presence => true
+      order.validates :delivery_postcode, :presence => true
+      order.validates :delivery_country, :presence => true
+    end
+    
     validate do
       unless available_delivery_services.include?(self.delivery_service)
         errors.add :delivery_service_id, "is not suitable for this order"
@@ -54,6 +111,12 @@ module Shoppe
       self.status = 'building' if self.status.blank?
       self.token = SecureRandom.uuid if self.token.blank?
     end
+    
+    [:delivery_name, :delivery_address1, :delivery_address2, :delivery_address3, :delivery_address4, :delivery_postcode, :delivery_country].each do |f|
+      define_method(f) do
+        separate_delivery_address? ? super() : send(f.to_s.gsub('delivery_', 'billing_'))
+      end
+    end
   
     # Is this order still being built by the user?
     def building?
@@ -99,7 +162,17 @@ module Shoppe
   
     # The name of the customer
     def customer_name
-      company.blank? ? "#{first_name} #{last_name}" : "#{company} (#{first_name} #{last_name})"
+      company.blank? ? full_name : "#{company} (#{full_name})"
+    end
+    
+    # The name for billing purposes
+    def billing_name
+      company.blank? ? full_name : "#{full_name} (#{company})"
+    end
+    
+    # The full anme of the customer
+    def full_name
+      "#{first_name} #{last_name}"
     end
   
     # Is this order empty? (i.e. doesn't have any items associated with it)
@@ -161,7 +234,7 @@ module Shoppe
     def delivery_service_prices
       @delivery_service_prices ||= begin
         prices = Shoppe::DeliveryServicePrice.joins(:delivery_service).where(:shoppe_delivery_services => {:active => true}).order("`default` desc, price asc").for_weight(total_weight)
-        prices = prices.select { |p| p.countries.empty? || p.country?(self.country) }
+        prices = prices.select { |p| p.countries.empty? || p.country?(self.billing_country) }
         prices
       end
     end
@@ -343,7 +416,7 @@ module Shoppe
   
     # Specify which attributes can be searched
     def self.ransackable_attributes(auth_object = nil) 
-      ["id", "postcode", "address1", "address2", "address3", "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
   
     # Specify which associations can be searched

data/app/models/shoppe/order_item.rb

@@ -1,3 +1,21 @@
+# == Schema Information
+#
+# Table name: shoppe_order_items
+#
+#  id                :integer          not null, primary key
+#  order_id          :integer
+#  ordered_item_id   :integer
+#  ordered_item_type :string(255)
+#  quantity          :integer          default(1)
+#  unit_price        :decimal(8, 2)
+#  unit_cost_price   :decimal(8, 2)
+#  tax_amount        :decimal(8, 2)
+#  tax_rate          :decimal(8, 2)
+#  weight            :decimal(8, 3)    default(0.0)
+#  created_at        :datetime
+#  updated_at        :datetime
+#
+
 module Shoppe
   class OrderItem < ActiveRecord::Base
   

data/app/models/shoppe/product.rb

@@ -1,3 +1,28 @@
+# == Schema Information
+#
+# Table name: shoppe_products
+#
+#  id                  :integer          not null, primary key
+#  parent_id           :integer
+#  product_category_id :integer
+#  name                :string(255)
+#  sku                 :string(255)
+#  permalink           :string(255)
+#  description         :text
+#  short_description   :text
+#  active              :boolean          default(TRUE)
+#  weight              :decimal(8, 3)    default(0.0)
+#  price               :decimal(8, 2)    default(0.0)
+#  cost_price          :decimal(8, 2)    default(0.0)
+#  tax_rate_id         :integer
+#  created_at          :datetime
+#  updated_at          :datetime
+#  featured            :boolean          default(FALSE)
+#  in_the_box          :text
+#  stock_control       :boolean          default(TRUE)
+#  default             :boolean          default(FALSE)
+#
+
 module Shoppe
   class Product < ActiveRecord::Base
   
@@ -38,7 +63,7 @@ module Shoppe
     # Scopes
     scope :active, -> { where(:active => true) }
     scope :featured, -> {where(:featured => true)}
-    scope :ordered, -> {order('name asc')}
+    scope :ordered, -> {order('`default` desc, name asc')}
     
     # Return the name of the product
     def full_name

data/app/models/shoppe/product/product_attributes.rb

@@ -1,5 +1,5 @@
 module Shoppe
-  class Product
+  class Product < ActiveRecord::Base
   
     # Relationships
     has_many :product_attributes, -> { order(:position) }, :class_name => 'Shoppe::ProductAttribute'

data/app/models/shoppe/product/variants.rb

@@ -1,8 +1,8 @@
 module Shoppe
-  class Product
+  class Product < ActiveRecord::Base
     
     # Relationships
-    has_many :variants, :class_name => 'Shoppe::Product', :foreign_key => 'parent_id', :dependent => :destroy
+    has_many :variants, -> { order("`default` desc, name asc")}, :class_name => 'Shoppe::Product', :foreign_key => 'parent_id', :dependent => :destroy
     belongs_to :parent, :class_name => 'Shoppe::Product', :foreign_key => 'parent_id'
     
     # Validations
@@ -19,7 +19,7 @@ module Shoppe
     
     def default_variant
       return nil if self.parent
-      @default_variant ||= self.variants.first
+      @default_variant ||= self.variants.select { |v| v.default? }.first
     end
     
   end

data/app/models/shoppe/product_attribute.rb

@@ -1,3 +1,18 @@
+# == Schema Information
+#
+# Table name: shoppe_product_attributes
+#
+#  id         :integer          not null, primary key
+#  product_id :integer
+#  key        :string(255)
+#  value      :string(255)
+#  position   :integer          default(1)
+#  searchable :boolean          default(TRUE)
+#  created_at :datetime
+#  updated_at :datetime
+#  public     :boolean          default(TRUE)
+#
+
 module Shoppe
   class ProductAttribute < ActiveRecord::Base
   

data/app/models/shoppe/product_category.rb

@@ -1,3 +1,15 @@
+# == Schema Information
+#
+# Table name: shoppe_product_categories
+#
+#  id          :integer          not null, primary key
+#  name        :string(255)
+#  permalink   :string(255)
+#  description :text
+#  created_at  :datetime
+#  updated_at  :datetime
+#
+
 module Shoppe
   class ProductCategory < ActiveRecord::Base
   

data/app/models/shoppe/setting.rb

@@ -0,0 +1,59 @@
+require 'ostruct'
+
+module Shoppe
+  class Setting < ActiveRecord::Base
+    
+    validates :key, :presence => true, :uniqueness => true
+    validates :value, :presence => true
+    validates :value_type, :presence => true
+    
+    before_validation do
+      self.value_type = I18n.t("shoppe.settings.types")[self.key.to_sym].try(:capitalize) || self.value.class.to_s
+      self.value      = encoded_value
+    end
+    
+    # The encoded value for saving in the backend (as a string)
+    def encoded_value
+      case value_type
+      when 'Array', 'Hash'  then  value.to_json
+      when 'Boolean'        then  value.to_s == 'true' ? 'true' : 'false'
+      else                        value.to_s
+      end
+    end
+    
+    # The decoded value for the setting attribute (in it's native type)
+    def decoded_value
+      case value_type
+      when 'Fixnum'         then  value.to_i
+      when 'Float'          then  value.to_f
+      when 'Array', 'Hash'  then  JSON.parse(value)
+      when 'Boolean'        then  value == 'true' ? true : false
+      else                        value.to_s
+      end
+    end
+    
+    # A full hash of all settings available in the current scope
+    def self.to_hash
+      all.inject({}) do |h, setting|
+        h[setting.key.to_s] = setting.decoded_value
+        h
+      end
+    end
+    
+    # Update settings from a given hash and persist them. Accepts a 
+    # hash of keys (which should be strings).
+    def self.update_from_hash(hash)
+      existing_settings = self.all.to_a
+      hash.each do |key, value|
+        existing = existing_settings.select { |s| s.key.to_s == key.to_s }.first
+        if existing
+          value.blank? ? existing.destroy! : existing.update!(:value => value)
+        else
+          value.blank? ? nil : self.create!(:key => key, :value => value)
+        end
+      end
+      hash
+    end
+    
+  end
+end

data/app/models/shoppe/stock_level_adjustment.rb

@@ -1,3 +1,18 @@
+# == Schema Information
+#
+# Table name: shoppe_stock_level_adjustments
+#
+#  id          :integer          not null, primary key
+#  item_id     :integer
+#  item_type   :string(255)
+#  description :string(255)
+#  adjustment  :integer          default(0)
+#  parent_type :string(255)
+#  parent_id   :integer
+#  created_at  :datetime
+#  updated_at  :datetime
+#
+
 module Shoppe
   class StockLevelAdjustment < ActiveRecord::Base
     

data/app/models/shoppe/tax_rate.rb

@@ -1,3 +1,15 @@
+# == Schema Information
+#
+# Table name: shoppe_tax_rates
+#
+#  id          :integer          not null, primary key
+#  name        :string(255)
+#  rate        :decimal(8, 2)
+#  created_at  :datetime
+#  updated_at  :datetime
+#  country_ids :text
+#
+
 module Shoppe
   class TaxRate < ActiveRecord::Base
     
@@ -23,7 +35,7 @@ module Shoppe
     end
     
     def rate_for(order)
-      if countries.empty? || order.country.nil? || country?(order.country)
+      if countries.empty? || order.billing_country.nil? || country?(order.billing_country)
         self.rate
       else
         0.0

data/app/models/shoppe/user.rb

@@ -1,3 +1,16 @@
+# == Schema Information
+#
+# Table name: shoppe_users
+#
+#  id              :integer          not null, primary key
+#  first_name      :string(255)
+#  last_name       :string(255)
+#  email_address   :string(255)
+#  password_digest :string(255)
+#  created_at      :datetime
+#  updated_at      :datetime
+#
+
 module Shoppe
   class User < ActiveRecord::Base
 

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

@@ -21,6 +21,7 @@
         %li= link_to "Delivery Services", [:delivery_services], :class => @active_nav == :delivery_services ? 'active' : ''
         %li= link_to "Tax Rates", :tax_rates, :class => @active_nav == :tax_rates ? 'active' : ''
         %li= link_to "Users", [:users], :class => @active_nav == :users ? 'active' : ''
+        %li= link_to "Settings", :settings, :class => @active_nav == :settings ? 'active' : ''
         %li= link_to "Logout", [:logout], :method => :delete
     
     %header.main
@@ -32,5 +33,5 @@
         = yield
 
     %footer 
-      %p.store= link_to "Goto Storefront", '/'
+      %p.store= link_to "← Goto #{Shoppe.settings.store_name}".html_safe, '/'
       

data/app/views/layouts/shoppe/printable.html.haml

@@ -0,0 +1,11 @@
+!!!
+%html
+  %head
+    %title= @page_title
+    = stylesheet_link_tag 'shoppe/printable', :media => :all
+    :javascript
+      window.print();
+  %body
+    #content
+      = yield
+      

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

@@ -17,6 +17,6 @@
       - for price in @delivery_service_prices
         %tr
           %td= link_to number_to_currency(price.price), [:edit, @delivery_service, price]
-          %td #{price.min_weight}kg → #{price.max_weight}kg
+          %td #{number_to_weight price.min_weight} → #{number_to_weight price.max_weight}
           %td= price.code
           

data/app/views/shoppe/order_mailer/accepted.text.erb

@@ -8,5 +8,5 @@ We will e-mail you again when we ship your order from our warehouse.
 
 Many thanks,
 
-<%=Shoppe.config[:store_name]%>
-<%=Shoppe.config[:email_address]%>
+<%=Shoppe.settings.store_name%>
+<%=Shoppe.settings.email_address%>