shoppe 0.0.7 → 0.0.8

data/app/assets/stylesheets/shoppe/elements.scss

@@ -9,17 +9,16 @@
   background:none;
   text-decoration:none;
   font-size:12px;
-  font-weight:600;
+  font-weight:500 !important;
   text-transform:uppercase;
   font-family:$font;
   color:#fff !important;
-	letter-spacing:-0.5px;
-  padding:7px 20px;
-  border-radius:4px;
-  background-color:#888;
+  padding:8px 20px;
+	border-radius:30px;
+  background-color:#40454D;
   display:inline-block;
   &:active {
-    background:#999;
+    background:#40454D;
   }
   
   &.green {
@@ -63,7 +62,7 @@
   
   &.button-mini {
     font-size:11px;
-    padding:3px 5px;
+    padding:4px 10px;
     box-shadow:none;
     font-weight:normal;
     text-shadow:none;

data/app/controllers/shoppe/delivery_service_prices_controller.rb

@@ -36,7 +36,7 @@ class Shoppe::DeliveryServicePricesController < Shoppe::ApplicationController
   private
   
   def safe_params
-    params[:delivery_service_price].permit(:price, :tax_rate, :min_weight, :max_weight, :code)
+    params[:delivery_service_price].permit(:price, :cost_price, :tax_rate, :min_weight, :max_weight, :code)
   end
   
 end

data/app/controllers/shoppe/products_controller.rb

@@ -39,7 +39,7 @@ class Shoppe::ProductsController < Shoppe::ApplicationController
   private
   
   def safe_params
-    params[:product].permit(:product_category_id, :title, :sku, :permalink, :description, :short_description, :weight, :price, :tax_rate, :stock, :default_image_file, :data_sheet_file, :active, :featured, :in_the_box)
+    params[:product].permit(:product_category_id, :title, :sku, :permalink, :description, :short_description, :weight, :price, :cost_price, :tax_rate, :stock_control, :stock, :default_image_file, :data_sheet_file, :active, :featured, :in_the_box, :product_attributes_array => [:key, :value, :searchable, :public])
   end
   
 end

data/app/helpers/shoppe/shoppe_helper.rb

@@ -22,6 +22,8 @@ module Shoppe::ShoppeHelper
         s << "</div>"
         s << "</div>"
       end.html_safe
+    else
+      "<div class='attachmentPreview'><div class='imgContainer'><div class='img none'></div></div><div class='desc none'>No attachment</div></div>".html_safe
     end
   end
   

data/app/models/shoppe/delivery_service_price.rb

@@ -8,6 +8,7 @@ class Shoppe::DeliveryServicePrice < ActiveRecord::Base
   
   # Validations
   validates :price, :numericality => true
+  validates :cost_price, :numericality => true, :allow_blank => true
   validates :tax_rate, :numericality => true
   validates :min_weight, :numericality => true
   validates :max_weight, :numericality => true

data/app/models/shoppe/order.rb

@@ -109,6 +109,17 @@ class Shoppe::Order < ActiveRecord::Base
     @total_items ||= order_items.inject(0) { |t,i| t + i.quantity }
   end
   
+  # The total cost of the order
+  def total_cost
+    self.delivery_cost_price + 
+    order_items.inject(BigDecimal(0)) { |t, i| t + i.total_cost }
+  end
+  
+  # Return the price for the order
+  def profit
+    total_before_tax - total_cost
+  end
+  
   # The total price of the order before tax
   def total_before_tax
     self.delivery_price +
@@ -163,11 +174,16 @@ class Shoppe::Order < ActiveRecord::Base
     @delivery_service_price ||= self.delivery_service && self.delivery_service.delivery_service_prices.for_weight(self.total_weight).first
   end
   
-  # The cost of delivering this order in its current state
+  # The price for delivering this order in its current state
   def delivery_price
     @delivery_price ||= read_attribute(:delivery_price) || delivery_service_price.try(:price) || 0.0
   end
   
+  # The cost of delivering this order in its current state
+  def delivery_cost_price
+    @delivery_cost_price ||= read_attribute(:delivery_cost_price) || delivery_service_price.try(:cost_price) || 0.0
+  end
+  
   # The tax amount due for the delivery of this order in its current state
   def delivery_tax_amount
     @delivery_tax_amount ||= begin
@@ -245,6 +261,7 @@ class Shoppe::Order < ActiveRecord::Base
     if self.delivery_service
       write_attribute :delivery_service_id, self.delivery_service.id
       write_attribute :delivery_price, self.delivery_price
+      write_attribute :delivery_cost_price, self.delivery_cost_price
       write_attribute :delivery_tax_amount, self.delivery_tax_amount
       write_attribute :delivery_tax_rate, self.delivery_tax_rate
     end

data/app/models/shoppe/order_item.rb

@@ -14,6 +14,7 @@ class Shoppe::OrderItem < ActiveRecord::Base
   before_validation do
     if self.product
       self.unit_price = self.product.price      if self.unit_price.blank?
+      self.unit_cost_price = self.product.cost_price if self.unit_cost_price.blank?
       self.tax_rate   = self.product.tax_rate   if self.tax_rate.blank?
       if unit_price_changed? || quantity_changed?
         self.tax_amount = (self.sub_total / BigDecimal(100)) * self.tax_rate
@@ -55,7 +56,7 @@ class Shoppe::OrderItem < ActiveRecord::Base
   def increase!(amount = 1)
     transaction do
       self.quantity += amount
-      if self.product.stock < self.quantity
+      if self.product.stock_control? && self.product.stock < self.quantity
         raise Shoppe::Errors::NotEnoughStock, :product => self.product, :requested_stock => self.quantity
       end
       self.save!
@@ -72,6 +73,11 @@ class Shoppe::OrderItem < ActiveRecord::Base
     end
   end
   
+  # Return the total cost for the product
+  def total_cost
+    quantity * unit_cost_price
+  end
+  
   # Return the sub total for the product
   def sub_total
     quantity * unit_price
@@ -90,7 +96,7 @@ class Shoppe::OrderItem < ActiveRecord::Base
   
   # Do we have the stock needed to fulfil this order?
   def in_stock?
-    if self.product.respond_to?(:stock)
+    if self.product.stock_control?
       self.product.stock >= self.quantity
     else
       true
@@ -101,12 +107,12 @@ class Shoppe::OrderItem < ActiveRecord::Base
   # before an order is completed. If we have run out of this product, we will update the quantity to an
   # appropriate level (or remove the order item) and return the object.
   def validate_stock_levels
-    unless in_stock?
+    if in_stock?
+      false
+    else
       self.quantity = self.product.stock
       self.quantity == 0 ? self.destroy : self.save!
       self
-    else
-      false
     end
   end
   

data/app/models/shoppe/product.rb

@@ -3,6 +3,9 @@ class Shoppe::Product < ActiveRecord::Base
   # Set the table name
   self.table_name = 'shoppe_products'  
   
+  # Require some concerns
+  require_dependency 'shoppe/product/product_attributes'
+  
   # Attachments
   attachment :default_image
   attachment :data_sheet
@@ -21,6 +24,7 @@ class Shoppe::Product < ActiveRecord::Base
   validates :short_description, :presence => true
   validates :weight, :numericality => true
   validates :price, :numericality => true
+  validates :cost_price, :numericality => true, :allow_blank => true
   validates :tax_rate, :numericality => true
   validates :stock, :numericality => {:only_integer => true}
   
@@ -30,16 +34,18 @@ class Shoppe::Product < ActiveRecord::Base
   # Scopes
   scope :active, -> { where(:active => true) }
   scope :featured, -> {where(:featured => true)}
-  
+
   # Is this product currently in stock?
   def in_stock?
-    stock > 0
+    !stock_control? || stock > 0
   end
   
   # Remove the provided number of units from the current stock level of this product
   def update_stock_level(purchased = 1)
-    self.stock -= purchased
-    self.save!
+    if self.stock_control?
+      self.stock -= purchased
+      self.save!
+    end
   end
   
   # Specify which attributes can be searched
@@ -52,5 +58,14 @@ class Shoppe::Product < ActiveRecord::Base
     []
   end
   
+  # Search for products which include the guven attributes and return an active record
+  # scope of these products. Chainable with other scopes and with_attributes methods.
+  # For example:
+  #
+  #   Shoppe::Product.active.with_attribute('Manufacturer', 'Apple').with_attribute('Model', ['Macbook', 'iPhone'])
+  def self.with_attributes(key, values)
+    product_ids = Shoppe::ProductAttribute.searchable.where(:key => key, :value => values).pluck(:product_id).uniq
+    where(:id => product_ids)
+  end
   
 end

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

@@ -0,0 +1,15 @@
+class Shoppe::Product
+  
+  # Relationships
+  has_many :product_attributes, -> { order(:position) }, :class_name => 'Shoppe::ProductAttribute'
+  
+  # Attribute for providing the hash
+  attr_accessor :product_attributes_array
+  
+  # Save the attributes after saving the record
+  after_save do
+    return unless product_attributes_array.is_a?(Array)
+    self.product_attributes.update_from_array(product_attributes_array)
+  end
+  
+end

data/app/models/shoppe/product_attribute.rb

@@ -0,0 +1,51 @@
+class Shoppe::ProductAttribute < ActiveRecord::Base
+  
+  # Set the table name
+  self.table_name = 'shoppe_product_attributes'  
+  
+  # Validations
+  validates :key, :presence => true
+  
+  # Relationships
+  belongs_to :product, :class_name => 'Shoppe::Product'
+  
+  # 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
+    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
+        else
+          existing_attr.update_attributes(params)
+        end
+      else
+        attribute = self.create(params)
+      end
+    end
+    self.where(:key => existing_keys - array.map { |h| h['key']}).delete_all
+  end
+  
+end

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

@@ -1,28 +1,32 @@
 = form_for [@delivery_service, @delivery_service_price] do |f|
   = f.error_messages
-  = field_set_tag "Weight allowance" do
-    %dl
-      %dt= f.label :min_weight
-      %dd= f.text_field :min_weight
-    %dl
-      %dt= f.label :max_weight
-      %dd= f.text_field :max_weight
+  = field_set_tag "Identification & Weight" do
+    .splitContainer
+      %dl.third
+        %dt= f.label :code
+        %dd= f.text_field :code
+      
+      %dl.third
+        %dt= f.label :min_weight
+        %dd= f.text_field :min_weight
+      %dl.third
+        %dt= f.label :max_weight
+        %dd= f.text_field :max_weight
 
   = field_set_tag "Pricing" do
-    %dl
-      %dt= f.label :price
-      %dd= f.text_field :price
-    %dl
-      %dt= f.label :tax_rate
-      %dd= f.text_field :tax_rate
-    
-  = field_set_tag "Details" do
-    %dl
-      %dt= f.label :code
-      %dd= f.text_field :code
+    .splitContainer
+      %dl.third
+        %dt= f.label :price
+        %dd= f.text_field :price
+      %dl.third
+        %dt= f.label :cost_price
+        %dd= f.text_field :cost_price
+      %dl.third
+        %dt= f.label :tax_rate
+        %dd= f.text_field :tax_rate
 
   %p.submit
     - unless @delivery_service_price.new_record?
       %span.right= link_to "Delete", [@delivery_service, @delivery_service_price], :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this price?"}
     = f.submit :class => 'button green'
-    = link_to "Cancel", :delivery_services, :class => 'button'
+    = link_to "Cancel", [@delivery_service, :delivery_service_prices], :class => 'button'

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

@@ -1,5 +1,5 @@
 - @page_title = "Delivery Services"
 = content_for :header do
   %p.buttons= link_to "Back to prices", [@delivery_service, :delivery_service_prices], :class => 'button'
-  %h2 Edit Delivery Service Price
+  %h2.delivery_services Delivery Services
 = render 'form'

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

@@ -4,7 +4,7 @@
   %p.buttons
     = link_to "New price", [:new, @delivery_service, :delivery_service_price], :class => 'button green'
     = link_to "Back to delivery services", :delivery_services, :class => 'button'
-  %h2 Delivery Pricing for #{@delivery_service.name}
+  %h2.delivery_services Delivery Pricing for #{@delivery_service.name}
 
 .table
   %table.data

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

@@ -1,5 +1,5 @@
 - @page_title = "Delivery Services"
 = content_for :header do
   %p.buttons= link_to "Back to prices", [@delivery_service, :delivery_service_prices], :class => 'button'
-  %h2 New Delivery Service Price
+  %h2.delivery_services Delivery Services
 = render 'form'

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

@@ -1,33 +1,35 @@
 = form_for @delivery_service do |f|
   = f.error_messages
   = field_set_tag "Details" do
-    %dl
-      %dt= f.label :name
-      %dd= f.text_field :name
-    %dl
-      %dt= f.label :code
-      %dd= f.text_field :code
-    %dl
-      %dt= f.label :active
-      %dd= f.check_box :active
-    %dl
-      %dt= f.label :default
-      %dd= f.check_box :default
+    .splitContainer
+      %dl.half
+        %dt= f.label :name
+        %dd= f.text_field :name
+      %dl.half
+        %dt= f.label :code
+        %dd= f.text_field :code
+    .splitContainer
+      %dl.half
+        %dt= f.label :active
+        %dd.checkbox
+          = f.check_box :active
+          = f.label :active, 'Service will be available for use'
+      %dl.half
+        %dt= f.label :default
+        %dd.checkbox
+          = f.check_box :default
+          = f.label :default, 'Service will be used by default (if possible)'
   = field_set_tag "Courier" do
-    %dl
-      %dt= f.label :courier, "Courier Name"
-      %dd= f.text_field :courier
-    %dl
-      %dt= f.label :tracking_url, "Tracking URL"
-      %dd
-        = f.text_field :tracking_url
-        %p.help Use <code>{{consignment_number}}</code> to insert the consignment number.
+    .splitContainer
+      %dl.half
+        %dt= f.label :courier, "Courier Name"
+        %dd= f.text_field :courier
+      %dl.half
+        %dt= f.label :tracking_url, "Tracking URL"
+        %dd
+          = f.text_field :tracking_url
+          %p.help Use <code>{{consignment_number}}</code> to insert the consignment number.
 
-  - unless @delivery_service.new_record?
-    = field_set_tag "Pricing" do
-      %dl
-        %dt Pricing
-        %dd= link_to "Set pricing for delivery service", [@delivery_service, :delivery_service_prices], :class => 'button button-mini'
   %p.submit
     - unless @delivery_service.new_record?
       %span.right= link_to "Delete", [@delivery_service], :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this delivery service?"}

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

@@ -1,5 +1,5 @@
 - @page_title = "Delivery Services"
 = content_for :header do
   %p.buttons= link_to "Back to delivery services", :delivery_services, :class => 'button'
-  %h2 Edit Delivery Service #{@delivery_service.id}
+  %h2.delivery_services Delivery Services
 = render 'form'

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

@@ -2,7 +2,7 @@
 
 = content_for :header do
   %p.buttons= link_to "New delivery service", :new_delivery_service, :class => 'button green'
-  %h2 Delivery Services
+  %h2.delivery_services Delivery Services
   
 .table
   %table.data
@@ -14,11 +14,15 @@
         %th Active?
         %th Default?
     %tbody
-      - for delivery_service in @delivery_services
-        %tr
-          %td= link_to delivery_service.name, [:edit, delivery_service]
-          %td= link_to "Set Prices", [delivery_service, :delivery_service_prices]
-          %td= delivery_service.courier
-          %td= boolean_tag :active
-          %td= boolean_tag :default
+      - if @delivery_services.empty?
+        %tr.empty
+          %td{:colspan => 5} No delivery services to display.
+      - else
+        - for delivery_service in @delivery_services
+          %tr
+            %td= link_to delivery_service.name, [:edit, delivery_service]
+            %td= link_to "Set Prices", [delivery_service, :delivery_service_prices]
+            %td= delivery_service.courier
+            %td= boolean_tag :active
+            %td= boolean_tag :default