shoppe 0.0.14 → 0.0.15

data/app/views/shoppe/shared/error.html.haml

@@ -0,0 +1,4 @@
+= display_flash
+.error
+  %p= @exception.message
+  %p.back= link_to "← Back to Shoppe".html_safe, root_path, :class => 'button'

data/app/views/shoppe/{products/stock_levels.html.haml → stock_level_adjustments/index.html.haml}

@@ -1,16 +1,22 @@
-- @page_title = "Stock Levels - #{@product.title}"
+- @page_title = "Stock Levels - #{@item.name}"
 = content_for :header do
   %p.buttons
-    = link_to "Edit product", [:edit, @product], :class => 'button'
-    = link_to "Back to product list", :products, :class => 'button'
-  %h2.products= @product.title
+    - case @item
+    - when Shoppe::Product
+      - @active_nav = :products
+      = link_to "Edit product", [:edit, @item], :class => 'button'
+      = link_to "Back to product list", :products, :class => 'button'
+      
+  %h2.products Stock Levels for #{@item.name}
 
 .table
   %p.info
-    Current stock level is <b>#{@product.stock}</b>
+    Current stock level is <b>#{@item.stock}</b>
     %span.float-right= page_entries_info @stock_level_adjustments
 
-  = form_for @new_sla, :url => [:stock_levels, @product] do |f|
+  = form_for @new_sla do |f|
+    = hidden_field_tag 'item_type', params[:item_type]
+    = hidden_field_tag 'item_id', params[:item_id]
     %table.data
       %thead
         %tr

data/app/views/shoppe/variants/form.html.haml

@@ -0,0 +1,64 @@
+- @page_title = "Variants - #{@product.name}"
+= content_for :header do
+  %p.buttons= link_to "Back to variants", [@product, :variants], :class => 'button'
+  %h2.products Variants of #{@product.name}
+
+
+= form_for [@product, @variant], :url => @variant.new_record? ? product_variants_path(@product) : product_variant_path(@product, @variant), :html => {:multipart => true} do |f|
+  = f.error_messages
+  = field_set_tag "Product Information" do
+    .splitContainer
+      %dl.third
+        %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'
+      %dl.third
+        %dt= f.label :sku, 'SKU'
+        %dd= f.text_field :sku, :class => 'text'
+      
+  = field_set_tag "Image" do
+    %dl
+      %dd
+        = attachment_preview @variant.default_image, :hide_if_blank => true
+        %p= f.file_field :default_image_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"}}
+
+  = 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
+          = f.check_box :active
+          = f.label :active, "If checked, this product will be displayed within the public store"
+      %dl.half
+  
+  %p.submit
+    - unless @variant.new_record?
+      %span.right= link_to "Delete", product_variant_path(@product, @variant), :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this variant?"}
+    = f.submit "Save Variant", :class => 'button green'
+    = link_to "Cancel", :products, :class => 'button'

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

@@ -0,0 +1,33 @@
+- @page_title = "Variants - #{@product.name}"
+
+= content_for :header do
+  %p.buttons
+    = link_to "Edit product", [:edit, @product], :class => 'button'
+    = link_to "New variant", [:new, @product, :variant], :class => 'button green'  
+
+  %h2.products Variants of #{@product.name}
+
+.table
+  %table.data
+    %thead
+      %tr
+        %th{:width => '20%'} SKU
+        %th{:width => '50%'} Name
+        %th{:width => '15%'} Price
+        %th{:width => '15%'} Stock
+    %tbody
+      - if @variants.empty?
+        %tr.empty
+          %td{:colspan => 4} No products to display.
+      - else
+        - for variant in @variants
+          %tr
+            %td= variant.sku
+            %td= link_to variant.name, edit_product_variant_path(@product, variant)
+            %td= number_to_currency variant.price
+            %td
+              - 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
+                ∞

data/config/routes.rb

@@ -3,7 +3,7 @@ Shoppe::Engine.routes.draw do
   get 'attachment/:id/:filename.:extension' => 'attachments#show'
   resources :product_categories
   resources :products do
-    match :stock_levels, :on => :member, :via => [:get, :post]
+    resources :variants
   end
   resources :orders do
     post :search, :on => :collection
@@ -12,6 +12,7 @@ Shoppe::Engine.routes.draw do
     post :ship, :on => :member
     post :pay, :on => :member
   end
+  resources :stock_level_adjustments, :only => [:index, :create]
   resources :delivery_services do
     resources :delivery_service_prices
   end

data/config/shoppe.example.yml

@@ -1,6 +1,20 @@
-# !! Remember to restart your server after making changes to this file.
+# Shoppe Configuration File
+# !! Be sure to restart your server after making any changes to this file.
 
-store_name: Shoppe
+# The name of your Shoppe store.
+store_name: Ye Old Widget Shoppe
+
+# The e-mail address used to send all ourbound messages through Shoppe.
 email_address: sales@example.com
+
+# The currency unit which should be shown before all currency values
+# within the Shoppe interface.
 currency_unit: '£'
+
+# The name of "tax" which you would like displayed within the Shoppe
+# interface.
 tax_name: VAT
+
+# If enabled, Shoppe will behave in demo mode. This removes the requirement
+# to login to the Shoppe interface and disabled editting of users. 
+demo_mode: false

data/db/migrate/20131022090919_refactor_order_items_to_allow_any_product.rb

@@ -0,0 +1,6 @@
+class RefactorOrderItemsToAllowAnyProduct < ActiveRecord::Migration
+  def change
+    rename_column :shoppe_order_items, :product_id, :ordered_item_id
+    add_column :shoppe_order_items, :ordered_item_type, :string, :after => :ordered_item_id
+  end
+end

data/db/migrate/20131022092904_rename_product_title_to_name.rb

@@ -0,0 +1,5 @@
+class RenameProductTitleToName < ActiveRecord::Migration
+  def change
+    rename_column :shoppe_products, :title, :name
+  end
+end

data/db/migrate/20131022093538_stock_level_adjustments_should_be_polymorphic.rb

@@ -0,0 +1,6 @@
+class StockLevelAdjustmentsShouldBePolymorphic < ActiveRecord::Migration
+  def change
+    rename_column :shoppe_stock_level_adjustments, :product_id, :item_id
+    add_column :shoppe_stock_level_adjustments, :item_type, :string, :after => :item_id
+  end
+end

data/db/migrate/20131022135331_add_parent_id_to_products.rb

@@ -0,0 +1,5 @@
+class AddParentIdToProducts < ActiveRecord::Migration
+  def change
+    add_column :shoppe_products, :parent_id, :integer, :after => :id
+  end
+end

data/db/migrate/20131022145653_cost_price_should_be_default_to_zero.rb

@@ -0,0 +1,9 @@
+class CostPriceShouldBeDefaultToZero < ActiveRecord::Migration
+  def up
+    change_column_default :shoppe_products, :cost_price, 0.0
+  end
+  
+  def down
+    change_column_default :shoppe_products, :cost_price, nil
+  end
+end

data/db/seeds.rb

@@ -46,7 +46,7 @@ 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 => tax_rate, :featured => true)
+pro = cat1.products.create!(:name => '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 => tax_rate, :featured => true)
 pro.default_image_file = get_file('t20p.jpg')
 pro.save!
 pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 17)
@@ -57,7 +57,7 @@ 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 => tax_rate)
+pro = cat1.products.create!(:name => 'Yealink T22P', :sku => 'YL-SIP-T22P', :description => lorem, :short_description => lorem, :weight => 1.419, :price => 64.99, :cost_price => 56.99, :tax_rate => tax_rate)
 pro.default_image_file = get_file('t22p.jpg')
 pro.save!
 pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 200)
@@ -69,7 +69,7 @@ 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 => tax_rate)
+pro = cat1.products.create!(:name => 'Yealink T26P', :sku => 'YL-SIP-T26P', :description => lorem, :short_description => lorem, :weight => 2.23, :price => 88.99, :cost_price => 78.99, :tax_rate => tax_rate)
 pro.default_image_file = get_file('t26p.jpg')
 pro.save!
 pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 100)
@@ -80,7 +80,7 @@ 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 => tax_rate, :featured => true)
+pro = cat1.products.create!(:name => '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 => tax_rate, :featured => true)
 pro.default_image_file = get_file('t46gn.jpg')
 pro.save!
 pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 10)
@@ -91,10 +91,9 @@ 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 => tax_rate)
+pro = cat1.products.create!(:name => 'Snom 870', :sku => 'SM-870', :description => lorem, :short_description => 'The perfect & beautiful VoIP phone for the discerning professional desk.', :featured => true)
 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)
@@ -102,38 +101,39 @@ 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 => tax_rate, :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)
-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)
+v1 = pro.variants.create(:name => "White/Grey", :sku => "SM-870-GREY", :price => 230.00, :cost_price => 220, :tax_rate => tax_rate, :weight => 1.35)
+v1.default_image_file = get_file('snom-870-grey.jpg')
+v1.save!
+v1.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 4)
+
+
+v2 = pro.variants.create(:name => "Black", :sku => "SM-870-BLK", :price => 230.00, :cost_price => 220, :tax_rate => tax_rate, :weight => 1.35)
+v2.default_image_file = get_file('snom-870-blk.jpg')
+v2.save!
+v2.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 2)
+
 
-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 => tax_rate, :featured => true)
+pro = cat2.products.create!(:name => '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 => tax_rate, :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 => tax_rate)
+pro = cat2.products.create!(:name => 'Snom Wired Headset (MM2)', :sku => 'SM-MM2', :description => lorem, :short_description => lorem, :weight => 0.780, :price => 38.00, :cost_price => 30, :tax_rate => tax_rate)
 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 => tax_rate)
+pro = cat2.products.create!(:name => 'Snom Wired Headset (MM3)', :sku => 'SM-MM3', :description => lorem, :short_description => lorem, :weight => 0.780, :price => 38.00, :cost_price => 30, :tax_rate => tax_rate)
 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 => tax_rate, :featured => true)
+pro = cat1.products.create!(:name => '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 => tax_rate, :featured => true)
 pro.default_image_file = get_file('w52p.jpg')
 pro.save!
 pro.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 10)

data/lib/shoppe.rb

@@ -3,9 +3,11 @@ require 'bcrypt'
 require 'dynamic_form'
 require 'kaminari'
 require 'ransack'
+
 require 'nifty/utils'
 require 'nifty/key_value_store'
 require 'nifty/attachments'
+require 'nifty/dialog'
 
 module Shoppe
   

data/lib/shoppe/errors/not_enough_stock.rb

@@ -7,7 +7,7 @@ module Shoppe
       end
       
       def available_stock
-        @options[:product].stock
+        @options[:ordered_item].stock
       end
       
       def requested_stock

data/lib/shoppe/errors/unorderable_item.rb

@@ -0,0 +1,11 @@
+module Shoppe
+  module Errors
+    class UnorderableItem < Error
+      
+      def initialize(options)
+        @options = options
+      end
+      
+    end
+  end
+end

data/lib/shoppe/orderable_item.rb

@@ -0,0 +1,39 @@
+module Shoppe
+  # All items which can be ordered should include this module and ensure that all methods
+  # have been overridden. It's a lazy-mans protocol.
+  module OrderableItem
+    
+    # stock_level_adjustments must be an association
+    
+    def full_name
+    end
+    
+    def orderable?
+    end
+    
+    def sku
+    end
+    
+    def price
+    end
+    
+    def cost_price
+    end
+    
+    def tax_rate
+    end
+    
+    def stock_control?
+    end
+    
+    def in_stock?
+    end
+    
+    def stock
+    end
+    
+    def weight
+    end
+    
+  end
+end

data/lib/shoppe/version.rb

@@ -1,3 +1,3 @@
 module Shoppe
-  VERSION = "0.0.14"
+  VERSION = "0.0.15"
 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: 20131021135208) do
+ActiveRecord::Schema.define(version: 20131022145653) do
 
   create_table "nifty_attachments", force: true do |t|
     t.integer  "parent_id"
@@ -70,15 +70,16 @@ ActiveRecord::Schema.define(version: 20131021135208) do
 
   create_table "shoppe_order_items", force: true do |t|
     t.integer  "order_id"
-    t.integer  "product_id"
-    t.integer  "quantity",                                default: 1
-    t.decimal  "unit_price",      precision: 8, scale: 2
-    t.decimal  "tax_amount",      precision: 8, scale: 2
-    t.decimal  "tax_rate",        precision: 8, scale: 2
-    t.decimal  "weight",          precision: 8, scale: 3, default: 0.0
+    t.integer  "ordered_item_id"
+    t.integer  "quantity",                                  default: 1
+    t.decimal  "unit_price",        precision: 8, scale: 2
+    t.decimal  "tax_amount",        precision: 8, scale: 2
+    t.decimal  "tax_rate",          precision: 8, scale: 2
+    t.decimal  "weight",            precision: 8, scale: 3, default: 0.0
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.decimal  "unit_cost_price", precision: 8, scale: 2
+    t.decimal  "unit_cost_price",   precision: 8, scale: 2
+    t.string   "ordered_item_type"
   end
 
   create_table "shoppe_orders", force: true do |t|
@@ -137,8 +138,9 @@ ActiveRecord::Schema.define(version: 20131021135208) do
   end
 
   create_table "shoppe_products", force: true do |t|
+    t.integer  "parent_id"
     t.integer  "product_category_id"
-    t.string   "title"
+    t.string   "name"
     t.string   "sku"
     t.string   "permalink"
     t.text     "description"
@@ -151,18 +153,19 @@ ActiveRecord::Schema.define(version: 20131021135208) do
     t.datetime "updated_at"
     t.boolean  "featured",                                    default: false
     t.text     "in_the_box"
-    t.decimal  "cost_price",          precision: 8, scale: 2
+    t.decimal  "cost_price",          precision: 8, scale: 2, default: 0.0
     t.boolean  "stock_control",                               default: true
   end
 
   create_table "shoppe_stock_level_adjustments", force: true do |t|
-    t.integer  "product_id"
+    t.integer  "item_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"
+    t.string   "item_type"
   end
 
   create_table "shoppe_tax_rates", force: true do |t|