radiant-shop-extension 0.90.4 → 0.91.2

data/VERSION

@@ -1 +1 @@
-0.90.4
+0.91.2

data/app/models/form_address.rb

@@ -18,28 +18,18 @@ class FormAddress
   
   def create_result_object
     @result = {
-      :order    => @order.id, # We return the order id so the thank you screen has access to it
+      :order    => @order.id,
       :billing  => nil,
       :shipping => nil
     }
   end
   
-  # Assigns a shipping and billing address to the @order
   def create_order_addresses
     if billing?
-      # We're going to create a billing object
       create_order_billing_address
-      
-      # We're going to assign shipping to billing because they didn't send shipping
-      if !shipping.present? and @billing.id
-        @shipping = @billing
-        @order.update_attribute(:shipping, @shipping)
-      end
     end
     
-    if shipping?
-      create_order_shipping_address
-    end
+    create_order_shipping_address
     
     unless (@billing.present? and @billing.valid?) and (@shipping.present? and @shipping.valid?)
       @form.redirect_to = :back
@@ -49,77 +39,41 @@ class FormAddress
     @result[:shipping] = (@shipping.valid? ? @shipping.id : false) rescue false
   end
   
-  # Attaches a billing address to the order (and current customer)
   def create_order_billing_address
-    
-    # Billing Address
-    if billing[:id] and current_customer.present?
-      begin
-        # Use an existing Address and update its values
-        @billing = current_customer.billings.find(billing[:id])
-        @billing.update_attributes(billing)
-        @order.update_attribute(:billing, @billing)
-      rescue
-        # We cant find that address for that user
-      end
-      
-    elsif @order.billing.present?
-      
-      # Use the current billing and update its values
+    if @order.billing.present?
       @billing = @order.billing
       @billing.update_attributes(billing)
     
     else
-      # Create a new address with these attributes
-      @billing = ShopAddress.new(billing)
+      @billing = ShopBilling.new(billing)
       if @billing.save
         @order.update_attribute(:billing, @billing)
       end
+      
     end
-    
   end
   
-  # Attaches a shipping address to the order (and current customer)
   def create_order_shipping_address
-    # Shipping Address
-    
-    if shipping[:id]
-      # Use an existing Address and update its values
-      begin
-        @shipping = current_customer.shippings.find(shipping[:id])
-        if @shipping == @billing and shipping == billing
-          # We have exactly the same shipping and billing data
-          @shipping = @billing
-          @order.update_attribute(:shipping, @billing)
-          
-        elsif (shipping.reject!{|k,v| k == :id }).values.all?(&:blank?)
-          # We have just passed the id and not the data
+    if shipping?
+      if @order.shipping.present?
+        @shipping = @order.shipping
+        @shipping.update_attributes(shipping)
+        
+      else
+        @shipping = ShopShipping.new(shipping)
+        if @shipping.save
           @order.update_attribute(:shipping, @shipping)
-          
-        elsif @shipping == @billing and shipping != billing
-          # We have conflicting data so create a new address
-          # the id is rejected so we'll get a new address
-          @order.update_attributes({ :shipping_attributes => shipping })
-          @shipping = @order.shipping
         end
-      rescue
-        # We cant find that address for that customer
+        
       end
-      
-    elsif @order.shipping.present?
-      # Use the current shipping and update its values
-      @shipping = @order.shipping
-      @shipping.update_attributes(shipping)
-      
-    elsif shipping.values.all?(&:blank?) or shipping == billing
-      # We haven't set a shipping, or we have copied billing, so use billing
-      @shipping = @billing
-      @order.update_attribute(:shipping, @billing)
-      
     else
-      # Create a new address with these attributes
-      @order.update_attributes({ :shipping_attributes => shipping })
-      @shipping = @order.shipping
+      if @order.shipping.nil?
+        @shipping = ShopShipping.new(@billing.attributes) 
+        if @shipping.save
+          @order.update_attribute(:shipping, @shipping)
+        end
+      end
+      
     end
   end
   

data/app/models/form_checkout.rb

@@ -4,7 +4,7 @@ class FormCheckout
   
   attr_accessor :config, :data, :result, :gateway, :card
   
-  def create
+  def create    
     find_current_order # locate the @order object
     
     create_result_object # A default response object
@@ -27,43 +27,39 @@ class FormCheckout
   end
   
   def create_order_payments
-    if @order.billing.present?
-      if gateway.present?
+    success_redirect = @form.redirect_to
+    @form.redirect_to = :back
+    
+    unless @order.billing.present?
+      @result[:message] = "Billing Address has not been set"
+      return false
+    end
+    
+    unless gateway.present?
+      @result[:message] = "Payment gateway has not been configured" 
+      return false
+    end
         
-        prepare_gateway # Create the @gateway object
+    unless prepare_gateway # Create the @gateway object
+      @result[:message] = "The Payment Gateway '#{gateway_name}' doesn't exist to ActiveMerchant"
+      return false
+    end
+    
+    unless card.present?
+      @result[:message] = "Credit card details were not sent"
+      return false
+    end
         
-        if @result[:gateway]
-          
-          if card.present?
-            
-            prepare_credit_card # Create the @card object
-            
-            if @result[:card]
-              
-              if purchase.success?            
-                finalize_checkout # We have a paid for order with a billing address
-                @result[:message] = "Order successfully processed"
-              end
-              
-            else
-              @result[:message] = @card.errors.full_messages.to_sentence
-            end
-            
-          else
-            @result[:message] = "Credit card details were not sent"
-          end
-        else
-          @result[:message] = "The Payment Gateway '#{gateway_name}' doesn't exist to ActiveMerchant"
-        end
-      else
-        @result[:message] = "Payment gateway has not been configured"
-      end
-    else
-      @result[:message] = "Billing Address has not been set"
+    unless prepare_credit_card # Create the @card object
+      @result[:message] = @card.errors.full_messages.to_sentence
+      return false
     end
     
-    # If the payment wasn't successful redirect back
-    @form.redirect_to = @result[:payment] ? @form.redirect_to : :back 
+    if purchase
+      create_payment    
+      finalize_checkout
+      @form.redirect_to = success_redirect
+    end
   end
   
   # Creates a gateway instance variable based off the form configuration
@@ -73,6 +69,7 @@ class FormCheckout
       @gateway = ActiveMerchant::Billing.const_get("#{gateway_name}Gateway").new(gateway_credentials)
       @result[:gateway] = true
     end
+    @result[:gateway]
   end
   
   # Creates a payment object attached to the order
@@ -107,17 +104,14 @@ class FormCheckout
     else
       @result[:card] = false
     end
+    @result[:card]
   end
   
   # Uses the gateway and card objects to carry out an ActiveMerchant purchase
   def purchase
-    result = @gateway.purchase(amount, @card, options)
-    
-    if result.success?
-      create_payment
-    end
-    
-    result
+    purchase = @gateway.purchase(amount, @card, options)
+    @result[:message] = purchase.message
+    purchase.success?
   end
   
   def finalize_checkout
@@ -169,7 +163,7 @@ class FormCheckout
   
   # Returns the submitted card attributes
   def card
-    @data[:card]
+    @data[:credit_card]
   end
   
   # Returns card number (1234123412341234)
@@ -205,7 +199,7 @@ class FormCheckout
   # Splits the card names into an array we can inspect
   def card_names
     return @card_names if @card_names.present?
-    @card_names = @data[:card][:name].split(' ')
+    @card_names = @data[:credit_card][:name].split(' ')
   end
   
   # Return all the strings bar the last on the card

data/app/models/shop_address.rb

@@ -1,10 +1,9 @@
 class ShopAddress < ActiveRecord::Base
   
-  has_many :billings,   :class_name => 'ShopOrder', :foreign_key => :billing_id
-  has_many :shippings,  :class_name => 'ShopOrder', :foreign_key => :shipping_id
+  belongs_to :addressable, :polymorphic => true
   
   validates_presence_of :name
-  validates_presence_of :street
+  validates_presence_of :street_1
   validates_presence_of :city
   validates_presence_of :postcode
   validates_presence_of :state  

data/app/models/shop_billing.rb

@@ -0,0 +1,7 @@
+class ShopBilling < ShopAddress
+  
+  default_scope :conditions => { :of_type => 'billing' }
+  
+  validates_presence_of :email
+  
+end

data/app/models/shop_line_item.rb

@@ -1,7 +1,7 @@
 class ShopLineItem < ActiveRecord::Base
   
   belongs_to  :order,       :class_name   => 'ShopOrder'
-  has_one     :customer,    :class_name   => 'ShopCustomer', :through => :order, :source => :customer
+  has_one     :customer,    :class_name   => 'User', :through => :order, :source => :customer
   belongs_to  :item,        :polymorphic  => true
   
   before_validation         :adjust_quantity, :copy_price

data/app/models/shop_order.rb

@@ -2,14 +2,15 @@ class ShopOrder < ActiveRecord::Base
   
   default_scope :order => 'shop_orders.updated_at DESC'
   
-  has_one    :payment,     :class_name => 'ShopPayment',        :foreign_key => :order_id,  :dependent => :destroy
-  has_many   :line_items,  :class_name => 'ShopLineItem',       :foreign_key => :order_id,  :dependent => :destroy
-  
-  belongs_to :billing,    :class_name => 'ShopAddress'
-  belongs_to :shipping,   :class_name => 'ShopAddress'
-  belongs_to :created_by, :class_name => 'User'
-  belongs_to :updated_by, :class_name => 'User'
-  belongs_to :customer,   :class_name => 'ShopCustomer'
+  has_one    :payment,      :class_name => 'ShopPayment',   :foreign_key => :order_id,  :dependent => :destroy
+  has_many   :line_items,   :class_name => 'ShopLineItem',  :foreign_key => :order_id,  :dependent => :destroy
+  
+  belongs_to :created_by,   :class_name => 'User'
+  belongs_to :updated_by,   :class_name => 'User'
+  belongs_to :customer,     :class_name => 'User',          :foreign_key => :customer_id
+  
+  has_one    :billing,      :class_name => 'ShopBilling',   :as => :addressable
+  has_one    :shipping,     :class_name => 'ShopShipping',  :as => :addressable
   
   accepts_nested_attributes_for :line_items,  :reject_if => :all_blank
   accepts_nested_attributes_for :billing,     :reject_if => :all_blank

data/app/models/shop_shipping.rb

@@ -0,0 +1,5 @@
+class ShopShipping < ShopAddress
+  
+  default_scope :conditions => { :of_type => 'shipping' }
+  
+end

data/app/views/admin/shop/orders/index/_order.html.haml

@@ -7,7 +7,7 @@
       - body.status do
         %span.status.attribute= order.status
       - body.updated do
-        %span.updated.attribute= "#{distance_of_time_in_words Time.now, order.updated_at} ago"
+        %span.updated.attribute= distance_of_time_in_words(Time.now, order.updated_at)
       - body.customer do
         .modify
           %span.customer.attribute= order.customer.name rescue nil

data/config/locales/en.yml

@@ -64,3 +64,120 @@ en:
       warning: "Deleting a product is irreversible, make sure you're sure."
     remove_category:
       warning: "Deleting a category (and its products) is irreversible, make sure you're sure."
+en:
+  number:
+    # Used in number_with_delimiter()
+    # These are also the defaults for 'currency', 'percentage', 'precision', and 'human'
+    format:
+      # Sets the separator between the units, for more precision (e.g. 1.0 / 2.0 == 0.5)
+      separator: "."
+      # Delimets thousands (e.g. 1,000,000 is a million) (always in groups of three)
+      delimiter: ","
+      # Number of decimals, behind the separator (the number 1 with a precision of 2 gives: 1.00)
+      precision: 3
+
+    # Used in number_to_currency()
+    currency:
+      format:
+        # Where is the currency sign? %u is the currency unit, %n the number (default: $5.00)
+        format: "%u%n"
+        unit: "$"
+        # These three are to override number.format and are optional
+        separator: "."
+        delimiter: ","
+        precision: 2
+
+    # Used in number_to_percentage()
+    percentage:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: ""
+        # precision: 
+
+    # Used in number_to_precision()
+    precision:
+      format:
+        # These three are to override number.format and are optional
+        # separator:
+        delimiter: ""
+        # precision:
+
+    # Used in number_to_human_size()
+    human:
+      format:
+        # These three are to override number.format and are optional
+        # separator: 
+        delimiter: ""
+        precision: 1
+      storage_units:
+        # Storage units output formatting.
+        # %u is the storage unit, %n is the number (default: 2 MB)
+        format: "%n %u"
+        units:
+          byte:
+            one:   "Byte"
+            other: "Bytes"
+          kb: "KB"
+          mb: "MB"
+          gb: "GB"
+          tb: "TB"
+
+  # Used in distance_of_time_in_words(), distance_of_time_in_words_to_now(), time_ago_in_words()
+  datetime:
+    distance_in_words:
+      half_a_minute: "half a minute"
+      less_than_x_seconds:
+        one:   "less than 1 second"
+        other: "less than %{count} seconds"
+      x_seconds:
+        one:   "1 second"
+        other: "%{count} seconds"
+      less_than_x_minutes:
+        one:   "less than a minute"
+        other: "less than %{count} minutes"
+      x_minutes:
+        one:   "1 minute"
+        other: "%{count} minutes"
+      about_x_hours:
+        one:   "about 1 hour"
+        other: "about %{count} hours"
+      x_days:
+        one:   "1 day"
+        other: "%{count} days"
+      about_x_months:
+        one:   "about 1 month"
+        other: "about %{count} months"
+      x_months:
+        one:   "1 month"
+        other: "%{count} months"
+      about_x_years:
+        one:   "about 1 year"
+        other: "about %{count} years"
+      over_x_years:
+        one:   "over 1 year"
+        other: "over %{count} years"
+      almost_x_years:
+        one:   "almost 1 year"
+        other: "almost %{count} years"
+    prompts:
+      year:   "Year"
+      month:  "Month"
+      day:    "Day"
+      hour:   "Hour"
+      minute: "Minute"
+      second: "Seconds"
+
+  activerecord:
+    errors:
+      template:
+        header:
+          one:    "1 error prohibited this %{model} from being saved"
+          other:  "%{count} errors prohibited this %{model} from being saved"
+        # The variable :count is also available
+        body: "There were problems with the following fields:"
+
+  support:
+    select:
+      # default value for :prompt => true in FormOptionsHelper
+      prompt: "Please select"