shoppe 0.0.18 → 0.0.19

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: a08927371decda213891d9e76774821d35ead258
-  data.tar.gz: 1e0867ff99e0b3ad7793e8cf087167ce4a619932
+  metadata.gz: a4a6a283ee7752cb07086b2e0d773f9d9b41a579
+  data.tar.gz: 2fafdc5e4fc48385e9f67f6392dca0c7694a61df
 SHA512:
-  metadata.gz: 5bd5a7b0f46593eae97db8af9ac06215859c360aae9c0bc8a2de22d6f1c9b40c3dfb2da9769c3e18f9c248df255160da56aa9f0b7506a95b304dc29bbee22b22
-  data.tar.gz: 7df780d5472b0900b4b2d0164c7dd6dfb267cfcbda20e6d51c8dd82f2aa551fb182b31f481b8eeb6b3ba59c2f49a69d0f874f29641e7fc19169a050f826e6376
+  metadata.gz: d519ec68770b5fc88f9d75d13f112877ed91f72899f87dc4ac03131b2265410d7f0bba5ae4d90f800ecc5c86c695a9de9caabce98bdacd186bceecfec68fe3fe
+  data.tar.gz: acf90329031a180edc5cc62c331535115357c41bac154476bdce5898409785c1b498fa25f94e724d2733983a3bfac60fe12be19d4d2463fc1887160c533d8655

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

@@ -81,6 +81,7 @@ header.main {
 	h2.delivery_services { background-image:image-url('shoppe/icons/box.svg'); background-position: 0 3px; background-size:20px;}
 	h2.tax_rates { background-image:image-url('shoppe/icons/currency.svg'); background-position: 0 2px; background-size:22px;}
 	h2.users { background-image:image-url('shoppe/icons/id.svg'); background-position: 0 2px; background-size:22px;}
+	h2.countries { background-image:image-url('shoppe/icons/globe.svg'); background-position: 0 2px; background-size:22px;}
 	h2.settings { background-image:image-url('shoppe/icons/toolbox.svg'); background-position: 0 2px; background-size:22px;}
 
 }

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

@@ -46,9 +46,10 @@ html.login {
 		padding:25px;
 		line-height:1.5;
 		font-size:0.9em;
-		font-weight:500;
 		text-align:center;
+		h2 { color:#C17391; text-transform:uppercase; font-size:0.8em; margin-bottom:15px;}
 		p.back { margin-top:25px;}
+		p.message { font-size:1.1em;}
   }
 	
   //

data/app/controllers/shoppe/countries_controller.rb

@@ -0,0 +1,47 @@
+module Shoppe
+  class CountriesController < Shoppe::ApplicationController
+  
+    before_filter { @active_nav = :countries }
+    before_filter { params[:id] && @country = Shoppe::Country.find(params[:id]) }
+  
+    def index
+      @countries = Shoppe::Country.ordered
+    end
+  
+    def new
+      @country = Shoppe::Country.new
+    end
+  
+    def create
+      @country = Shoppe::Country.new(safe_params)
+      if @country.save
+        redirect_to :countries, :flash => {:notice => "Country has been created successfully"}
+      else
+        render :action => "new"
+      end
+    end
+  
+    def edit
+    end
+  
+    def update
+      if @country.update(safe_params)
+        redirect_to [:edit, @country], :flash => {:notice => "Country has been updated successfully"}
+      else
+        render :action => "edit"
+      end
+    end
+  
+    def destroy
+      @country.destroy
+      redirect_to :countries, :flash => {:notice => "Country has been removed successfully"}
+    end
+  
+    private
+  
+    def safe_params
+      params[:country].permit(:name, :code2, :code3, :continent, :tld, :currency, :eu_member)
+    end
+  
+  end
+end

data/app/controllers/shoppe/orders_controller.rb

@@ -29,11 +29,15 @@ module Shoppe
     def accept
       @order.accept!(current_user)
       redirect_to @order, :notice => "Order has been accepted successfully"
+    rescue Shoppe::Errors::PaymentDeclined => e
+      redirect_to @order, :alert => e.message
     end
   
     def reject
       @order.reject!(current_user)
       redirect_to @order, :notice => "Order has been rejected successfully"
+    rescue Shoppe::Errors::PaymentDeclined => e
+      redirect_to @order, :alert => e.message
     end
   
     def ship

data/app/models/shoppe/order.rb

@@ -85,7 +85,7 @@ module Shoppe
     end
   
     def self.ransackable_associations(auth_object = nil)
-      ['products']
+      []
     end
   
   end

data/app/models/shoppe/order/actions.rb

@@ -52,13 +52,15 @@ module Shoppe
     #
     # @param user [Shoppe::User] the user who carried out this action    
     def accept!(user)
-      run_callbacks :acceptance do
-        self.accepted_at = Time.now
-        self.accepted_by = user.id
-        self.status = 'accepted'
-        self.save!
-        self.order_items.each(&:accept!)
-        Shoppe::OrderMailer.accepted(self).deliver
+      transaction do
+        run_callbacks :acceptance do
+          self.accepted_at = Time.now
+          self.accepted_by = user.id
+          self.status = 'accepted'
+          self.save!
+          self.order_items.each(&:accept!)
+          Shoppe::OrderMailer.accepted(self).deliver
+        end
       end
     end
   
@@ -66,13 +68,15 @@ module Shoppe
     #
     # @param user [Shoppe::User] the user who carried out the action
     def reject!(user)
-      run_callbacks :rejection do
-        self.rejected_at = Time.now
-        self.rejected_by = user.id
-        self.status = 'rejected'
-        self.save!
-        self.order_items.each(&:reject!)
-        Shoppe::OrderMailer.rejected(self).deliver
+      transaction do
+        run_callbacks :rejection do
+          self.rejected_at = Time.now
+          self.rejected_by = user.id
+          self.status = 'rejected'
+          self.save!
+          self.order_items.each(&:reject!)
+          Shoppe::OrderMailer.rejected(self).deliver
+        end
       end
     end
     

data/app/models/shoppe/order/delivery.rb

@@ -29,15 +29,22 @@ module Shoppe
       order.validates :delivery_country, :presence => true
     end
     validate do
-      unless available_delivery_services.include?(self.delivery_service)
-        errors.add :delivery_service_id, "is not suitable for this order"
+      if self.delivery_required?
+        if self.delivery_service.nil?
+          errors.add :delivery_service_id, "must be specified"
+          return
+        end
+        
+        if self.delivery_service && !available_delivery_services.include?(self.delivery_service)
+          errors.add :delivery_service_id, "is not suitable for this order"
+        end
       end
     end
     
     before_confirmation do
       # Ensure that before we confirm the order that the delivery service which has been selected
       # is appropritae for the contents of the order.
-      unless self.valid_delivery_service?
+      if self.delivery_required? && !self.valid_delivery_service?
         raise Shoppe::Errors::InappropriateDeliveryService, :order => self
       end
       
@@ -86,6 +93,13 @@ module Shoppe
       order_items.inject(BigDecimal(0)) { |t,i| t + i.weight}
     end
     
+    # Is delivery required for this order?
+    #
+    # @return [Boolean]
+    def delivery_required?
+      total_weight > BigDecimal(0)
+    end
+    
     # An array of all the delivery services which are suitable for this order in it's
     # current state (based on its current weight)
     #
@@ -101,9 +115,13 @@ module Shoppe
     # @return [Array] an array of Shoppe:DeliveryServicePrice objects
     def delivery_service_prices
       @delivery_service_prices ||= begin
-        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.delivery_country) }
-        prices
+        if delivery_required?
+          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.delivery_country) }
+          prices
+        else
+          []
+        end
       end
     end
 

data/app/models/shoppe/order_item.rb

@@ -6,7 +6,7 @@ module Shoppe
     # The associated order
     #
     # @return [Shoppe::Order]
-    belongs_to :order, :class_name => 'Shoppe::Order'
+    belongs_to :order, :class_name => 'Shoppe::Order', :touch => true
     
     # The item which has been ordered
     belongs_to :ordered_item, :polymorphic => true

data/app/models/shoppe/product.rb

@@ -91,14 +91,6 @@ module Shoppe
       @stock ||= self.stock_level_adjustments.sum(:adjustment)
     end
   
-    def self.ransackable_attributes(auth_object = nil)
-      ["id", "name", "sku"] + _ransackers.keys
-    end
-  
-    def self.ransackable_associations(auth_object = nil)
-      []
-    end
-  
     # Search for products which include the guven attributes and return an active record
     # scope of these products. Chainable with other scopes and with_attributes methods.
     # For example:

data/app/models/shoppe/tax_rate.rb

@@ -22,6 +22,9 @@ module Shoppe
     # All tax rates ordered by their ID
     scope :ordered, -> { order("shoppe_tax_rates.id")}
     
+    # Set the address type if appropriate
+    before_validation { self.address_type = ADDRESS_TYPES.first if self.address_type.blank? }
+    
     # A description of the tax rate including its name & percentage
     #
     # @return [String]

data/app/views/layouts/shoppe/application.html.haml

@@ -21,6 +21,7 @@
         %li= link_to "Delivery Services", [:delivery_services], :class => @active_nav == :delivery_services ? 'active' : ''
         %li= link_to "Tax Rates", :tax_rates, :class => @active_nav == :tax_rates ? 'active' : ''
         %li= link_to "Users", [:users], :class => @active_nav == :users ? 'active' : ''
+        %li= link_to "Countries", :countries, :class => @active_nav == :countries ? 'active' : ''
         %li= link_to "Settings", :settings, :class => @active_nav == :settings ? 'active' : ''
         %li= link_to "Logout", [:logout], :method => :delete
     

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

@@ -0,0 +1,31 @@
+= form_for @country do |f|
+  = f.error_messages
+  = field_set_tag "User Details" do
+    .splitContainer
+      %dl.third
+        %dt= f.label :name
+        %dd= f.text_field :name, :class => 'focus text'
+      %dl.third
+        %dt= f.label :code2, "ISO 3166-alpha-2"
+        %dd= f.text_field :code2, :class => 'text'
+      %dl.third
+        %dt= f.label :code3, "ISO 3166-alpha-3"
+        %dd= f.text_field :code3, :class => 'text'
+    .splitContainer
+      %dl.third
+        %dt= f.label :continent
+        %dd= f.text_field :continent, :class => 'text'
+      %dl.third
+        %dt= f.label :tld, "TLD"
+        %dd= f.text_field :tld, :class => 'text'
+      %dl.third
+        %dt= f.label :eu_member, "EU Member?"
+        %dd.checkbox
+          = f.check_box :eu_member
+          = f.label :eu_member, 'Country is an EU member?'
+
+  %p.submit
+    - unless @country.new_record?
+      %span.right= link_to "Delete", @country, :class => 'button purple', :method => :delete, :data => {:confirm => "Are you sure you wish to remove this country?"}
+    = f.submit :class => 'button green'
+    = link_to "Cancel", :countries, :class => 'button'

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

@@ -0,0 +1,5 @@
+- @page_title = "Countries"
+= content_for :header do
+  %p.buttons= link_to "Back to countries", :countries, :class => 'button'
+  %h2.countries Countries
+= render 'form'

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

@@ -0,0 +1,25 @@
+- @page_title = "Countries"
+
+= content_for :header do
+  %p.buttons=link_to "New country", :new_country, :class => 'button green'
+  %h2.countries Countries
+
+.table
+  %table.data
+    %thead
+      %tr
+        %th Name
+        %th ISO 3166-1-alpha-2
+        %th ISO 3166-1-alpha-3
+        %th Continent
+        %th TLD
+        %th EU?
+    %tbody
+      - for country in @countries
+        %tr
+          %td= link_to country.name, [:edit, country]
+          %td= country.code2
+          %td= country.code3
+          %td= country.continent
+          %td= country.tld
+          %td= boolean_tag country.eu_member?

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

@@ -0,0 +1,5 @@
+- @page_title = "Countries"
+= content_for :header do
+  %p.buttons= link_to "Back to countries", :countries, :class => 'button'
+  %h2.countries Countries
+= render 'form'

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

@@ -0,0 +1,51 @@
+.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'

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

@@ -0,0 +1,38 @@
+.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

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

@@ -0,0 +1,15 @@
+= 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'

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

@@ -0,0 +1,37 @@
+- 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
+                - if payment.parent_payment_id
+                  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...