shoppe 0.0.9 → 0.0.10

data/app/assets/images/shoppe/icons/edit.svg

@@ -0,0 +1,14 @@
+<!-- Generator: Adobe Illustrator 17.0.0, SVG Export Plug-In  -->
+<svg version="1.1"
+	 xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" xmlns:a="http://ns.adobe.com/AdobeSVGViewerExtensions/3.0/"
+	 x="0px" y="0px" width="77.999px" height="78px" viewBox="0 0 77.999 78" enable-background="new 0 0 77.999 78"
+	 xml:space="preserve">
+<defs>
+</defs>
+<g>
+	<path d="M71.807,6.191c-7.215-7.216-12.629-6.133-12.629-6.133l-25.26,25.259L5.049,54.185L0,78l23.812-5.051l28.869-28.869
+		l25.26-25.257C77.941,18.824,79.025,13.409,71.807,6.191z M22.395,70.086l-8.117,1.748c-0.785-1.467-1.727-2.932-3.455-4.659
+		c-1.727-1.727-3.193-2.669-4.658-3.456l1.75-8.116l2.346-2.348c0,0,4.418,0.088,9.404,5.078c4.988,4.987,5.078,9.407,5.078,9.407
+		L22.395,70.086z"/>
+</g>
+</svg>

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

@@ -94,10 +94,26 @@ header.main {
 	#flash-notice { background:#21a3e0; padding:15px 35px; color:#fff; font-size:1.2em; font-weight:bold;}
 	#flash-alert { background:#e04e21; padding:15px 35px; color:#fff; font-size:1.2em; font-weight:bold;}
 	
+	//
+	// sub title
+	//
+	.subtitle {
+		background:#fff;
+		border:1px solid #CFD4DD;
+		margin-bottom:25px;
+		padding:15px;
+		h3 { font-size:2.0em; font-weight:500;}
+	}
+	
 	//
 	// data table
 	//
 	div.table {
+		p.info {
+			overflow:hidden;
+			margin-bottom:10px;
+			color:#40454D;
+		}
 		table.data {
 			width:100%;
 			th, td { padding:10px;}
@@ -110,6 +126,15 @@ header.main {
 			tfoot td.bold { font-weight:bold;}
 			tfoot td { border-top:0 solid #ccc; background:#fafafa;}
 			tfoot tr:first-child td { border-top-width:3px;}
+			tbody td a.edit { background:image-url('shoppe/icons/edit.svg') no-repeat; margin-top:3px;width:16px; width:16px; background-size:13px; display:inline-block; text-indent:-40000px; opacity:0.3}
+			tbody td a.edit:hover { opacity:0.5}
+			tbody tr.form {
+				td { background:#f2f6fb;}
+				input[type=text] { border:1px solid #CFD4DD; padding:5px;}
+				input[type=text]:focus { border-color:#9AC835;}
+				td.desc input[type=text] { width:95%;}
+				td.adjustment input[type=text] { width:50px; margin-right:5px;}
+			}
 		}
 	}
 	
@@ -168,7 +193,7 @@ header.main {
 				dd select { width:200px;}
 				dd textarea { height:80px;	}
 				dd p.help { margin-top:15px; color:#333; background:image-url('shoppe/icons/support.svg') no-repeat 0 1px; background-size:13px; padding-left:15px;}
-				dd.checkbox { margin-top:10px; font-size:1.1em; color:#999;}
+				dd.checkbox { margin-top:14px; font-size:1.1em; color:#999;}
 				dd.checkbox input { float:left; margin-right:10px; margin-top:2px; }
 				
 				&.half {
@@ -374,4 +399,11 @@ footer {
 			text-decoration:none;
 		}
 	}
-}
+}
+
+span.boolean span.true { color:#38BA4F}
+span.boolean span.false { color:#c04a4a}
+
+.float-right { float:right;}
+
+div.field_with_errors { display:inline;}

data/app/controllers/shoppe/products_controller.rb

@@ -4,7 +4,7 @@ class Shoppe::ProductsController < Shoppe::ApplicationController
   before_filter { params[:id] && @product = Shoppe::Product.find(params[:id]) }
   
   def index
-    @products = Shoppe::Product.includes(:default_image, :product_category).order(:title).group_by(&:product_category).sort_by { |cat,pro| cat.name }
+    @products = Shoppe::Product.includes(:stock_level_adjustments, :default_image, :product_category).order(:title).group_by(&:product_category).sort_by { |cat,pro| cat.name }
   end
   
   def new
@@ -36,10 +36,24 @@ class Shoppe::ProductsController < Shoppe::ApplicationController
     redirect_to :products, :flash => {:notice => "Product has been removed successfully"}
   end
   
+  def stock_levels
+    @stock_level_adjustments = @product.stock_level_adjustments.ordered.page(params[:page])
+    if request.post?
+      @new_sla = @product.stock_level_adjustments.build(params[:stock_level_adjustment].permit(:description, :adjustment))
+      if @new_sla.save
+        redirect_to [:stock_levels, @product], :notice => "Stock level adjustment has been recorded"
+      else
+        flash.now[:alert] = @new_sla.errors.full_messages.to_sentence
+      end
+    else
+      @new_sla = @product.stock_level_adjustments.build
+    end
+  end
+  
   private
   
   def safe_params
-    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])
+    params[:product].permit(:product_category_id, :title, :sku, :permalink, :description, :short_description, :weight, :price, :cost_price, :tax_rate, :stock_control, :default_image_file, :data_sheet_file, :active, :featured, :in_the_box, :product_attributes_array => [:key, :value, :searchable, :public])
   end
   
 end

data/app/models/shoppe/order.rb

@@ -301,6 +301,7 @@ class Shoppe::Order < ActiveRecord::Base
       self.accepted_by = user.id
       self.status = 'accepted'
       self.save!
+      self.order_items.each(&:accept!)
       Shoppe::OrderMailer.accepted(self).deliver
     end
   end
@@ -312,6 +313,7 @@ class Shoppe::Order < ActiveRecord::Base
       self.rejected_by = user.id
       self.status = 'rejected'
       self.save!
+      self.order_items.each(&:reject!)
       Shoppe::OrderMailer.rejected(self).deliver
     end
   end

data/app/models/shoppe/order_item.rb

@@ -6,6 +6,7 @@ class Shoppe::OrderItem < ActiveRecord::Base
   # Relationships
   belongs_to :order, :class_name => 'Shoppe::Order'
   belongs_to :product, :class_name => 'Shoppe::Product'
+  has_many :stock_level_adjustments, :as => :parent, :dependent => :nullify
   
   # Validations
   validates :quantity, :numericality => true
@@ -91,7 +92,18 @@ class Shoppe::OrderItem < ActiveRecord::Base
   # This method will be triggered when the parent order is confirmed. This should automatically
   # update the stock levels on the source product.
   def confirm!
-    self.product.update_stock_level(quantity)
+    if self.product.stock_control?
+      self.product.stock_level_adjustments.create(:parent => self, :adjustment => 0 - self.quantity, :description => "Order ##{self.order.number} deduction")
+    end
+  end
+  
+  # This method will be trigger when the parent order is accepted.
+  def accept!
+  end
+  
+  # This method will be trigger when the parent order is rejected.
+  def reject!
+    self.stock_level_adjustments.destroy_all
   end
   
   # Do we have the stock needed to fulfil this order?

data/app/models/shoppe/product.rb

@@ -14,6 +14,7 @@ class Shoppe::Product < ActiveRecord::Base
   belongs_to :product_category, :class_name => 'Shoppe::ProductCategory'
   has_many :order_items, :dependent => :restrict_with_exception, :class_name => 'Shoppe::OrderItem'
   has_many :orders, :through => :order_items, :class_name => 'Shoppe::Order'
+  has_many :stock_level_adjustments, :dependent => :destroy
   
   # Validations
   validates :product_category_id, :presence => true
@@ -26,7 +27,6 @@ class Shoppe::Product < ActiveRecord::Base
   validates :price, :numericality => true
   validates :cost_price, :numericality => true, :allow_blank => true
   validates :tax_rate, :numericality => true
-  validates :stock, :numericality => {:only_integer => true}
   
   # Set the permalink
   before_validation { self.permalink = self.title.parameterize if self.permalink.blank? && self.title.is_a?(String) }
@@ -37,15 +37,12 @@ class Shoppe::Product < ActiveRecord::Base
 
   # Is this product currently in stock?
   def in_stock?
-    !stock_control? || stock > 0
+    stock > 0
   end
   
-  # Remove the provided number of units from the current stock level of this product
-  def update_stock_level(purchased = 1)
-    if self.stock_control?
-      self.stock -= purchased
-      self.save!
-    end
+  # Return the total number of items currently in stock
+  def stock
+    @stock ||= self.stock_level_adjustments.sum(:adjustment)
   end
   
   # Specify which attributes can be searched

data/app/models/shoppe/stock_level_adjustment.rb

@@ -0,0 +1,18 @@
+module Shoppe
+  class StockLevelAdjustment < ActiveRecord::Base
+    
+    # Relationships
+    belongs_to :product
+    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 }
+    
+    # Scopes
+    scope :ordered, -> { order('created_at desc') }
+    
+  end
+end

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

@@ -95,17 +95,15 @@
 
   = field_set_tag "Stock Control" do
     .splitContainer
-      %dl.third
+      %dl.half
+        %dt= f.label :weight
+        %dd= f.text_field :weight
+      
+      %dl.half
         %dt= f.label :stock_control
         %dd.checkbox
           = f.check_box :stock_control
           = f.label :stock_control, "Enable stock control for this product?"
-      %dl.third
-        %dt= f.label :stock, "Current stock"
-        %dd= f.text_field :stock
-      %dl.third
-        %dt= f.label :weight
-        %dd= f.text_field :weight
   
   %p.submit
     - unless @product.new_record?

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

@@ -1,5 +1,7 @@
 - @page_title = "Products"
 = content_for :header do
-  %p.buttons= link_to "Back to products list", :products, :class => 'button'
+  %p.buttons
+    = link_to "Stock levels", [:stock_levels, @product], :class => 'button' 
+    = link_to "Back to products list", :products, :class => 'button'
   %h2.products Products
 = render 'form'

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

@@ -8,10 +8,10 @@
   %table.data
     %thead
       %tr
-        %th SKU
-        %th Name
-        %th Price
-        %th Stock
+        %th{:width => '20%'} SKU
+        %th{:width => '50%'} Name
+        %th{:width => '15%'} Price
+        %th{:width => '15%'} Stock
     %tbody
       - if @products.empty?
         %tr.empty
@@ -25,4 +25,6 @@
               %td= product.sku
               %td= link_to product.title, [:edit, product]
               %td= number_to_currency product.price
-              %td= product.stock
+              %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') : ''

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

@@ -0,0 +1,33 @@
+- @page_title = "Stock Levels - #{@product.title}"
+= content_for :header do
+  %p.buttons
+    = link_to "Edit", [:edit, @product], :class => 'button'
+    = link_to "Back to list", :products, :class => 'button'
+  %h2.products= @product.title
+
+.table
+  %p.info
+    Current stock level is <b>#{@product.stock}</b>
+    %span.float-right= page_entries_info @stock_level_adjustments
+
+  = form_for @new_sla, :url => [:stock_levels, @product] do |f|
+    %table.data
+      %thead
+        %tr
+          %th{:width => '25%'} Date
+          %th{:width => '50%'} Description
+          %th{:width => '25%'} Adjustment
+      %tbody
+        %tr.form
+          %td
+          %td.desc= f.text_field :description
+          %td.adjustment
+            = f.text_field :adjustment
+            = f.submit "Add", :class => 'button button-mini green'
+        - for sla in @stock_level_adjustments
+          %tr
+            %td= sla.created_at.to_s(:long)
+            %td= sla.description
+            %td= sla.adjustment > 0  ? "+#{sla.adjustment}" : sla.adjustment
+
+    = paginate @stock_level_adjustments

data/config/routes.rb

@@ -2,7 +2,9 @@ Shoppe::Engine.routes.draw do
   
   get 'attachment/:id/:filename.:extension' => 'attachments#show'
   resources :product_categories
-  resources :products
+  resources :products do
+    match :stock_levels, :on => :member, :via => [:get, :post]
+  end
   resources :orders do
     post :search, :on => :collection
     post :accept, :on => :member

data/db/migrate/20131017144430_create_shoppe_stock_level_adjustments.rb

@@ -0,0 +1,18 @@
+class CreateShoppeStockLevelAdjustments < ActiveRecord::Migration
+  def up
+    create_table :shoppe_stock_level_adjustments do |t|
+      t.integer :product_id
+      t.string :description
+      t.integer :adjustment, :default => 0
+      t.string :parent_type
+      t.integer :parent_id
+      t.timestamps
+    end
+    remove_column :shoppe_products, :stock
+  end
+  
+  def down
+    drop_table :shoppe_stock_level_adjustments
+    add_column :shoppe_products, :stock, :integer, :default => 0, :before => :weight
+  end
+end

data/db/seeds.rb

@@ -42,9 +42,10 @@ end
 
 lorem = 'Lorem ipsum dolor sit amet, consectetur adipisicing elit, sed do eiusmod tempor incididunt ut labore et dolore magna aliqua. Ut enim ad minim veniam, quis nostrud exercitation ullamco laboris nisi ut aliquip ex ea commodo consequat. Duis aute irure dolor in reprehenderit in voluptate velit esse cillum dolore eu fugiat nulla pariatur. Excepteur sint occaecat cupidatat non proident, sunt in culpa qui officia deserunt mollit anim id est laborum.'
 
-pro = cat1.products.create!(:title => 'Yealink T20P', :sku => 'YL-SIP-T20P', :description => lorem, :short_description => 'If cheap & cheerful is what you’re after, the Yealink T20P is what you’re looking for.', :weight => 1.119, :price => 54.99, :cost_price => 44.99, :tax_rate => 20.0, :stock => 20, :featured => true)
+pro = cat1.products.create!(:title => 'Yealink T20P', :sku => 'YL-SIP-T20P', :description => lorem, :short_description => 'If cheap & cheerful is what you’re after, the Yealink T20P is what you’re looking for.', :weight => 1.119, :price => 54.99, :cost_price => 44.99, :tax_rate => 20.0, :featured => true)
 pro.default_image_file = get_file('t20p.jpg')
 pro.save!
+pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 17)
 pro.product_attributes.create!(:key => 'Manufacturer', :value => 'Yealink', :position => 1)
 pro.product_attributes.create!(:key => 'Model', :value => 'T20P', :position => 1)
 pro.product_attributes.create!(:key => 'Colour', :value => 'Black', :position => 1)
@@ -52,9 +53,10 @@ pro.product_attributes.create!(:key => 'Lines', :value => '3', :position => 1)
 pro.product_attributes.create!(:key => 'Colour Screen?', :value => 'No', :position => 1)
 pro.product_attributes.create!(:key => 'Power over ethernet?', :value => 'Yes', :position => 1)
 
-pro = cat1.products.create!(:title => 'Yealink T22P', :sku => 'YL-SIP-T22P', :description => lorem, :short_description => lorem, :weight => 1.419, :price => 64.99, :cost_price => 56.99, :tax_rate => 20.0, :stock => 12)
+pro = cat1.products.create!(:title => 'Yealink T22P', :sku => 'YL-SIP-T22P', :description => lorem, :short_description => lorem, :weight => 1.419, :price => 64.99, :cost_price => 56.99, :tax_rate => 20.0)
 pro.default_image_file = get_file('t22p.jpg')
 pro.save!
+pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 200)
 pro.product_attributes.create!(:key => 'Manufacturer', :value => 'Yealink', :position => 1)
 pro.product_attributes.create!(:key => 'Model', :value => 'T22P', :position => 1)
 pro.product_attributes.create!(:key => 'Colour', :value => 'Black', :position => 1)
@@ -63,9 +65,10 @@ pro.product_attributes.create!(:key => 'Colour Screen?', :value => 'No', :positi
 pro.product_attributes.create!(:key => 'Power over ethernet?', :value => 'Yes', :position => 1)
 
 
-pro = cat1.products.create!(:title => 'Yealink T26P', :sku => 'YL-SIP-T26P', :description => lorem, :short_description => lorem, :weight => 2.23, :price => 88.99, :cost_price => 78.99, :tax_rate => 20.0, :stock => 5)
+pro = cat1.products.create!(:title => 'Yealink T26P', :sku => 'YL-SIP-T26P', :description => lorem, :short_description => lorem, :weight => 2.23, :price => 88.99, :cost_price => 78.99, :tax_rate => 20.0)
 pro.default_image_file = get_file('t26p.jpg')
 pro.save!
+pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 100)
 pro.product_attributes.create!(:key => 'Manufacturer', :value => 'Yealink', :position => 1)
 pro.product_attributes.create!(:key => 'Model', :value => 'T26P', :position => 1)
 pro.product_attributes.create!(:key => 'Colour', :value => 'Black', :position => 1)
@@ -73,9 +76,10 @@ pro.product_attributes.create!(:key => 'Lines', :value => '6', :position => 1)
 pro.product_attributes.create!(:key => 'Colour Screen?', :value => 'No', :position => 1)
 pro.product_attributes.create!(:key => 'Power over ethernet?', :value => 'Yes', :position => 1)
 
-pro = cat1.products.create!(:title => 'Yealink T46GN', :sku => 'YL-SIP-T46GN', :description => lorem, :short_description => 'Colourful, sharp, fast & down right sexy. The Yealink T46P will make your scream!', :weight => 2.23, :price => 149.99, :cost_price => 139.99, :tax_rate => 20.0, :stock => 5, :featured => true)
+pro = cat1.products.create!(:title => 'Yealink T46GN', :sku => 'YL-SIP-T46GN', :description => lorem, :short_description => 'Colourful, sharp, fast & down right sexy. The Yealink T46P will make your scream!', :weight => 2.23, :price => 149.99, :cost_price => 139.99, :tax_rate => 20.0, :featured => true)
 pro.default_image_file = get_file('t46gn.jpg')
 pro.save!
+pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 10)
 pro.product_attributes.create!(:key => 'Manufacturer', :value => 'Yealink', :position => 1)
 pro.product_attributes.create!(:key => 'Model', :value => 'T46GN', :position => 1)
 pro.product_attributes.create!(:key => 'Colour', :value => 'Black', :position => 1)
@@ -83,9 +87,10 @@ pro.product_attributes.create!(:key => 'Lines', :value => '4', :position => 1)
 pro.product_attributes.create!(:key => 'Colour Screen?', :value => 'Yes', :position => 1)
 pro.product_attributes.create!(:key => 'Power over ethernet?', :value => 'Yes', :position => 1)
 
-pro = cat1.products.create!(:title => 'Snom 870 (Grey)', :sku => 'SM-870-GREY', :description => lorem, :short_description => 'The perfect & beautiful VoIP phone for the discerning professional desk.', :weight => 2.4, :price => 235.00, :cost_price => 225.00, :tax_rate => 20.0, :stock => 2)
+pro = cat1.products.create!(:title => 'Snom 870 (Grey)', :sku => 'SM-870-GREY', :description => lorem, :short_description => 'The perfect & beautiful VoIP phone for the discerning professional desk.', :weight => 2.4, :price => 235.00, :cost_price => 225.00, :tax_rate => 20.0)
 pro.default_image_file = get_file('snom-870-grey.jpg')
 pro.save!
+pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 4)
 pro.product_attributes.create!(:key => 'Manufacturer', :value => 'Snom', :position => 1)
 pro.product_attributes.create!(:key => 'Model', :value => '870', :position => 1)
 pro.product_attributes.create!(:key => 'Colour', :value => 'Grey', :position => 1)
@@ -93,9 +98,10 @@ pro.product_attributes.create!(:key => 'Lines', :value => '10', :position => 1)
 pro.product_attributes.create!(:key => 'Colour Screen?', :value => 'Yes', :position => 1)
 pro.product_attributes.create!(:key => 'Power over ethernet?', :value => 'Yes', :position => 1)
 
-pro = cat1.products.create!(:title => 'Snom 870 (Black)', :sku => 'SM-870-BLK', :description => lorem, :short_description => 'The perfect & beautiful VoIP phone for the discerning professional desk.', :weight => 2.4, :price => 235.00, :cost_price => 225.00, :tax_rate => 20.0, :stock => 0, :featured => true)
+pro = cat1.products.create!(:title => 'Snom 870 (Black)', :sku => 'SM-870-BLK', :description => lorem, :short_description => 'The perfect & beautiful VoIP phone for the discerning professional desk.', :weight => 2.4, :price => 235.00, :cost_price => 225.00, :tax_rate => 20.0, :featured => true)
 pro.default_image_file = get_file('snom-870-blk.jpg')
 pro.save!
+pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 4)
 pro.product_attributes.create!(:key => 'Manufacturer', :value => 'Snom', :position => 1)
 pro.product_attributes.create!(:key => 'Model', :value => '870', :position => 1)
 pro.product_attributes.create!(:key => 'Colour', :value => 'Black', :position => 1)
@@ -103,27 +109,30 @@ pro.product_attributes.create!(:key => 'Lines', :value => '10', :position => 1)
 pro.product_attributes.create!(:key => 'Colour Screen?', :value => 'Yes', :position => 1)
 pro.product_attributes.create!(:key => 'Power over ethernet?', :value => 'Yes', :position => 1)
 
-pro = cat2.products.create!(:title => 'Yealink Mono Headset', :sku => 'YL-YHS32', :description => lorem, :short_description => 'If you\'re often on the phone, this headset will make your life 100x easier. Guaranteed*.', :weight => 0.890, :price => 34.99, :cost_price => 24.99, :tax_rate => 20.0, :stock => 3, :featured => true)
+pro = cat2.products.create!(:title => 'Yealink Mono Headset', :sku => 'YL-YHS32', :description => lorem, :short_description => 'If you\'re often on the phone, this headset will make your life 100x easier. Guaranteed*.', :weight => 0.890, :price => 34.99, :cost_price => 24.99, :tax_rate => 20.0, :featured => true)
 pro.default_image_file = get_file('yhs32.jpg')
 pro.save!
 pro.product_attributes.create!(:key => 'Manufacturer', :value => 'Yealink', :position => 1)
 pro.product_attributes.create!(:key => 'Model', :value => 'YHS32', :position => 1)
 
-pro = cat2.products.create!(:title => 'Snom Wired Headset (MM2)', :sku => 'SM-MM2', :description => lorem, :short_description => lorem, :weight => 0.780, :price => 38.00, :cost_price => 30, :tax_rate => 20.0, :stock => 0)
+pro = cat2.products.create!(:title => 'Snom Wired Headset (MM2)', :sku => 'SM-MM2', :description => lorem, :short_description => lorem, :weight => 0.780, :price => 38.00, :cost_price => 30, :tax_rate => 20.0)
 pro.default_image_file = get_file('snom-mm2.jpg')
 pro.save!
+pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 7)
 pro.product_attributes.create!(:key => 'Manufacturer', :value => 'Snom', :position => 1)
 pro.product_attributes.create!(:key => 'Model', :value => 'MM2', :position => 1)
 
-pro = cat2.products.create!(:title => 'Snom Wired Headset (MM3)', :sku => 'SM-MM3', :description => lorem, :short_description => lorem, :weight => 0.780, :price => 38.00, :cost_price => 30, :tax_rate => 20.0, :stock => 1)
+pro = cat2.products.create!(:title => 'Snom Wired Headset (MM3)', :sku => 'SM-MM3', :description => lorem, :short_description => lorem, :weight => 0.780, :price => 38.00, :cost_price => 30, :tax_rate => 20.0)
 pro.default_image_file = get_file('snom-mm2.jpg')
 pro.save!
+pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 5)
 pro.product_attributes.create!(:key => 'Manufacturer', :value => 'Snom', :position => 1)
 pro.product_attributes.create!(:key => 'Model', :value => 'MM3', :position => 1)
 
-pro = cat1.products.create!(:title => 'Yealink W52P', :sku => 'TL-SIP-W52P', :description => lorem, :short_description => 'Wireless SIP phones are hard to come by but this beauty from Yealink is fab.', :weight => 1.280, :price => 99.99, :cost_price => 89.99, :tax_rate => 20.0, :stock => 1, :featured => true)
+pro = cat1.products.create!(:title => 'Yealink W52P', :sku => 'TL-SIP-W52P', :description => lorem, :short_description => 'Wireless SIP phones are hard to come by but this beauty from Yealink is fab.', :weight => 1.280, :price => 99.99, :cost_price => 89.99, :tax_rate => 20.0, :featured => true)
 pro.default_image_file = get_file('w52p.jpg')
 pro.save!
+pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 10)
 pro.product_attributes.create!(:key => 'Manufacturer', :value => 'Snom', :position => 1)
 pro.product_attributes.create!(:key => 'Model', :value => 'W52P', :position => 1)
 pro.product_attributes.create!(:key => 'Lines', :value => '3', :position => 1)

data/lib/shoppe/version.rb

@@ -1,3 +1,3 @@
 module Shoppe
-  VERSION = "0.0.9"
+  VERSION = "0.0.10"
 end

data/test/dummy/db/schema.rb

@@ -11,7 +11,7 @@
 #
 # It's strongly recommended that you check this file into your version control system.
 
-ActiveRecord::Schema.define(version: 20131013131658) do
+ActiveRecord::Schema.define(version: 20131017144430) do
 
   create_table "shoppe_delivery_service_prices", force: true do |t|
     t.integer  "delivery_service_id"
@@ -114,7 +114,6 @@ ActiveRecord::Schema.define(version: 20131013131658) do
     t.decimal  "weight",              precision: 8, scale: 3, default: 0.0
     t.decimal  "price",               precision: 8, scale: 2, default: 0.0
     t.decimal  "tax_rate",            precision: 8, scale: 2, default: 0.0
-    t.integer  "stock",                                       default: 0
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "featured",                                    default: false
@@ -123,6 +122,16 @@ ActiveRecord::Schema.define(version: 20131013131658) do
     t.boolean  "stock_control",                               default: true
   end
 
+  create_table "shoppe_stock_level_adjustments", force: true do |t|
+    t.integer  "product_id"
+    t.string   "description"
+    t.integer  "adjustment",  default: 0
+    t.string   "parent_type"
+    t.integer  "parent_id"
+    t.datetime "created_at"
+    t.datetime "updated_at"
+  end
+
   create_table "shoppe_users", force: true do |t|
     t.string   "first_name"
     t.string   "last_name"

data/test/dummy/log/development.log

@@ -920,3 +920,92 @@ Migrating to AddStockControlBooleanToProducts (20131013131658)
   SQL (1.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131013131658"]]
    (2.7ms)  commit transaction
   ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.4ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateShoppeStockLevelAdjustments (20131017144430)
+   (0.1ms)  begin transaction
+   (0.5ms)  CREATE TABLE "shoppe_stock_level_adjustments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "product_id" integer, "description" varchar(255), "adjustment" integer DEFAULT 0, "parent_type" varchar(255), "parent_id" integer, "created_at" datetime, "updated_at" datetime) 
+  SQL (1.6ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131017144430"]]
+   (0.9ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateShoppeStockLevelAdjustments (20131017144430)
+   (0.1ms)  begin transaction
+   (0.5ms)  DROP TABLE "shoppe_stock_level_adjustments"
+  SQL (2.0ms)  DELETE FROM "schema_migrations" WHERE "schema_migrations"."version" = '20131017144430'
+   (0.7ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateShoppeStockLevelAdjustments (20131017144430)
+   (0.1ms)  begin transaction
+   (0.5ms)  CREATE TABLE "shoppe_stock_level_adjustments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "product_id" integer, "description" varchar(255), "adjustment" integer DEFAULT 0, "parent_type" varchar(255), "parent_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (1.6ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateShoppeStockLevelAdjustments (20131017144430)
+   (0.1ms)  begin transaction
+   (0.5ms)  CREATE TEMPORARY TABLE "ashoppe_products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "product_category_id" integer, "title" varchar(255), "sku" varchar(255), "permalink" varchar(255), "description" text, "short_description" text, "active" boolean DEFAULT 't', "weight" decimal(8,3) DEFAULT 0.0, "price" decimal(8,2) DEFAULT 0.0, "tax_rate" decimal(8,2) DEFAULT 0.0, "stock" integer DEFAULT 0, "created_at" datetime, "updated_at" datetime, "featured" boolean DEFAULT 'f', "in_the_box" text, "cost_price" decimal(8,2), "stock_control" boolean DEFAULT 't') 
+   (0.1ms)  SELECT * FROM "shoppe_products"
+   (0.2ms)  DROP TABLE "shoppe_products"
+   (0.2ms)  CREATE TABLE "shoppe_products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "product_category_id" integer, "title" varchar(255), "sku" varchar(255), "permalink" varchar(255), "description" text, "short_description" text, "active" boolean DEFAULT 't', "weight" decimal(8,3) DEFAULT 0.0, "price" decimal(8,2) DEFAULT 0.0, "tax_rate" decimal(8,2) DEFAULT 0.0, "created_at" datetime, "updated_at" datetime, "featured" boolean DEFAULT 'f', "in_the_box" text, "cost_price" decimal(8,2), "stock_control" boolean DEFAULT 't') 
+   (0.1ms)  SELECT * FROM "ashoppe_products"
+   (0.2ms)  DROP TABLE "ashoppe_products"
+  SQL (22.4ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131017144430"]]
+   (2.5ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateShoppeStockLevelAdjustments (20131017144430)
+   (0.1ms)  begin transaction
+   (0.2ms)  DROP TABLE "shoppe_stock_level_adjustments"
+SQLite3::SQLException: no such table: shoppe_stock_level_adjustments: DROP TABLE "shoppe_stock_level_adjustments"
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateShoppeStockLevelAdjustments (20131017144430)
+   (0.1ms)  begin transaction
+   (0.2ms)  DROP TABLE "shoppe_stock_level_adjustments"
+SQLite3::SQLException: no such table: shoppe_stock_level_adjustments: DROP TABLE "shoppe_stock_level_adjustments"
+   (0.0ms)  rollback transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateShoppeStockLevelAdjustments (20131017144430)
+   (0.0ms)  begin transaction
+   (0.5ms)  ALTER TABLE "shoppe_products" ADD "stock" integer DEFAULT 0
+  SQL (1.3ms)  DELETE FROM "schema_migrations" WHERE "schema_migrations"."version" = '20131017144430'
+   (2.5ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateShoppeStockLevelAdjustments (20131017144430)
+   (0.1ms)  begin transaction
+   (0.5ms)  CREATE TABLE "shoppe_stock_level_adjustments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "product_id" integer, "description" varchar(255), "adjustment" integer DEFAULT 0, "parent_type" varchar(255), "parent_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (0.4ms)  CREATE TEMPORARY TABLE "ashoppe_products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "product_category_id" integer, "title" varchar(255), "sku" varchar(255), "permalink" varchar(255), "description" text, "short_description" text, "active" boolean DEFAULT 't', "weight" decimal(8,3) DEFAULT 0.0, "price" decimal(8,2) DEFAULT 0.0, "tax_rate" decimal(8,2) DEFAULT 0.0, "created_at" datetime, "updated_at" datetime, "featured" boolean DEFAULT 'f', "in_the_box" text, "cost_price" decimal(8,2), "stock_control" boolean DEFAULT 't', "stock" integer DEFAULT 0) 
+   (0.1ms)  SELECT * FROM "shoppe_products"
+   (0.3ms)  DROP TABLE "shoppe_products"
+   (0.1ms)  CREATE TABLE "shoppe_products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "product_category_id" integer, "title" varchar(255), "sku" varchar(255), "permalink" varchar(255), "description" text, "short_description" text, "active" boolean DEFAULT 't', "weight" decimal(8,3) DEFAULT 0.0, "price" decimal(8,2) DEFAULT 0.0, "tax_rate" decimal(8,2) DEFAULT 0.0, "created_at" datetime, "updated_at" datetime, "featured" boolean DEFAULT 'f', "in_the_box" text, "cost_price" decimal(8,2), "stock_control" boolean DEFAULT 't') 
+   (0.1ms)  SELECT * FROM "ashoppe_products"
+   (0.2ms)  DROP TABLE "ashoppe_products"
+  SQL (1.5ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131017144430"]]
+   (2.9ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateShoppeStockLevelAdjustments (20131017144430)
+   (0.1ms)  begin transaction
+   (0.3ms)  DROP TABLE "shoppe_stock_level_adjustments"
+   (0.2ms)  ALTER TABLE "shoppe_products" ADD "stock" integer DEFAULT 0
+  SQL (1.3ms)  DELETE FROM "schema_migrations" WHERE "schema_migrations"."version" = '20131017144430'
+   (2.2ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+  ActiveRecord::SchemaMigration Load (0.1ms)  SELECT "schema_migrations".* FROM "schema_migrations"
+Migrating to CreateShoppeStockLevelAdjustments (20131017144430)
+   (0.1ms)  begin transaction
+   (0.7ms)  CREATE TABLE "shoppe_stock_level_adjustments" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "product_id" integer, "description" varchar(255), "adjustment" integer DEFAULT 0, "parent_type" varchar(255), "parent_id" integer, "created_at" datetime, "updated_at" datetime) 
+   (0.4ms)  CREATE TEMPORARY TABLE "ashoppe_products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "product_category_id" integer, "title" varchar(255), "sku" varchar(255), "permalink" varchar(255), "description" text, "short_description" text, "active" boolean DEFAULT 't', "weight" decimal(8,3) DEFAULT 0.0, "price" decimal(8,2) DEFAULT 0.0, "tax_rate" decimal(8,2) DEFAULT 0.0, "created_at" datetime, "updated_at" datetime, "featured" boolean DEFAULT 'f', "in_the_box" text, "cost_price" decimal(8,2), "stock_control" boolean DEFAULT 't', "stock" integer DEFAULT 0) 
+   (0.1ms)  SELECT * FROM "shoppe_products"
+   (0.3ms)  DROP TABLE "shoppe_products"
+   (0.1ms)  CREATE TABLE "shoppe_products" ("id" INTEGER PRIMARY KEY AUTOINCREMENT NOT NULL, "product_category_id" integer, "title" varchar(255), "sku" varchar(255), "permalink" varchar(255), "description" text, "short_description" text, "active" boolean DEFAULT 't', "weight" decimal(8,3) DEFAULT 0.0, "price" decimal(8,2) DEFAULT 0.0, "tax_rate" decimal(8,2) DEFAULT 0.0, "created_at" datetime, "updated_at" datetime, "featured" boolean DEFAULT 'f', "in_the_box" text, "cost_price" decimal(8,2), "stock_control" boolean DEFAULT 't') 
+   (0.1ms)  SELECT * FROM "ashoppe_products"
+   (0.2ms)  DROP TABLE "ashoppe_products"
+  SQL (2.3ms)  INSERT INTO "schema_migrations" ("version") VALUES (?)  [["version", "20131017144430"]]
+   (2.8ms)  commit transaction
+  ActiveRecord::SchemaMigration Load (0.2ms)  SELECT "schema_migrations".* FROM "schema_migrations"

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: shoppe
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-16 00:00:00.000000000 Z
+date: 2013-10-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -258,6 +258,7 @@ files:
 - app/assets/images/shoppe/icons/cone.svg
 - app/assets/images/shoppe/icons/credit_card.svg
 - app/assets/images/shoppe/icons/currency.svg
+- app/assets/images/shoppe/icons/edit.svg
 - app/assets/images/shoppe/icons/flowchart.svg
 - app/assets/images/shoppe/icons/gift.svg
 - app/assets/images/shoppe/icons/globe.svg
@@ -311,6 +312,7 @@ files:
 - app/models/shoppe/product.rb
 - app/models/shoppe/product_attribute.rb
 - app/models/shoppe/product_category.rb
+- app/models/shoppe/stock_level_adjustment.rb
 - app/models/shoppe/user.rb
 - app/views/layouts/shoppe/application.html.haml
 - app/views/layouts/shoppe/sub.html.haml
@@ -336,6 +338,7 @@ files:
 - app/views/shoppe/products/edit.html.haml
 - app/views/shoppe/products/index.html.haml
 - app/views/shoppe/products/new.html.haml
+- app/views/shoppe/products/stock_levels.html.haml
 - app/views/shoppe/sessions/new.html.haml
 - app/views/shoppe/sessions/reset.html.haml
 - app/views/shoppe/user_mailer/new_password.text.erb
@@ -350,6 +353,7 @@ files:
 - db/migrate/20131012163301_add_public_boolean_to_product_attributes.rb
 - db/migrate/20131013123937_add_cost_prices_to_various_objects.rb
 - db/migrate/20131013131658_add_stock_control_boolean_to_products.rb
+- db/migrate/20131017144430_create_shoppe_stock_level_adjustments.rb
 - db/seeds.rb
 - db/seeds_data/poe400.jpg
 - db/seeds_data/snom-870-blk.jpg
@@ -431,7 +435,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 637768647073806952
+      hash: -387136076029433472
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -440,7 +444,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 637768647073806952
+      hash: -387136076029433472
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23