shoppe 0.0.16 → 0.0.17

data/db/seeds.rb

@@ -7,30 +7,30 @@ exempt_tax = Shoppe::TaxRate.create(:name => "Exempt VAT", :rate => 0.0, :countr
 # 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, :country_ids => Shoppe::Country.where(:name => 'United Kingdom').pluck(:id))
+ds.delivery_service_prices.create!(:code => 'Parcel', :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, :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.delivery_service_prices.create!(:code => 'Parcel', :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!(:code => 'Parcel', :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!(:code => 'Parcel', :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!(:code => 'Parcel', :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!(:code => 'Parcel', :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, :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.delivery_service_prices.create!(:code => 'Parcel', :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!(:code => 'Parcel', :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!(:code => 'Parcel', :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, :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.delivery_service_prices.create!(:code => 'Parcel', :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!(:code => 'Parcel', :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!(:code => 'Parcel', :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, :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))
+ds.delivery_service_prices.create!(:code => 'Parcel', :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!(:code => 'Parcel', :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!(:code => 'Parcel', :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/engine.rb

@@ -17,9 +17,8 @@ module Shoppe
     end
     
     initializer 'shoppe.initialize' do |app|
-      
       # Add the default settings
-      Shoppe.add_setting_group :system_settings, [:store_name, :email_address, :currency_unit, :tax_name, :demo_mode]
+      Shoppe.add_settings_group :system_settings, [:store_name, :email_address, :currency_unit, :tax_name, :demo_mode]
       
       # Add middleware
       app.config.middleware.use Shoppe::SettingsLoader
@@ -30,6 +29,12 @@ module Shoppe
           app.config.paths["db/migrate"] << expanded_path
         end
       end
+      
+      # Load view helpers for the base application
+      ActiveSupport.on_load(:action_view) do
+        require 'shoppe/view_helpers'
+        ActionView::Base.send :include, Shoppe::ViewHelpers
+      end
     end
     
     generators do

data/lib/shoppe/errors/refund_failed.rb

@@ -0,0 +1,15 @@
+module Shoppe
+  module Errors
+    class RefundFailed < Error
+      
+      def initialize(options)
+        @options = options
+      end
+      
+      def message
+        @options[:message]
+      end
+      
+    end
+  end
+end

data/lib/shoppe/settings.rb

@@ -15,8 +15,6 @@ module Shoppe
         value
       elsif I18n.translate("shoppe.settings.defaults").keys.include?(key.to_sym)
         I18n.translate("shoppe.settings.defaults")[key.to_sym]
-      else
-        super
       end
     end
     

data/lib/shoppe/version.rb

@@ -1,3 +1,3 @@
 module Shoppe
-  VERSION = "0.0.16"
+  VERSION = "0.0.17"
 end

data/lib/shoppe/view_helpers.rb

@@ -0,0 +1,16 @@
+module Shoppe
+  module ViewHelpers
+    
+    # Returns currency values with the currency unit as specified by the Shoppe settings
+    def number_to_currency(number, options = {})
+      options[:unit] ||= Shoppe.settings.currency_unit
+      super
+    end
+
+    # Returns a number of kilograms with the appropriate suffix
+    def number_to_weight(kg)
+      "#{kg}#{t('shoppe.helpers.number_to_weight.kg', :default => 'kg')}"
+    end
+    
+  end
+end

data/lib/shoppe.rb

@@ -14,29 +14,46 @@ require 'nifty/dialog'
 
 module Shoppe
   
-  class Error < StandardError; end
+  class Error < StandardError
+    # The Shoppe::Error is the base class for all errors raised by Shoppe.
+  end
   
   class << self
     
+    # The path to the root of the Shoppe applicatinio
+    #
+    # @return [String]
     def root
       File.expand_path('../../', __FILE__)
     end
     
+    # Shoppe settings as configured in the database
+    #
+    # @return [Shoppe::Settings]
     def settings
       Thread.current[:shoppe_settings] ||= Shoppe::Settings.new(Shoppe::Setting.to_hash)
     end
     
+    # Clears the settings from the thread cache so they will be taken
+    # from the database on next access
+    # 
+    # @return [NilClass]
     def reset_settings
       Thread.current[:shoppe_settings] = nil
     end
     
-    def add_setting_group(group, fields = [])
-      setting_groups[group]  ||= []
-      setting_groups[group]    = setting_groups[group] | fields
+    # Defines a new set of settings which should be configrable from the settings page 
+    # in the Shoppe UI.
+    def add_settings_group(group, fields = [])
+      settings_groups[group]  ||= []
+      settings_groups[group]    = settings_groups[group] | fields
     end
     
-    def setting_groups
-      @setting_groups ||= {}
+    # All settings groups which are available for configuration on the settings page.
+    #
+    # @return [Hash]
+    def settings_groups
+      @settings_groups ||= {}
     end
     
   end

data/test/app/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: 20131024101520) do
+ActiveRecord::Schema.define(version: 20131024204815) do
 
   create_table "nifty_attachments", force: true do |t|
     t.integer  "parent_id"
@@ -106,15 +106,12 @@ ActiveRecord::Schema.define(version: 20131024101520) do
     t.decimal  "delivery_cost_price",       precision: 8, scale: 2
     t.decimal  "delivery_tax_rate",         precision: 8, scale: 2
     t.decimal  "delivery_tax_amount",       precision: 8, scale: 2
-    t.datetime "paid_at"
     t.integer  "accepted_by"
     t.integer  "shipped_by"
     t.string   "consignment_number"
     t.datetime "rejected_at"
     t.integer  "rejected_by"
     t.string   "ip_address"
-    t.string   "payment_reference"
-    t.string   "payment_method"
     t.text     "notes"
     t.boolean  "separate_delivery_address",                         default: false
     t.string   "delivery_name"
@@ -122,8 +119,25 @@ ActiveRecord::Schema.define(version: 20131024101520) do
     t.string   "delivery_address2"
     t.string   "delivery_address3"
     t.string   "delivery_address4"
-    t.string   "deilvery_postcode"
+    t.string   "delivery_postcode"
     t.integer  "delivery_country_id"
+    t.decimal  "amount_paid",               precision: 8, scale: 2, default: 0.0
+    t.boolean  "exported",                                          default: false
+    t.string   "invoice_number"
+  end
+
+  create_table "shoppe_payments", force: true do |t|
+    t.integer  "order_id"
+    t.decimal  "amount",            precision: 8, scale: 2, default: 0.0
+    t.string   "reference"
+    t.string   "method"
+    t.boolean  "confirmed",                                 default: true
+    t.boolean  "refundable",                                default: false
+    t.decimal  "amount_refunded",   precision: 8, scale: 2, default: 0.0
+    t.integer  "parent_payment_id"
+    t.boolean  "exported",                                  default: false
+    t.datetime "created_at"
+    t.datetime "updated_at"
   end
 
   create_table "shoppe_product_attributes", force: true do |t|
@@ -185,10 +199,11 @@ ActiveRecord::Schema.define(version: 20131024101520) do
 
   create_table "shoppe_tax_rates", force: true do |t|
     t.string   "name"
-    t.decimal  "rate",        precision: 8, scale: 2
+    t.decimal  "rate",         precision: 8, scale: 2
     t.datetime "created_at"
     t.datetime "updated_at"
     t.text     "country_ids"
+    t.string   "address_type"
   end
 
   create_table "shoppe_users", force: true do |t|