shoppe 0.0.18 → 0.0.19

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

@@ -0,0 +1,24 @@
+.orderSearch{:style => action_name == 'search' ? "display:block" : ''}
+  = search_form_for @query, :url => search_orders_path, :html => { :method => :post } do |f|
+    %dl.left
+      %dt= f.label :id_eq, "Order Number"
+      %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, "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"
+      %dd
+        = f.text_field :received_at_gteq, :class => 'small'
+        →
+        = f.text_field :received_at_lteq, :class => 'small'
+    %dl.right
+      %dt= f.label :email_address_cont, "E-Mail Address"
+      %dd= f.text_field :email_address_cont
+      %dt= f.label :phone_number_cont, "Phone Number"
+      %dd= f.text_field :phone_number_cont
+      %dt= f.label :status_eq, "Status"
+      %dd= f.select :status_eq, [nil] + Shoppe::Order::STATUSES.map { |s| [s.humanize, s]}
+      %dd= f.submit "Search", :class => 'button green button'

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

@@ -0,0 +1,25 @@
+.status-bar
+  %ul
+    - if @order.received?
+      %li.received
+        %h4 Order Received
+        %p on #{@order.received_at.to_s(:short)} from #{@order.ip_address}
+
+    - if @order.accepted?
+      %li.accepted
+        %h4 Order Accepted
+        %p on #{@order.accepted_at.to_s(:short)} by #{@order.accepter.try(:short_name) || 'Unknown'}
+        
+    - elsif @order.rejected?
+      %li.rejected
+        %h4 Order rejected
+        %p on #{@order.rejected_at.to_s(:short)} by #{@order.rejecter.try(:short_name) || 'Unknown'}
+
+    - if @order.shipped?
+      %li.shipped
+        %h4 Order Shipped
+        %p on #{@order.shipped_at.to_s(:short)} by #{@order.shipper.try(:short_name) || 'Unknown'}
+        - if @order.courier_tracking_url
+          %p= link_to "Tracking URL", @order.courier_tracking_url
+        - else
+          %p Consignment # <b>#{@order.consignment_number}</b>

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

@@ -5,33 +5,8 @@
   %h2.orders
     Orders
     %span= page_entries_info @orders
-  
-.orderSearch{:style => action_name == 'search' ? "display:block" : ''}
-  = search_form_for @query, :url => search_orders_path, :html => { :method => :post } do |f|
-    %dl.left
-      %dt= f.label :id_eq, "Order Number"
-      %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, "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"
-      %dd
-        = f.text_field :received_at_gteq, :class => 'small'
-        →
-        = f.text_field :received_at_lteq, :class => 'small'
-    %dl.right
-      %dt= f.label :products_name_cont, "Contains product"
-      %dd= f.text_field :products_name_cont
-      %dt= f.label :email_address_cont, "E-Mail Address"
-      %dd= f.text_field :email_address_cont
-      %dt= f.label :phone_number_cont, "Phone Number"
-      %dd= f.text_field :phone_number_cont
-      %dt= f.label :status_eq, "Status"
-      %dd= f.select :status_eq, [nil] + Shoppe::Order::STATUSES.map { |s| [s.humanize, s]}
-      %dd= f.submit "Search", :class => 'button green button'
+
+= render 'search_form'
 
 .table
   %table.data

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

@@ -8,175 +8,12 @@
   %h2.orders Order <b>##{@order.number}</b>
 
 #order
-  .details
-    .left
-      %dl
-        %dt Name
-        %dd= @order.first_name + ' ' + @order.last_name
-        %dt Company
-        %dd= @order.company.blank? ? '-' : @order.company
-        %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
-        %dd= mail_to @order.email_address
-        %dt Telephone
-        %dd= @order.phone_number
-        %dt Weight
-        %dd= number_to_weight @order.total_weight
-        %dt Build Time
-        %dd= distance_of_time_in_words(@order.created_at, @order.received_at)
-        - if @order.invoiced?
-          %dt Invoice Number
-          %dd= @order.invoice_number
-        %dt Order Balance
-        %dd= boolean_tag @order.paid_in_full?, nil, :true_text => number_to_currency(@order.balance), :false_text => number_to_currency(@order.balance)
-      - if @order.accepted? && !@order.shipped?
-        = form_tag [:ship, @order] do
-          %dl.form
-            %dt.padding= label_tag 'consignment_number', 'Consignment Number'
-            %dd= text_field_tag 'consignment_number', '', :class => 'text'
-          %dl.form
-            %dd= submit_tag "Mark as shipped", :class => 'button green button-mini'
-      
-      - unless @order.accepted? || @order.rejected?
-        %dl.form
-          %dd
-            = link_to "Accept", [:accept, @order], :method => :post, :class => 'button green'
-            = link_to "Reject", [:reject, @order], :method => :post, :class => 'button purple'
-  
-  .status-bar
-    %ul
-      - if @order.received?
-        %li.received
-          %h4 Order Received
-          %p on #{@order.received_at.to_s(:short)} from #{@order.ip_address}
+  = render 'order_details'
+  = render 'status_bar'
 
-      - if @order.accepted?
-        %li.accepted
-          %h4 Order Accepted
-          %p on #{@order.accepted_at.to_s(:short)} by #{@order.accepter.try(:short_name) || 'Unknown'}
-          
-      - elsif @order.rejected?
-        %li.rejected
-          %h4 Order rejected
-          %p on #{@order.rejected_at.to_s(:short)} by #{@order.rejecter.try(:short_name) || 'Unknown'}
-
-      - if @order.shipped?
-        %li.shipped
-          %h4 Order Shipped
-          %p on #{@order.shipped_at.to_s(:short)} by #{@order.shipper.try(:short_name) || 'Unknown'}
-          - if @order.courier_tracking_url
-            %p= link_to "Tracking URL", @order.courier_tracking_url
-          - else
-            %p Consignment # <b>#{@order.consignment_number}</b>
-  
   = field_set_tag "Order Items", :class => 'padded' do
-    .order_items
-      .table
-        %table.data
-          %thead
-            %tr
-              %th.qty Qty
-              %th Item
-              %th SKU
-              %th.money Cost
-              %th.money Price
-              %th.money= Shoppe.settings.tax_name
-              %th.money Sub-Total
-          %tbody
-            - for item in @order.order_items
-              %tr
-                %td.qty= item.quantity
-                %td.product= item.ordered_item.full_name
-                %td.sku= item.ordered_item.sku
-                %td.money= number_to_currency item.total_cost
-                %td.money= number_to_currency item.sub_total
-                %td.money= number_to_currency item.tax_amount
-                %td.money= number_to_currency item.total
-            - if @order.delivery_service
-              %td.qty
-              %td.product= link_to @order.delivery_service.name, [:edit, @order.delivery_service]
-              %td.sku
-              %td.money= number_to_currency @order.delivery_cost_price
-              %td.money= number_to_currency @order.delivery_price
-              %td.money= number_to_currency @order.delivery_tax_amount
-              %td.money= number_to_currency @order.delivery_price + @order.delivery_tax_amount
-          %tfoot
-            %tr
-              %td.qty= @order.total_items
-              %td{:colspan => 2}
-              %td.money= number_to_currency @order.total_cost
-              %td.money= number_to_currency @order.total_before_tax
-              %td.money= number_to_currency @order.tax
-              %td.money= number_to_currency @order.total
+    = render 'order_items'
 
   = field_set_tag "Payments", :class => 'padded orderPayments' do
-    - unless @payments.empty?
-      .table
-        %table.data
-          %thead
-            %tr
-              %th ID
-              %th Type
-              %th Method
-              %th Reference
-              %th Amount
-              %th Refunded?
-              %th
-          %tbody
-            - for payment in @payments
-              %tr
-                %td= payment.id
-                %td
-                  = payment.refund? ? 'Refund' : 'Payment'
-                  %span.float-right= boolean_tag payment.confirmed?
-                %td= payment.method
-                %td= link_to_if payment.transaction_url, payment.reference, payment.transaction_url
-                
-                - if payment.refund?
-                  %td{:colspan => 2}
-                    %b= number_to_currency payment.amount
-                    from payment ##{payment.parent_payment_id}
-                - else
-                  %td= number_to_currency payment.amount
-                  %td= boolean_tag payment.refunded?, nil, :true_text => number_to_currency(payment.amount_refunded)
-                %td.refund
-                  - if payment.refundable?
-                    = link_to "Refund", [:refund, @order, payment], :class => 'button purple button-mini', :rel => 'dialog'
-                  - else
-                    = link_to "Delete", [@order, payment], :class => 'button purple button-mini', :data => {:confirm => "Are you sure you wish to remove this payment?"}, :method => :delete
-    - else
-      %p.notice There are no payments recorded for this order...
-      
-    = form_for [@order, Shoppe::Payment.new(:amount => @order.balance)] do |f|
-      %dl.text
-        %dt= f.label :method
-        %dd= f.text_field :method, :class => 'text'
-      %dl.text
-        %dt= f.label :reference
-        %dd= f.text_field :reference, :class => 'text'
-      %dl.amount
-        %dt= f.label :amount
-        %dd
-          .moneyInput
-            .currency= Shoppe.settings.currency_unit.html_safe
-            = f.text_field :amount, :class => 'text'
-      %dl.submit
-        %dd= f.submit "Add Payment", :class => 'button green'
-        
+    = render 'payments_table'
+    = render 'payments_form'

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

@@ -1,4 +1,6 @@
+- @page_title = "Error"
 = display_flash
 .error
-  %p= @exception.message
+  %h2 An error has occurred
+  %p.message= @exception.message
   %p.back= link_to "← Back to Shoppe".html_safe, root_path, :class => 'button'

data/config/routes.rb

@@ -21,6 +21,7 @@ Shoppe::Engine.routes.draw do
   end
   resources :tax_rates
   resources :users
+  resources :countries
   resources :attachments, :only => :destroy
 
   get 'settings'=> 'settings#edit'

data/db/seeds.rb

@@ -1,36 +1,20 @@
 # encoding: UTF-8
 
 # tax rates
-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))
+tax_rate = Shoppe::TaxRate.create!(:name => "Standard VAT", :rate => 20.0)
+exempt_tax = Shoppe::TaxRate.create!(:name => "Exempt VAT", :rate => 0.0)
 
 # 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!(: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 => "Next Day Delivery", :code => 'ND16', :courier => 'AnyCourier', :tracking_url => 'http://trackingurl.com/track/{{consignment_number}}')
+ds.delivery_service_prices.create!(:code => 'Parcel', :min_weight => 0, :max_weight => 1, :price => 5.0, :cost_price => 4.50, :tax_rate => tax_rate)
+ds.delivery_service_prices.create!(:code => 'Parcel', :min_weight => 1, :max_weight => 5, :price => 8.0, :cost_price => 7.5, :tax_rate => tax_rate)
+ds.delivery_service_prices.create!(:code => 'Parcel', :min_weight => 5, :max_weight => 20, :price => 10.0, :cost_price => 9.50, :tax_rate => tax_rate)
 
-
-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!(: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!(: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!(: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!(: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))
+ds = Shoppe::DeliveryService.create!(:name => "Saturday Delivery", :code => 'NDSA16', :courier => 'AnyCourier', :tracking_url => 'http://trackingurl.com/track/{{consignment_number}}')
+ds.delivery_service_prices.create!(:code => 'Parcel', :min_weight => 0, :max_weight => 1, :price => 27.0, :cost_price => 24.00, :tax_rate => tax_rate)
+ds.delivery_service_prices.create!(:code => 'Parcel', :min_weight => 1, :max_weight => 5, :price => 29.0, :cost_price => 20.00, :tax_rate => tax_rate)
+ds.delivery_service_prices.create!(:code => 'Parcel', :min_weight => 5, :max_weight => 20, :price => 37.0, :cost_price => 32.00,:tax_rate => tax_rate)
 
 # categories
 cat1 = Shoppe::ProductCategory.create!(:name => 'VoIP Phones')

data/lib/shoppe.rb

@@ -13,11 +13,6 @@ require 'nifty/attachments'
 require 'nifty/dialog'
 
 module Shoppe
-  
-  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

data/lib/shoppe/error.rb

@@ -0,0 +1,21 @@
+module Shoppe
+  class Error < StandardError
+
+    def initialize(options = {})
+      if options.is_a?(String)
+        @options = {:message => options}
+      else
+        @options = options
+      end
+    end
+    
+    def message
+      @options[:message]
+    end
+    
+    def options
+      @options
+    end
+    
+  end  
+end

data/lib/shoppe/errors/inappropriate_delivery_service.rb

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

data/lib/shoppe/errors/insufficient_stock_to_fulfil.rb

@@ -2,10 +2,6 @@ module Shoppe
   module Errors
     class InsufficientStockToFulfil < Error
       
-      def initialize(options)
-        @options = options
-      end
-      
       def order
         @options[:order]
       end

data/lib/shoppe/errors/not_enough_stock.rb

@@ -2,10 +2,6 @@ module Shoppe
   module Errors
     class NotEnoughStock < Error
       
-      def initialize(options)
-        @options = options
-      end
-      
       def available_stock
         @options[:ordered_item].stock
       end

data/lib/shoppe/errors/payment_declined.rb

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

data/lib/shoppe/errors/refund_failed.rb

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

data/lib/shoppe/errors/unorderable_item.rb

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