piggybak 0.6.34 → 0.7.0

data/app/controllers/piggybak/orders_controller.rb

@@ -9,11 +9,11 @@ module Piggybak
 
         begin
           ActiveRecord::Base.transaction do
-            @order = Piggybak::Order.new(params[:piggybak_order])
+            @order = Piggybak::Order.new(orders_params)
             @order.create_payment_shipment
 
             if Piggybak.config.logging
-              clean_params = params[:piggybak_order].clone
+              clean_params = params[:order].clone
               clean_params[:line_items_attributes].each do |k, li_attr|
                 if li_attr[:line_item_type] == "payment" && li_attr.has_key?(:payment_attributes)
                   if li_attr[:payment_attributes].has_key?(:number)
@@ -144,12 +144,24 @@ module Piggybak
     end
 
     def geodata
-      countries = ::Piggybak::Country.find(:all, :include => :states)
+      countries = ::Piggybak::Country.all.includes(:states)
       data = countries.inject({}) do |h, country|
         h["country_#{country.id}"] = country.states
         h
       end
       render :json => { :countries => data }
     end
+
+    private
+    def orders_params
+      nested_attributes = [shipment_attributes: [:shipping_method_id], 
+                           payment_attributes: [:number, :verification_value, :month, :year]].first.merge(Piggybak.config.additional_line_item_attributes)
+      line_item_attributes = [:sellable_id, :price, :unit_price, :description, :quantity, :line_item_type, nested_attributes]
+      params.require(:order).permit(:user_id, :email, :phone, :ip_address,
+                                    billing_address_attributes: [:firstname, :lastname, :address1, :location, :address2, :city, :state_id, :zip, :country_id],
+                                    shipping_address_attributes: [:firstname, :lastname, :address1, :location, :address2, :city, :state_id, :zip, :country_id, :copy_from_billing],
+                                    line_items_attributes: line_item_attributes)
+
+    end
   end
 end

data/app/models/piggybak/address.rb

@@ -5,20 +5,17 @@ module Piggybak
     has_one :order_shipping, :foreign_key => "shipping_address_id", :class_name => "Piggybak::Order"
     has_one :order_billing, :foreign_key => "billing_address_id", :class_name => "Piggybak::Order"
 
-    validates_presence_of :firstname
-    validates_presence_of :lastname
-    validates_presence_of :address1
-    validates_presence_of :city
-    validates_presence_of :state_id
-    validates_presence_of :country_id
-    validates_presence_of :zip
+    validates :firstname, presence: true
+    validates :lastname, presence: true
+    validates :address1, presence: true
+    validates :city, presence: true
+    validates :state_id, presence: true
+    validates :country_id, presence: true
+    validates :zip, presence: true
 
     after_initialize :set_default_country
     after_save :document_address_changes
     
-    attr_accessible :firstname, :lastname, :address1, :location,
-                    :address2, :city, :state_id, :zip, :country_id,
-                    :copy_from_billing
     attr_accessor :is_shipping
     
     def set_default_country
@@ -41,8 +38,8 @@ module Piggybak
       self.state ? self.state.name : self.state_id
     end
 
+    # TODO: Fix this. It isn't working.
     def document_address_changes
-      # TODO: Fix this. It isn't working.
       if self.order_billing.present? && self.changed?
         self.order_billing.recorded_changes << self.formatted_changes
       end

data/app/models/piggybak/country.rb

@@ -1,10 +1,9 @@
 module Piggybak
   class Country < ActiveRecord::Base
-    attr_accessible :name, :abbr, :active_shipping, :active_billing
     has_many :states
 
-    scope :shipping, where(:active_shipping => true)
-    scope :billing, where(:active_billing => true)
-    default_scope :order => 'name ASC'
+    scope :shipping, -> { where(:active_shipping => true)}
+    scope :billing, -> { where(:active_billing => true)}
+    default_scope { order('name ASC') }
   end
 end

data/app/models/piggybak/line_item.rb

@@ -4,7 +4,9 @@ module Piggybak
     acts_as_changer
     belongs_to :sellable
 
-    validates_presence_of :price, :description, :quantity
+    validates :price, presence: true
+    validates :description, presence: true
+    validates :quantity, presence: true
     validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0
 
     default_scope :order => 'created_at ASC'
@@ -13,8 +15,6 @@ module Piggybak
     after_destroy :increase_inventory, :if => Proc.new { |line_item| line_item.line_item_type == 'sellable' && !line_item.sellable.unlimited_inventory }
     after_update :update_inventory, :if => Proc.new { |line_item| line_item.line_item_type == 'sellable' && !line_item.sellable.unlimited_inventory }
 
-    attr_accessible :sellable_id, :price, :unit_price, :description, :quantity, :line_item_type
-
     after_initialize :initialize_line_item
     before_validation :preprocess
     before_destroy :destroy_associated_item

data/app/models/piggybak/order.rb

@@ -15,7 +15,14 @@ module Piggybak
     attr_accessor :recorded_changes, :recorded_changer,
                   :was_new_record, :disable_order_notes 
 
-    validates_presence_of :status, :email, :phone, :total, :total_due, :created_at, :ip_address, :user_agent
+    validates :status, presence: true
+    validates :email, presence: true
+    validates :phone, presence: true
+    validates :total, presence: true
+    validates :total_due, presence: true
+    validates :created_at, presence: true
+    validates :ip_address, presence: true
+    validates :user_agent, presence: true
 
     after_initialize :initialize_defaults
     validate :number_payments
@@ -25,10 +32,6 @@ module Piggybak
 
     default_scope :order => 'created_at DESC'
 
-    attr_accessible :user_id, :email, :phone, :billing_address_attributes, 
-                    :shipping_address_attributes, :line_items_attributes,
-                    :order_notes_attributes, :details, :recorded_changer, :ip_address
-                   
     def deliver_order_confirmation
       Piggybak::Notifier.order_notification(self).deliver
       self.update_column(:confirmation_sent,true)
@@ -52,6 +55,7 @@ module Piggybak
     end
 
     def number_payments
+
       new_payments = self.line_items.payments.select { |li| li.new_record? }
       if new_payments.size > 1
         self.errors.add(:base, "Only one payment may be created at a time.")
@@ -69,6 +73,7 @@ module Piggybak
     end
 
     def postprocess_order
+
       # Mark line items for destruction if quantity == 0
       self.line_items.each do |line_item|
         if line_item.quantity == 0
@@ -102,7 +107,7 @@ module Piggybak
           end
         end
       end
-      
+     
       # Recalculating total and total due, in case post process changed totals
       self.total_due = 0
       self.total = 0

data/app/models/piggybak/order_note.rb

@@ -1,11 +1,10 @@
 module Piggybak
   class OrderNote < ActiveRecord::Base
-    attr_accessible :user_id, :order_id, :note, :created_at
-    validates_presence_of :user_id, :order_id
+    validates :user_id, presence: true
+    validates :order_id, presence: true
 
     belongs_to :order
     belongs_to :user
-    validates_presence_of :user_id
     default_scope :order => 'created_at ASC'
 
     def details

data/app/models/piggybak/payment.rb

@@ -4,16 +4,13 @@ module Piggybak
     belongs_to :payment_method
     belongs_to :line_item
 
-    validates_presence_of :status
-    validates_presence_of :payment_method_id
-    validates_presence_of :month
-    validates_presence_of :year
+    validates :status, presence: true
+    validates :payment_method_id, presence: true
+    validates :month, presence: true
+    validates :year, presence: true
 
     attr_accessor :number
     attr_accessor :verification_value
-
-    attr_accessible :number, :verification_value, :month, :year,
-                    :transaction_id, :masked_number, :payment_method_id
     
     def status_enum
       ["paid"]

data/app/models/piggybak/payment_method.rb

@@ -5,11 +5,9 @@ module Piggybak
 
     accepts_nested_attributes_for :payment_method_values, :allow_destroy => true
 
-    validates_presence_of :klass
-    validates_presence_of :description
+    validates :klass, presence: true
+    validates :description, presence: true
     
-    attr_accessible :active, :payment_method_values_attributes, :description,
-                    :klass
     def klass_enum 
       Piggybak.config.payment_calculators
     end

data/app/models/piggybak/payment_method_value.rb

@@ -1,11 +1,9 @@
 module Piggybak
   class PaymentMethodValue < ActiveRecord::Base
     belongs_to :payment_method
-    validates_presence_of :key
-    validates_presence_of :value
+    validates :key, presence: true
+    validates :value, presence: true
     
-    attr_accessible :key, :value, :payment_method_id
-      
     def admin_label
       "#{self.key} - #{self.value}"
     end

data/app/models/piggybak/sellable.rb

@@ -1,13 +1,10 @@
 class Piggybak::Sellable < ActiveRecord::Base
   belongs_to :item, :polymorphic => true, :inverse_of => :piggybak_sellable
-  attr_accessible :sku, :description, :price, :quantity, :active, :unlimited_inventory, :item_id, :item_type 
-  attr_accessible :item # to allow direct assignment from code or console
 
-  validates_presence_of :sku
-  validates_uniqueness_of :sku
-  validates_presence_of :description
-  validates_presence_of :price
-  validates_presence_of :item_type
+  validates :sku, presence: true, uniqueness: true
+  validates :description, presence: true
+  validates :price, presence: true
+  validates :item_type, presence: true
   validates_numericality_of :quantity, :only_integer => true, :greater_than_or_equal_to => 0
 
   has_many :line_items, :as => :reference, :inverse_of => :reference

data/app/models/piggybak/shipment.rb

@@ -4,10 +4,8 @@ module Piggybak
     belongs_to :shipping_method
     belongs_to :line_item
 
-    validates_presence_of :status
-    validates_presence_of :shipping_method_id
-    
-    attr_accessible :shipping_method_id, :status
+    validates :status, presence: true
+    validates :shipping_method_id, presence: true
     
     def status_enum
       ["new", "processing", "shipped"]

data/app/models/piggybak/shipping_calculator/flat_rate.rb

@@ -11,7 +11,7 @@ module Piggybak
     end
 
     def self.rate(method, object)
-      method.metadata.detect { |m| m.key == "rate" }.value.to_f.to_c
+      method.metadata.detect { |m| m.key == "rate" }.value.to_f
     end
   end
 end

data/app/models/piggybak/shipping_calculator/range.rb

@@ -14,7 +14,7 @@ module Piggybak
     end
 
     def self.rate(method, object)
-      method.metadata.detect { |m| m.key == "cost" }.value.to_f.to_c
+      method.metadata.detect { |m| m.key == "cost" }.value.to_f
     end
   end
 end

data/app/models/piggybak/shipping_method.rb

@@ -3,14 +3,11 @@ module Piggybak
     has_many :shipping_method_values, :dependent => :destroy
     alias :metadata :shipping_method_values
 
-    validates_presence_of :description
-    validates_presence_of :klass
+    validates :description, presence: true
+    validates :klass, presence: true
 
     accepts_nested_attributes_for :shipping_method_values, :allow_destroy => true
 
-    attr_accessible :active, :shipping_method_values_attributes, :description,
-                    :klass
-
     validates_each :shipping_method_values do |record, attr, value|
       if record.klass.present?
         calculator = record.klass.constantize
@@ -45,7 +42,7 @@ module Piggybak
           arr << {
             :label => "#{method.description} $#{"%.2f" % rate}",
             :id => method.id,
-            :rate => rate }
+            :rate => rate.to_f }
           end
         arr
       end

data/app/models/piggybak/shipping_method_value.rb

@@ -1,9 +1,8 @@
 module Piggybak
   class ShippingMethodValue < ActiveRecord::Base
     belongs_to :shipping_method
-    validates_presence_of :key
-    validates_presence_of :value
-    attr_accessible :key, :value, :shipping_method_id
+    validates :key, presence: true
+    validates :value, presence: true
     
     def admin_label
       "#{self.key} - #{self.value}"

data/app/models/piggybak/state.rb

@@ -1,6 +1,5 @@
 module Piggybak
   class State < ActiveRecord::Base
-    attr_accessible :name, :abbr, :country
     belongs_to :country
   end
 end

data/app/models/piggybak/tax_calculator/percent.rb

@@ -5,15 +5,11 @@ module Piggybak
     def self.available?(method, object)
       id = method.metadata.detect { |t| t.key == "state_id" }.value
 
-      if object.is_a?(Cart)
-        if object.extra_data[:state_id] != ""
-          state = State.find(object.extra_data[:state_id])
-          return state.id == id.to_i if state
-        end
-      else
-        if object.billing_address && object.billing_address.state 
-          return object.billing_address.state.id == id.to_i
-        end
+      if object.is_a?(Cart) && object.extra_data.has_key?(:state_id) && object.extra_data[:state_id] != ''
+        state = State.find(object.extra_data[:state_id])
+        return state.id == id.to_i if state
+      elsif object.is_a?(Order) && object.billing_address && object.billing_address.state 
+        return object.billing_address.state.id == id.to_i
       end
       return false
     end
@@ -29,7 +25,7 @@ module Piggybak
       else
         taxable_total += object.extra_data[:reduce_tax_subtotal].to_f
       end
-      (method.metadata.detect { |m| m.key == "rate" }.value.to_f * taxable_total).to_c
+      method.metadata.detect { |m| m.key == "rate" }.value.to_f * taxable_total
     end
   end
 end

data/app/models/piggybak/tax_method.rb

@@ -3,12 +3,11 @@ module Piggybak
     has_many :tax_method_values, :dependent => :destroy
     alias :metadata :tax_method_values
 
-    validates_presence_of :description
-    validates_presence_of :klass
+    validates :description, presence: true
+    validates :klass, presence: true
 
     accepts_nested_attributes_for :tax_method_values, :allow_destroy => true
-    attr_accessible :active, :tax_method_values_attributes, :description,
-                    :klass
+
     validates_each :tax_method_values do |record, attr, value|
       if record.klass.present?
         calculator = record.klass.constantize
@@ -36,8 +35,8 @@ module Piggybak
           total_tax += calculator.rate(tax_method, object)
         end 
       end
-   
-      total_tax
+
+      ((100*total_tax.to_f).to_i).to_f/(100.to_f)
     end
 
     def admin_label

data/app/models/piggybak/tax_method_value.rb

@@ -1,9 +1,8 @@
 module Piggybak
   class TaxMethodValue < ActiveRecord::Base
     belongs_to :tax_method
-    validates_presence_of :key
-    validates_presence_of :value
-    attr_accessible :key, :value, :tax_method_id
+    validates :key, presence: true
+    validates :value, presence: true
     
     def admin_label
       "#{self.key} - #{self.value}"

data/app/views/piggybak/orders/_user_details.html.erb

@@ -4,11 +4,11 @@
 		<% if current_user -%>
 		<%= f.label :email %>
 		<%= f.text_field :email, { :readonly => true, :class => "readonly required" } %>
-		<span>or <%= link_to 'LOGOUT', destroy_user_session_path, :method => :delete, :class => "last" %></span>
+		<span>or <%= link_to 'LOGOUT', main_app.destroy_user_session_path, :method => :delete, :class => "last" %></span>
 		<% else -%>
 		<%= f.label :email %>
 		<%= f.text_field :email, :class => "required" %><br />
-		<span>or <%= link_to 'LOG IN', new_user_session_path %></span>
+		<span>or <%= link_to 'LOG IN', main_app.new_user_session_path %></span>
 		<% end -%>
 	</div>
 	<div class="item">

data/app/views/rails_admin/main/_location_select.html.haml

@@ -1,12 +1,10 @@
 :ruby
   type = form.object.is_shipping ? "shipping" : "billing"
 
-= form.collection_select "country_id", Piggybak::Country.send(type), :id, :name, { :selected => form.object.country_id.to_s }
-
 - if form.object.country.states.any?
-  = form.collection_select "state_id", form.object.country.states, :id, :name, { :selected => form.object.state_id.to_s }
+  = select_tag "#{type}_state_id", options_from_collection_for_select(form.object.country.states, "id", "name") #.collect { |s| [s.name, s.id] } #, :id, :name, { :selected => form.object.state_id.to_s }
 - else
-  = form.text_field "state_id"
+  = text_field "#{type}_state_id"
 
 :javascript
   var geodata_lookup = "#{piggybak.orders_geodata_url}";

data/app/views/rails_admin/main/_polymorphic_nested.html.haml

@@ -1,29 +1,5 @@
 - if form.object.new_record?
-  = form.select "line_item_type", Piggybak::LineItem.line_item_type_select, {}, :onchange => "toggle_line_item($(this));"
+  = form.select "line_item_type", Piggybak::LineItem.line_item_type_select, {}, :onchange => "piggybak_rails_admin.toggle_line_item($(this));"
 - else
   = form.hidden_field "line_item_type"
   = form.object.line_item_type
-
-%script
-  var line_item_types=#{raw Piggybak.config.line_item_types.to_json};
-  var toggle_line_item = function(el) {
-  el.parent().parent().siblings('div').hide();
-  if(line_item_types[el.val()].fields === undefined) {
-  line_item_types[el.val()].fields = new Array();
-  }
-  $.each(line_item_types[el.val()].fields, function(a, b) {
-  el.parent().parent().siblings('.' + b + '_field').show();
-  if(line_item_types[el.val()].nested_attrs !== undefined) {
-  el.parent().parent().siblings('.' + b + '_field').find('> .controls,> .control-label').hide();
-  }
-  });
-  };
-  $.each($('.line_item_type_field select,.line_item_type_field input'), function(i, el) {
-  toggle_line_item($(el));
-  });
-  //Removing delete-ability of line_item_types that can't be destroyed
-  $.each($('.line_item_type_field input'), function(i, el) {
-  if(!line_item_types[$(el).val()].allow_destroy) {
-  $(el).parentsUntil('fieldset').parent().parent().find('.remove_nested_fields').remove();
-  }
-  });