shoppe 0.0.15 → 0.0.16

data/app/views/shoppe/order_mailer/received.text.erb

@@ -8,5 +8,5 @@ We will e-mail you again when your order has been accepted.
 
 Many thanks,
 
-<%=Shoppe.config[:store_name]%>
-<%=Shoppe.config[:email_address]%>
+<%=Shoppe.settings.store_name%>
+<%=Shoppe.settings.email_address%>

data/app/views/shoppe/order_mailer/rejected.text.erb

@@ -6,5 +6,5 @@ Unfortunately, this attached order was rejected. This is most likely to our over
 
 Many thanks,
 
-<%=Shoppe.config[:store_name]%>
-<%=Shoppe.config[:email_address]%>
+<%=Shoppe.settings.store_name%>
+<%=Shoppe.settings.email_address%>

data/app/views/shoppe/order_mailer/shipped.text.erb

@@ -12,5 +12,5 @@ You can the delivery online at:
 
 Many thanks,
 
-<%=Shoppe.config[:store_name]%>
-<%=Shoppe.config[:email_address]%>
+<%=Shoppe.settings.store_name%>
+<%=Shoppe.settings.email_address%>

data/app/views/shoppe/orders/despatch_note.html.haml

@@ -0,0 +1,45 @@
+- @page_title = "Order #{@order.number}"
+
+.despatchNote
+  %header
+    %h1= Shoppe.settings.store_name
+    %h2= t('.despatch_note')
+  .address
+    %p.name= @order.delivery_name
+    %p= @order.delivery_address1
+    %p= @order.delivery_address2
+    %p= @order.delivery_address3
+    %p= @order.delivery_address4
+    %p= @order.delivery_postcode
+    %p= @order.delivery_country.try(:name)
+  
+  %table.details
+    %tr
+      %th= t('.order_number')
+      %th= t('.order_placed')
+      %th= t('.total_weight')
+      %th= t('.telephone')
+    %tr
+      %td= @order.number
+      %td= @order.received_at.to_s(:long)
+      %td= number_to_weight @order.total_weight
+      %td= @order.phone_number
+  
+  %table.items
+    %thead
+      %tr
+        %th= t('.quantity')
+        %th= t('.product')
+        %th= t('.sku')
+        %th= t('.weight')
+        %th= t('.packed?')
+    %tbody
+      - for item in @order.order_items
+        %tr
+          %td= item.quantity
+          %td= item.ordered_item.full_name
+          %td= item.ordered_item.sku
+          %td= number_to_weight item.weight
+          %td.check
+    
+  %p.footer= t('.footer', :default => "Thank you for your order!")

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

@@ -13,8 +13,8 @@
       %dd= f.text_field :id_eq
       %dt= f.label :first_name_or_last_name_or_company_cont, "Customer"
       %dd= f.text_field :first_name_or_last_name_or_company_cont
-      %dt= f.label :address1_or_address2_or_address3_or_address4_or_postcode_cont, "Address"
-      %dd= f.text_field :address1_or_address2_or_address3_or_address4_or_postcode_cont
+      %dt= f.label :address1_or_address2_or_address3_or_address4_or_postcode_cont, "Billing Address"
+      %dd= f.text_field :billing_address1_or_billing_address2_or_billing_address3_or_billing_address4_or_billing_postcode_cont
       %dt= f.label :consignment_number_cont, "Consignment Number"
       %dd= f.text_field :consignment_number_cont
       %dt= f.label :received_at_eq, "Received between"

data/app/views/shoppe/orders/show.html.haml

@@ -1,7 +1,9 @@
 - @page_title = 'Order #' + @order.number
 
 = content_for :header do
-  %p.buttons= link_to "Back to orders", :orders, :class => 'button'
+  %p.buttons
+    = link_to "Despatch Note", [:despatch_note, @order], :class => 'button', :rel => 'print'
+    = link_to "Back to orders", :orders, :class => 'button grey'
   %h2.orders Order <b>##{@order.number}</b>
 
 #order
@@ -12,14 +14,22 @@
         %dd= @order.first_name + ' ' + @order.last_name
         %dt Company
         %dd= @order.company.blank? ? '-' : @order.company
-        %dt Address
-        %dd= @order.address1
-        %dd= @order.address2
-        %dd= @order.address3
-        %dd= @order.address4
-        %dt Postcode
-        %dd= @order.postcode
-        %dd= @order.country.try(:name)
+        %dt Billing#{@order.separate_delivery_address? ? '' : '/Delivery'} Address
+        %dd= @order.billing_address1
+        %dd= @order.billing_address2
+        %dd= @order.billing_address3
+        %dd= @order.billing_address4
+        %dd= @order.billing_postcode
+        %dd= @order.billing_country.try(:name)
+        - if @order.separate_delivery_address?
+          %dt Delivery Address
+          %dd= @order.delivery_name
+          %dd= @order.delivery_address1
+          %dd= @order.delivery_address2
+          %dd= @order.delivery_address3
+          %dd= @order.delivery_address4
+          %dd= @order.delivery_postcode
+          %dd= @order.delivery_country.try(:name)
     .right
       %dl
         %dt E-Mail Address
@@ -27,7 +37,7 @@
         %dt Telephone
         %dd= @order.phone_number
         %dt Weight
-        %dd #{@order.total_weight}kg
+        %dd= number_to_weight @order.total_weight
         %dt Build Time
         %dd= distance_of_time_in_words(@order.created_at, @order.received_at)
       
@@ -98,7 +108,7 @@
             %th SKU
             %th.money Cost
             %th.money Price
-            %th.money= Shoppe.config[:tax_name]
+            %th.money= Shoppe.settings.tax_name
             %th.money Sub-Total
         %tbody
           - for item in @order.order_items

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

@@ -0,0 +1,19 @@
+- @page_title = "Settings"
+
+= content_for :header do
+  %h2.settings Settings
+
+= form_tag :url => settings_path do |f|
+
+  - Shoppe.setting_groups.each do |group, fields|
+    = field_set_tag t(group) do
+      - fields.each do |f|
+        %dl.sided
+          %dt= settings_label f
+          %dd
+            = settings_field f
+            - if v = t("shoppe.settings.help")[f]
+              %p.help= v
+        
+  %p.submit.sided
+    = submit_tag "Save Settings", :class => 'button green'

data/app/views/shoppe/user_mailer/new_password.text.erb

@@ -1,6 +1,6 @@
 Hello <%=@user.first_name%>
 
-Your new password for Shoppe on <%=Shoppe.config[:store_name]%> is: <%=@user.password%>
+Your new password for Shoppe on <%=Shoppe.settings.store_name%> is: <%=@user.password%>
 
 You can login using your e-mail address.
 

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

@@ -56,6 +56,10 @@
           = f.check_box :active
           = f.label :active, "If checked, this product will be displayed within the public store"
       %dl.half
+        %dt= f.label :default, "Default varient?"
+        %dd.checkbox
+          = f.check_box :default
+          = f.label :default, "If checked, this varient will be the default"
   
   %p.submit
     - unless @variant.new_record?

data/config/locales/en.yml

@@ -0,0 +1,34 @@
+en:
+  shoppe:
+    
+    settings:
+      
+      types:
+        # Force certain settings to certain type
+        demo_mode: boolean
+      
+      labels:
+        # Labels for fields go here
+        email_address: Store E-Mail Address
+      
+      options:
+        # Options for boolean settings
+        demo_mode:
+          affirmative: Enabled
+          negative: Disabled
+      
+      help:
+        # Help text for individual fields
+        store_name: This is the name of your store which will be used through the Shoppe admin interface as well as in the default outbound e-mail messages.
+        email_address: The e-mail address to use when sending outbound messages. Must just be an e-mail address.
+        currency_unit: The symbol to be displayed before all numbers which relate to money. Only applies to the admin interface and must be implemented separately in your base application.
+        tax_name: The name for "Tax" which will be displayed in your admin interface. Commonly replaced with VAT in European countries.
+        demo_mode: If enabled, your Shoppe admin interface will allow any users to login and will not permit changes to your users. This should be used with caution and never enabled for a production store.
+        
+      defaults:
+        store_name: Widgets Inc.
+        email_address: sales@example.com
+        currency_unit: $
+        tax_name: Tax
+        demo_mode: false
+        

data/config/routes.rb

@@ -11,6 +11,7 @@ Shoppe::Engine.routes.draw do
     post :reject, :on => :member
     post :ship, :on => :member
     post :pay, :on => :member
+    get :despatch_note, :on => :member
   end
   resources :stock_level_adjustments, :only => [:index, :create]
   resources :delivery_services do
@@ -19,6 +20,10 @@ Shoppe::Engine.routes.draw do
   resources :tax_rates
   resources :users
   resources :attachments, :only => :destroy
+
+  get 'settings'=> 'settings#edit'
+  post 'settings' => 'settings#update'
+  
   get 'login' => 'sessions#new'
   post 'login' => 'sessions#create'
   match 'login/reset' => 'sessions#reset', :via => [:get, :post]

data/db/migrate/20130926094549_create_shoppe_initial_schema.rb

@@ -1,17 +1,29 @@
 class CreateShoppeInitialSchema < ActiveRecord::Migration
   def up
-    create_table "shoppe_delivery_service_prices", force: true do |t|
+    create_table "shoppe_countries" 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" 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.decimal  "cost_price",          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.text     "country_ids"
     end
 
-    create_table "shoppe_delivery_services", force: true do |t|
+    create_table "shoppe_delivery_services" do |t|
       t.string   "name"
       t.string   "code"
       t.boolean  "default",      default: false
@@ -22,28 +34,31 @@ class CreateShoppeInitialSchema < ActiveRecord::Migration
       t.string   "tracking_url"
     end
 
-    create_table "shoppe_order_items", force: true do |t|
+    create_table "shoppe_order_items" 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.string   "ordered_item_type"
+      t.integer  "quantity",                                  default: 1
+      t.decimal  "unit_price",        precision: 8, scale: 2
+      t.decimal  "unit_cost_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"
     end
 
-    create_table "shoppe_orders", force: true do |t|
+    create_table "shoppe_orders" do |t|
       t.string   "token"
       t.string   "first_name"
       t.string   "last_name"
       t.string   "company"
-      t.string   "address1"
-      t.string   "address2"
-      t.string   "address3"
-      t.string   "address4"
-      t.string   "postcode"
+      t.string   "billing_address1"
+      t.string   "billing_address2"
+      t.string   "billing_address3"
+      t.string   "billing_address4"
+      t.string   "billing_postcode"
+      t.integer  "billing_country_id"
       t.string   "email_address"
       t.string   "phone_number"
       t.string   "status"
@@ -53,9 +68,10 @@ class CreateShoppeInitialSchema < ActiveRecord::Migration
       t.datetime "created_at"
       t.datetime "updated_at"
       t.integer  "delivery_service_id"
-      t.decimal  "delivery_price",      precision: 8, scale: 2
-      t.decimal  "delivery_tax_rate",   precision: 8, scale: 2
-      t.decimal  "delivery_tax_amount", precision: 8, scale: 2
+      t.decimal  "delivery_price",            precision: 8, scale: 2
+      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"
@@ -63,12 +79,31 @@ class CreateShoppeInitialSchema < ActiveRecord::Migration
       t.datetime "rejected_at"
       t.integer  "rejected_by"
       t.string   "ip_address"
-      t.string   "country"
       t.string   "payment_reference"
       t.string   "payment_method"
+      t.text     "notes"
+      t.boolean  "separate_delivery_address",                         default: false
+      t.string   "delivery_name"
+      t.string   "delivery_address1"
+      t.string   "delivery_address2"
+      t.string   "delivery_address3"
+      t.string   "delivery_address4"
+      t.string   "deilvery_postcode"
+      t.integer  "delivery_country_id"
     end
 
-    create_table "shoppe_product_categories", force: true do |t|
+    create_table "shoppe_product_attributes" do |t|
+      t.integer  "product_id"
+      t.string   "key"
+      t.string   "value"
+      t.integer  "position",   default: 1
+      t.boolean  "searchable", default: true
+      t.datetime "created_at"
+      t.datetime "updated_at"
+      t.boolean  "public",     default: true
+    end
+
+    create_table "shoppe_product_categories" do |t|
       t.string   "name"
       t.string   "permalink"
       t.text     "description"
@@ -76,9 +111,10 @@ class CreateShoppeInitialSchema < ActiveRecord::Migration
       t.datetime "updated_at"
     end
 
-    create_table "shoppe_products", force: true do |t|
+    create_table "shoppe_products" 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"
@@ -86,15 +122,42 @@ class CreateShoppeInitialSchema < ActiveRecord::Migration
       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  "stock",                                       default: 0
+      t.decimal  "cost_price",          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
       t.text     "in_the_box"
+      t.boolean  "stock_control",                               default: true
+      t.boolean  "default",                                     default: false
+    end
+
+    create_table "shoppe_settings" do |t|
+      t.string "key"
+      t.string "value"
+      t.string "value_type"
     end
 
-    create_table "shoppe_users", force: true do |t|
+    create_table "shoppe_stock_level_adjustments" do |t|
+      t.integer  "item_id"
+      t.string   "item_type"
+      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_tax_rates" 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" do |t|
       t.string   "first_name"
       t.string   "last_name"
       t.string   "email_address"
@@ -105,12 +168,8 @@ class CreateShoppeInitialSchema < ActiveRecord::Migration
   end
   
   def down
-    drop_table :shoppe_delivery_service_prices
-    drop_table :shoppe_delivery_services
-    drop_table :shoppe_order_items
-    drop_table :shoppe_orders
-    drop_table :shoppe_product_categories
-    drop_table :shoppe_products
-    drop_table :shoppe_users
+    [:users, :tax_rates, :stock_level_adjustments, :settings, :products, :product_categories, :product_attributes, :orders, :order_items, :delivery_services, :delivery_service_prices, :countries].each do |table|
+      drop_table "shoppe_#{table}"
+    end
   end
 end

data/db/seeds.rb

@@ -101,7 +101,7 @@ 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 = pro.variants.create(:name => "White/Grey", :sku => "SM-870-GREY", :price => 230.00, :cost_price => 220, :tax_rate => tax_rate, :weight => 1.35, :default => true)
 v1.default_image_file = get_file('snom-870-grey.jpg')
 v1.save!
 v1.stock_level_adjustments.create(:description => 'Initial Stock', :adjustment => 4)

data/lib/shoppe.rb

@@ -1,3 +1,6 @@
+require "coffee-rails"
+require "sass-rails"
+require "jquery-rails"
 require 'haml'
 require 'bcrypt'
 require 'dynamic_form'
@@ -14,51 +17,26 @@ module Shoppe
   class Error < StandardError; end
   
   class << self
+    
     def root
       File.expand_path('../../', __FILE__)
     end
     
-    def config
-      @config ||= begin
-        path = Rails.root.join('config', 'shoppe.yml')
-        if File.exist?(path)
-          config = YAML.load_file(path).with_indifferent_access
-          setup_config(config)
-          config
-        else
-          raise InvalidConfiguration, "Shoppe configuration file missing at #{path}"
-        end
-      end
+    def settings
+      Thread.current[:shoppe_settings] ||= Shoppe::Settings.new(Shoppe::Setting.to_hash)
     end
     
-    def setup_config(config)
-      ActionMailer::Base.smtp_settings = config[:smtp_settings] if config[:smtp_settings]
+    def reset_settings
+      Thread.current[:shoppe_settings] = nil
     end
     
-    def validate_live_config(*requirements)
-      validate_config(self.config, [], *requirements)
+    def add_setting_group(group, fields = [])
+      setting_groups[group]  ||= []
+      setting_groups[group]    = setting_groups[group] | fields
     end
     
-    def validate_config(config, scope, *requirements)
-      for req in requirements
-        case req
-        when String, Symbol
-          unless config.keys.include?(req.to_s)
-            raise Shoppe::Errors::InvalidConfiguration, "Missing configuration option '#{scope.join('.')}.#{req}' in shoppe.yml"
-          end
-        when Array
-          validate_config(config, scope, *req)
-        when Hash
-          req.each do |key, value|
-            if config[key] && config[key].is_a?(Hash)
-              scope << key
-              validate_config(config[key], scope, *value)
-            else
-              validate_config(config, scope, key)
-            end
-          end
-        end
-      end
+    def setting_groups
+      @setting_groups ||= {}
     end
     
   end