shoppe 0.0.11 → 0.0.12

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

@@ -41,7 +41,7 @@ nav.sidebar {
 	
 	ul {
 		li {
-			span.pending { float:right; font-size:0.9em;  font-weight:bold;background:#5B6270; color:#fff;padding:2px 7px; border-radius:16px; margin-top:9px; margin-right:10px;}
+			span.pending { float:right; font-size:0.9em;  font-weight:bold;background:#5B6270; color:#fff; padding:2px 10px; border-radius:16px; margin-top:9px; margin-right:10px;}
 			a {
 				display:block;
 				border-bottom:1px solid rgba(255,255,255,0.05);
@@ -50,11 +50,12 @@ nav.sidebar {
 				padding:10px 20px;
 				font-size:1.1em;
 				&:hover {
-					background:rgba(0,0,0,0.1);
+					background:rgba(0,0,0,0.05);
 				}
 				&.active {
 					font-weight:bold;
 					color:#fff;
+					background:rgba(0,0,0,0.08);
 				}
 			}
 		}

data/app/assets/stylesheets/shoppe/chosen.css

@@ -19,7 +19,7 @@
   -moz-box-sizing: border-box;
   box-sizing: border-box;
   width: 100%;
-  border: 1px solid #aaa;
+  border: 1px solid #ccc;
   border-top: 0;
   background: #fff;
   box-shadow: 0 4px 5px rgba(0, 0, 0, 0.15);
@@ -39,7 +39,7 @@
   overflow: hidden;
   padding: 0 0 0 8px;
   height: 23px;
-  border: 1px solid #aaa;
+  border: 1px solid #ccc;
   border-radius: 5px;
   background-color: #fff;
   background: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #ffffff), color-stop(50%, #f6f6f6), color-stop(52%, #eeeeee), color-stop(100%, #f4f4f4));
@@ -113,7 +113,7 @@
   width: 100%;
   height: auto;
   outline: 0;
-  border: 1px solid #aaa;
+  border: 1px solid #ccc;
   background: white url('chosen-sprite.png') no-repeat 100% -20px;
   background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
   background: url('chosen-sprite.png') no-repeat 100% -20px, -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%);
@@ -201,7 +201,7 @@
   width: 100%;
   height: auto !important;
   height: 1%;
-  border: 1px solid #aaa;
+  border: 1px solid #ccc;
   background-color: #fff;
   background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(1%, #eeeeee), color-stop(15%, #ffffff));
   background-image: -webkit-linear-gradient(#eeeeee 1%, #ffffff 15%);
@@ -240,7 +240,7 @@
   position: relative;
   margin: 3px 0 3px 5px;
   padding: 3px 20px 3px 5px;
-  border: 1px solid #aaa;
+  border: 1px solid #ccc;
   border-radius: 3px;
   background-color: #e4e4e4;
   background-image: -webkit-gradient(linear, 50% 0%, 50% 100%, color-stop(20%, #f4f4f4), color-stop(50%, #f0f0f0), color-stop(52%, #e8e8e8), color-stop(100%, #eeeeee));
@@ -297,11 +297,11 @@
 /* @end */
 /* @group Active  */
 .chosen-container-active .chosen-single {
-  border: 1px solid #5897fb;
+  border: 1px solid #9AC835;
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
 }
 .chosen-container-active.chosen-with-drop .chosen-single {
-  border: 1px solid #aaa;
+  border: 1px solid #ccc;
   -moz-border-radius-bottomright: 0;
   border-bottom-right-radius: 0;
   -moz-border-radius-bottomleft: 0;
@@ -321,7 +321,7 @@
   background-position: -18px 2px;
 }
 .chosen-container-active .chosen-choices {
-  border: 1px solid #5897fb;
+  border: 1px solid #9AC835;
   box-shadow: 0 0 5px rgba(0, 0, 0, 0.3);
 }
 .chosen-container-active .chosen-choices li.search-field input[type="text"] {

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

@@ -18,7 +18,7 @@
   background-color:#40454D;
   display:inline-block;
   &:active {
-    background:#40454D;
+    background:#535963;
   }
   
   &.green {

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, :cost_price, :tax_rate_id, :min_weight, :max_weight, :code)
+    params[:delivery_service_price].permit(:price, :cost_price, :tax_rate_id, :min_weight, :max_weight, :code, :country_ids => [])
   end
   
 end

data/app/controllers/shoppe/tax_rates_controller.rb

@@ -41,7 +41,7 @@ class Shoppe::TaxRatesController < Shoppe::ApplicationController
   private
   
   def safe_params
-    params[:tax_rate].permit(:name, :rate)
+    params[:tax_rate].permit(:name, :rate, :country_ids => [])
   end
   
 end

data/app/models/shoppe/delivery_service_price.rb

@@ -3,6 +3,9 @@ class Shoppe::DeliveryServicePrice < ActiveRecord::Base
   # Set the table name
   self.table_name = 'shoppe_delivery_service_prices'
   
+  # Tax rates are associated with countries
+  include Shoppe::AssociatedCountries
+  
   # Relationships
   belongs_to :delivery_service, :class_name => 'Shoppe::DeliveryService'
   belongs_to :tax_rate, :class_name => "Shoppe::TaxRate"

data/app/models/shoppe/order.rb

@@ -36,6 +36,11 @@ class Shoppe::Order < ActiveRecord::Base
     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\ ]{7,}\z/}
   end
+  validate do
+    unless available_delivery_services.include?(self.delivery_service)
+      errors.add :delivery_service_id, "is not suitable for this order"
+    end
+  end
   
   # Scopes
   scope :received, -> {where("received_at is not null")}
@@ -153,7 +158,9 @@ class Shoppe::Order < ActiveRecord::Base
   # An array of all the delivery service prices which can be applied to this order.
   def delivery_service_prices
     @delivery_service_prices ||= begin
-      Shoppe::DeliveryServicePrice.joins(:delivery_service).where(:shoppe_delivery_services => {:active => true}).order("`default` desc, price asc").for_weight(total_weight)
+      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
     end
   end
   
@@ -189,7 +196,7 @@ class Shoppe::Order < ActiveRecord::Base
   def delivery_tax_amount
     @delivery_tax_amount ||= begin
       read_attribute(:delivery_tax_amount) ||
-      (delivery_service_price && delivery_service_price.tax_rate ? delivery_price / BigDecimal(100) * delivery_service_price.tax_rate.rate : 0.0) ||
+      delivery_price / BigDecimal(100) * delivery_tax_rate ||
       0.0
     end
   end
@@ -198,7 +205,7 @@ class Shoppe::Order < ActiveRecord::Base
   def delivery_tax_rate
     @delivery_tax_rate ||= begin
       read_attribute(:delivery_tax_rate) ||
-      delivery_service_price.try(:tax_rate).try(:rate) ||
+      delivery_service_price.try(:tax_rate).try(:rate_for, self) ||
       0.0
     end
   end

data/app/models/shoppe/order_item.rb

@@ -13,19 +13,7 @@ class Shoppe::OrderItem < ActiveRecord::Base
   
   # Set some values based on the selected product on validation
   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.rate    if self.tax_rate.blank? && self.product.tax_rate
-
-      if unit_price_changed? || quantity_changed? || tax_rate_changed?
-        self.tax_amount = (self.sub_total / BigDecimal(100)) * self.tax_rate
-      end
-      
-      if product_id_changed? || quantity_changed?
-        self.weight = self.quantity * self.product.weight
-      end
-    end
+    self.weight          = self.quantity * self.product.weight
   end
   
   # This allows you to add a product to the scoped order. For example Order.first.order_items.add_product(...).
@@ -75,6 +63,26 @@ class Shoppe::OrderItem < ActiveRecord::Base
     end
   end
   
+  # Return the unit price for the item
+  def unit_price
+    @unit_price ||= read_attribute(:unit_price) || product.try(:price) || 0.0
+  end
+  
+  # Return the cost price for the item
+  def unit_cost_price
+    @unit_cost_price ||= read_attribute(:unit_cost_price) || product.try(:cost_price) || 0.0
+  end
+  
+  # Return the tax rate for the item
+  def tax_rate
+    @tax_rate ||= read_attribute(:tax_rate) || product.try(:tax_rate).try(:rate_for, self.order) || 0.0 
+  end
+  
+  # Return the total tax for the item
+  def tax_amount
+    @tax_amount ||= read_attribute(:tax_amount) || (self.sub_total / BigDecimal(100)) * self.tax_rate
+  end
+  
   # Return the total cost for the product
   def total_cost
     quantity * unit_cost_price
@@ -93,6 +101,12 @@ 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!
+    write_attribute :unit_price, self.unit_price
+    write_attribute :unit_cost_price, self.unit_cost_price
+    write_attribute :tax_rate, self.tax_rate
+    write_attribute :tax_amount, self.tax_amount
+    save!
+    
     if self.product.stock_control?
       self.product.stock_level_adjustments.create(:parent => self, :adjustment => 0 - self.quantity, :description => "Order ##{self.order.number} deduction")
     end

data/app/models/shoppe/tax_rate.rb

@@ -4,6 +4,9 @@ module Shoppe
     # Set the table name
     self.table_name = 'shoppe_tax_rates'
     
+    # Tax rates are associated with countries
+    include Shoppe::AssociatedCountries
+    
     # Validations
     validates :name, :presence => true
     validates :rate, :numericality => true
@@ -19,5 +22,13 @@ module Shoppe
       "#{name} (#{rate}%)"
     end
     
+    def rate_for(order)
+      if countries.empty? || order.country.nil? || country?(order.country)
+        self.rate
+      else
+        0.0
+      end
+    end
+    
   end
 end

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

@@ -25,6 +25,12 @@
         %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 "Countries" do
+    %dl
+      %dd
+        = f.collection_select :country_ids, Shoppe::Country.ordered, :id, :name, {}, {:class => 'chosen', :multiple => true, :data => {:placeholder => "All countries"}}
+        %p.help This delivery rate will only be available to orders where the country selected is listed here.
+
   %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?"}

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

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

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

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

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

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

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

@@ -1,8 +1,8 @@
 - @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'
+    = link_to "Edit product", [:edit, @product], :class => 'button'
+    = link_to "Back to product list", :products, :class => 'button'
   %h2.products= @product.title
 
 .table

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

@@ -13,8 +13,13 @@
       %dl.half
         %dt= f.label :rate
         %dd= f.text_field :rate
-
-
+  
+  = field_set_tag "Countries" do
+    %dl
+      %dd
+        = f.collection_select :country_ids, Shoppe::Country.ordered, :id, :name, {}, {:class => 'chosen', :multiple => true, :data => {:placeholder => "All countries"}}
+        %p.help This tax rate will only apply to orders which are billed to addresses of the countries  listed above.
+  
   %p.submit
     - unless @tax_rate.new_record?
       %span.right= link_to "Delete", @tax_rate, :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this tax_rate?"}

data/db/migrate/20131020204719_add_countries_to_tax_rates_and_delivery_prices.rb

@@ -0,0 +1,6 @@
+class AddCountriesToTaxRatesAndDeliveryPrices < ActiveRecord::Migration
+  def change
+    add_column :shoppe_delivery_service_prices, :country_ids, :text
+    add_column :shoppe_tax_rates, :country_ids, :text
+  end
+end

data/db/seeds.rb

@@ -1,36 +1,36 @@
 # encoding: UTF-8
 
 # tax rates
-tax_rate = Shoppe::TaxRate.create(:name => "Standard UK VAT", :rate => 20.0)
-exempt_tax = Shoppe::TaxRate.create(:name => "Exempt VAT", :rate => 0.0)
+tax_rate = Shoppe::TaxRate.create(:name => "Standard UK VAT", :rate => 20.0, :country_ids => Shoppe::Country.where(:eu_member => true).pluck(:id))
+exempt_tax = Shoppe::TaxRate.create(:name => "Exempt VAT", :rate => 0.0, :country_ids => Shoppe::Country.where(:eu_member => true).pluck(:id))
 
 # delivery services
 
 ds = Shoppe::DeliveryService.create!(:name => "Royal Mail (1st class)", :code => 'RMFC', :courier => 'Royal Mail', :tracking_url => 'http://royalmail.com/track/{{consignment_number}}')
-ds.delivery_service_prices.create!(:min_weight => 0, :max_weight => 0.050, :price => 0.60, :cost_price => 0.55, :tax_rate => exempt_tax)
+ds.delivery_service_prices.create!(:min_weight => 0, :max_weight => 0.050, :price => 0.60, :cost_price => 0.55, :tax_rate => exempt_tax, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
 
 
 ds = Shoppe::DeliveryService.create!(:name => "Royal Mail (signed for)", :code => 'RMSF', :courier => 'Royal Mail', :tracking_url => 'http://royalmail.com/track/{{consignment_number}}')
-ds.delivery_service_prices.create!(:min_weight => 0, :max_weight => 1, :price => 5.0, :cost_price => 4.5, :tax_rate => tax_rate)
-ds.delivery_service_prices.create!(:min_weight => 1, :max_weight => 5, :price => 8.0, :cost_price => 7.5, :tax_rate => tax_rate)
-ds.delivery_service_prices.create!(:min_weight => 5, :max_weight => 10, :price => 10.0, :cost_price => 9.5, :tax_rate => tax_rate)
-ds.delivery_service_prices.create!(:min_weight => 10, :max_weight => 25, :price => 12.0, :cost_price => 11.5, :tax_rate => tax_rate)
-ds.delivery_service_prices.create!(:min_weight => 25, :max_weight => 50, :price => 16.25, :cost_price => 13.5, :tax_rate => tax_rate)
+ds.delivery_service_prices.create!(:min_weight => 0, :max_weight => 1, :price => 5.0, :cost_price => 4.5, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:min_weight => 1, :max_weight => 5, :price => 8.0, :cost_price => 7.5, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:min_weight => 5, :max_weight => 10, :price => 10.0, :cost_price => 9.5, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:min_weight => 10, :max_weight => 25, :price => 12.0, :cost_price => 11.5, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:min_weight => 25, :max_weight => 50, :price => 16.25, :cost_price => 13.5, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
 
 ds = Shoppe::DeliveryService.create!(:name => "Next Day Delivery (before 4pm)",  :default => true, :code => 'ND16', :courier => 'UPS', :tracking_url => 'http://trackingurl.com/track/{{consignment_number}}')
-ds.delivery_service_prices.create!(:min_weight => 0, :max_weight => 1, :price => 7.0, :cost_price => 5.5, :tax_rate => tax_rate)
-ds.delivery_service_prices.create!(:min_weight => 1, :max_weight => 5, :price => 9.0, :cost_price => 7.6, :tax_rate => tax_rate)
-ds.delivery_service_prices.create!(:min_weight => 5, :max_weight => 20, :price => 11.50, :cost_price => 8.9, :tax_rate => tax_rate)
+ds.delivery_service_prices.create!(:min_weight => 0, :max_weight => 1, :price => 7.0, :cost_price => 5.5, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:min_weight => 1, :max_weight => 5, :price => 9.0, :cost_price => 7.6, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:min_weight => 5, :max_weight => 20, :price => 11.50, :cost_price => 8.9, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
 
 ds = Shoppe::DeliveryService.create!(:name => "Next Day Delivery (before 10am)", :code => 'NS10', :courier => 'UPS', :tracking_url => 'http://trackingurl.com/track/{{consignment_number}}')
-ds.delivery_service_prices.create!(:min_weight => 0, :max_weight => 1, :price => 17.0, :cost_price => 14.00, :tax_rate => tax_rate)
-ds.delivery_service_prices.create!(:min_weight => 1, :max_weight => 5, :price => 19.0, :cost_price => 16.00, :tax_rate => tax_rate)
-ds.delivery_service_prices.create!(:min_weight => 5, :max_weight => 20, :price => 27.0, :cost_price => 22.00, :tax_rate => tax_rate)
+ds.delivery_service_prices.create!(:min_weight => 0, :max_weight => 1, :price => 17.0, :cost_price => 14.00, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:min_weight => 1, :max_weight => 5, :price => 19.0, :cost_price => 16.00, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:min_weight => 5, :max_weight => 20, :price => 27.0, :cost_price => 22.00, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
 
 ds = Shoppe::DeliveryService.create!(:name => "Saturday Delivery", :code => 'NDSA16', :courier => 'UPS', :tracking_url => 'http://trackingurl.com/track/{{consignment_number}}')
-ds.delivery_service_prices.create!(:min_weight => 0, :max_weight => 1, :price => 27.0, :cost_price => 24.00, :tax_rate => tax_rate)
-ds.delivery_service_prices.create!(:min_weight => 1, :max_weight => 5, :price => 29.0, :cost_price => 20.00, :tax_rate => tax_rate)
-ds.delivery_service_prices.create!(:min_weight => 5, :max_weight => 20, :price => 37.0, :cost_price => 32.00,:tax_rate => tax_rate)
+ds.delivery_service_prices.create!(:min_weight => 0, :max_weight => 1, :price => 27.0, :cost_price => 24.00, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:min_weight => 1, :max_weight => 5, :price => 29.0, :cost_price => 20.00, :tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:min_weight => 5, :max_weight => 20, :price => 37.0, :cost_price => 32.00,:tax_rate => tax_rate, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
 
 # categories
 cat1 = Shoppe::ProductCategory.create!(:name => 'VoIP Phones')

data/lib/shoppe/associated_countries.rb

@@ -0,0 +1,20 @@
+module Shoppe
+  module AssociatedCountries
+    
+    def self.included(base)
+      base.serialize :country_ids, Array
+      base.before_validation { self.country_ids = self.country_ids.map(&:to_i).select { |i| i > 0} if self.country_ids.is_a?(Array) }
+    end
+    
+    def country?(id)
+      id = id.id if id.is_a?(Shoppe::Country)
+      self.country_ids.is_a?(Array) && self.country_ids.include?(id.to_i)
+    end
+    
+    def countries
+      return [] unless self.country_ids.is_a?(Array) && !self.country_ids.empty?
+      Shoppe::Country.where(:id => self.country_ids)
+    end
+    
+  end
+end

data/lib/shoppe/version.rb

@@ -1,3 +1,3 @@
 module Shoppe
-  VERSION = "0.0.11"
+  VERSION = "0.0.12"
 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: 20131017165222) do
+ActiveRecord::Schema.define(version: 20131020204719) do
 
   create_table "nifty_attachments", force: true do |t|
     t.integer  "parent_id"
@@ -34,16 +34,27 @@ ActiveRecord::Schema.define(version: 20131017165222) do
     t.string  "value"
   end
 
+  create_table "shoppe_countries", force: true do |t|
+    t.string  "name"
+    t.string  "code2"
+    t.string  "code3"
+    t.string  "continent"
+    t.string  "tld"
+    t.string  "currency"
+    t.boolean "eu_member", default: false
+  end
+
   create_table "shoppe_delivery_service_prices", force: true do |t|
     t.integer  "delivery_service_id"
     t.string   "code"
     t.decimal  "price",               precision: 8, scale: 2
-    t.decimal  "tax_rate",            precision: 8, scale: 2
+    t.integer  "tax_rate_id"
     t.decimal  "min_weight",          precision: 8, scale: 2
     t.decimal  "max_weight",          precision: 8, scale: 2
     t.datetime "created_at"
     t.datetime "updated_at"
     t.decimal  "cost_price",          precision: 8, scale: 2
+    t.text     "country_ids"
   end
 
   create_table "shoppe_delivery_services", force: true do |t|
@@ -80,6 +91,7 @@ ActiveRecord::Schema.define(version: 20131017165222) do
     t.string   "address3"
     t.string   "address4"
     t.string   "postcode"
+    t.integer  "country_id"
     t.string   "email_address"
     t.string   "phone_number"
     t.string   "status"
@@ -99,7 +111,6 @@ ActiveRecord::Schema.define(version: 20131017165222) do
     t.datetime "rejected_at"
     t.integer  "rejected_by"
     t.string   "ip_address"
-    t.string   "country"
     t.string   "payment_reference"
     t.string   "payment_method"
     t.decimal  "delivery_cost_price", precision: 8, scale: 2
@@ -134,7 +145,7 @@ ActiveRecord::Schema.define(version: 20131017165222) do
     t.boolean  "active",                                      default: true
     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  "tax_rate_id"
     t.datetime "created_at"
     t.datetime "updated_at"
     t.boolean  "featured",                                    default: false
@@ -153,6 +164,14 @@ ActiveRecord::Schema.define(version: 20131017165222) do
     t.datetime "updated_at"
   end
 
+  create_table "shoppe_tax_rates", force: true do |t|
+    t.string   "name"
+    t.decimal  "rate",        precision: 8, scale: 2
+    t.datetime "created_at"
+    t.datetime "updated_at"
+    t.text     "country_ids"
+  end
+
   create_table "shoppe_users", force: true do |t|
     t.string   "first_name"
     t.string   "last_name"

data/test/dummy/log/development.log

@@ -1054,3 +1054,27 @@ Migrating to CreateShoppeCountries (20131017180920)
    (0.8ms)  DROP TABLE `shoppe_countries`
   SQL (1.6ms)  DELETE FROM `schema_migrations` WHERE `schema_migrations`.`version` = '20131017180920'
   ActiveRecord::SchemaMigration Load (0.2ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+  ActiveRecord::SchemaMigration Load (0.7ms)  SELECT `schema_migrations`.* FROM `schema_migrations`
+Migrating to CreateShoppeCountries (20131017180920)
+   (16.5ms)  CREATE TABLE `shoppe_countries` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `code2` varchar(255), `code3` varchar(255), `continent` varchar(255), `tld` varchar(255), `currency` varchar(255), `eu_member` tinyint(1) DEFAULT 0) ENGINE=InnoDB
+   (24.1ms)  ALTER TABLE `shoppe_orders` ADD `country_id` int(11) AFTER `postcode`
+   (20.5ms)  ALTER TABLE `shoppe_orders` DROP `country`
+   (0.1ms)  BEGIN
+  SQL (1.9ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131017180920')
+   (0.3ms)  COMMIT
+Migrating to CreateShoppeTaxRates (20131017183211)
+   (8.9ms)  CREATE TABLE `shoppe_tax_rates` (`id` int(11) DEFAULT NULL auto_increment PRIMARY KEY, `name` varchar(255), `rate` decimal(8,2), `created_at` datetime, `updated_at` datetime) ENGINE=InnoDB
+   (24.2ms)  ALTER TABLE `shoppe_products` ADD `tax_rate_id` int(11) AFTER `tax_rate`
+   (17.3ms)  ALTER TABLE `shoppe_products` DROP `tax_rate`
+   (14.6ms)  ALTER TABLE `shoppe_delivery_service_prices` ADD `tax_rate_id` int(11) AFTER `tax_rate`
+   (16.9ms)  ALTER TABLE `shoppe_delivery_service_prices` DROP `tax_rate`
+   (0.1ms)  BEGIN
+  SQL (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131017183211')
+   (0.3ms)  COMMIT
+Migrating to AddCountriesToTaxRatesAndDeliveryPrices (20131020204719)
+   (19.4ms)  ALTER TABLE `shoppe_delivery_service_prices` ADD `country_ids` text
+   (19.5ms)  ALTER TABLE `shoppe_tax_rates` ADD `country_ids` text
+   (0.1ms)  BEGIN
+  SQL (0.2ms)  INSERT INTO `schema_migrations` (`version`) VALUES ('20131020204719')
+   (0.3ms)  COMMIT
+  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.11
+  version: 0.0.12
   prerelease: 
 platform: ruby
 authors:
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2013-10-17 00:00:00.000000000 Z
+date: 2013-10-21 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -378,6 +378,7 @@ files:
 - db/migrate/20131017144430_create_shoppe_stock_level_adjustments.rb
 - db/migrate/20131017180920_create_shoppe_countries.rb
 - db/migrate/20131017183211_create_shoppe_tax_rates.rb
+- db/migrate/20131020204719_add_countries_to_tax_rates_and_delivery_prices.rb
 - db/seeds.rb
 - db/seeds_data/poe400.jpg
 - db/seeds_data/snom-870-blk.jpg
@@ -392,6 +393,7 @@ files:
 - db/seeds_data/t46gn.jpg
 - db/seeds_data/w52p.jpg
 - db/seeds_data/yhs32.jpg
+- lib/shoppe/associated_countries.rb
 - lib/shoppe/country_importer.rb
 - lib/shoppe/engine.rb
 - lib/shoppe/errors/inappropriate_delivery_service.rb
@@ -462,7 +464,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2209799675854067542
+      hash: -2288796444690138098
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -471,7 +473,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2209799675854067542
+      hash: -2288796444690138098
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23