piggybak 0.6.8 → 0.6.9

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    piggybak (0.6.8)
+    piggybak (0.6.9)
       activemerchant
       countries
       devise

data/app/controllers/piggybak/orders_controller.rb

@@ -13,11 +13,18 @@ module Piggybak
             @order.create_payment_shipment
 
             if Piggybak.config.logging
-              # TODO: Reimplement on correctly filtered params
-              #clean_params = params[:piggybak_order].clone
-              #clean_params["payments_attributes"]["0"]["number"] = clean_params["payments_attributes"]["0"]["number"].mask_cc_number
-              #clean_params["payments_attributes"]["0"]["verification_value"] = clean_params["payments_attributes"]["0"]["verification_value"].mask_csv
-              #logger.info "#{request.remote_ip}:#{Time.now.strftime("%Y-%m-%d %H:%M")} Order received with params #{clean_params.inspect}" 
+              clean_params = params[:piggybak_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)
+                    li_attr[:payment_attributes][:number] = li_attr[:payment_attributes][:number].mask_cc_number
+                  end
+                  if li_attr[:payment_attributes].has_key?(:verification_value)
+                    li_attr[:payment_attributes][:verification_value] = li_attr[:payment_attributes][:verification_value].mask_csv
+                  end
+                end
+              end
+              logger.info "#{request.remote_ip}:#{Time.now.strftime("%Y-%m-%d %H:%M")} Order received with params #{clean_params.inspect}" 
             end
             @order.initialize_user(current_user, true)
 

data/app/models/piggybak/address.rb

@@ -17,7 +17,9 @@ module Piggybak
     after_save :document_address_changes
     
     attr_accessible :firstname, :lastname, :address1, :location,
-                    :address2, :city, :state_id, :zip, :country_id
+                    :address2, :city, :state_id, :zip, :country_id,
+                    :copy_from_billing
+    attr_accessor :is_shipping
     
     def set_default_country
       self.country ||= Country.find_by_abbr(Piggybak.config.default_country)

data/app/models/piggybak/country.rb

@@ -1,6 +1,6 @@
 module Piggybak
   class Country < ActiveRecord::Base
-    attr_accessible :name, :abbr
+    attr_accessible :name, :abbr, :active_shipping, :active_billing
     has_many :states
 
     scope :shipping, where(:active_shipping => true)

data/app/models/piggybak/line_item.rb

@@ -50,6 +50,18 @@ module Piggybak
 
       return if sellable.nil?
 
+      # Inventory check
+      quantity_change = 0
+      if self.new_record?
+        quantity_change = self.quantity.to_i
+      elsif self.changes.keys.include?("quantity") && self.quantity > self.quantity_was
+        quantity_change = self.quantity - self.quantity_was 
+      end
+      if sellable.quantity < quantity_change
+        self.errors.add(:sellable_id, "Insufficient inventory by #{quantity_change - sellable.quantity} unit(s).")
+        return
+      end 
+
       self.description = sellable.description
       self.unit_price = sellable.price
       self.price = self.unit_price*self.quantity.to_i 

data/app/models/piggybak/order.rb

@@ -33,6 +33,7 @@ module Piggybak
 
       self.billing_address ||= Piggybak::Address.new
       self.shipping_address ||= Piggybak::Address.new
+      self.shipping_address.is_shipping = true
 
       self.ip_address ||= 'admin'
       self.user_agent ||= 'admin'

data/app/models/piggybak/payment_method_value.rb

@@ -4,7 +4,7 @@ module Piggybak
     validates_presence_of :key
     validates_presence_of :value
     
-    attr_accessible :key, :value
+    attr_accessible :key, :value, :payment_method_id
       
     def admin_label
       "#{self.key} - #{self.value}"

data/app/models/piggybak/shipping_method.rb

@@ -8,6 +8,9 @@ module Piggybak
 
     accepts_nested_attributes_for :shipping_method_values, :allow_destroy => true
 
+    attr_accessible :active, :shipment_method_values_attributes, :description,
+                    :klass
+
     validates_each :shipping_method_values do |record, attr, value|
       if record.klass.present?
         calculator = record.klass.constantize

data/app/models/piggybak/shipping_method_value.rb

@@ -3,6 +3,7 @@ module Piggybak
     belongs_to :shipping_method
     validates_presence_of :key
     validates_presence_of :value
+    attr_accessible :key, :value, :shipping_method_id
     
     def admin_label
       "#{self.key} - #{self.value}"

data/app/models/piggybak/tax_method.rb

@@ -7,7 +7,8 @@ module Piggybak
     validates_presence_of :klass
 
     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
         calculator = record.klass.constantize

data/app/models/piggybak/tax_method_value.rb

@@ -3,7 +3,8 @@ module Piggybak
     belongs_to :tax_method
     validates_presence_of :key
     validates_presence_of :value
-
+    attr_accessible :key, :value, :tax_method_id
+    
     def admin_label
       "#{self.key} - #{self.value}"
     end  

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

@@ -0,0 +1,15 @@
+<a href="#" id="copy_from_billing">copy from billing</a>
+
+%script
+  $('#copy_from_billing').click(function() {
+  $.each($('#piggybak_order_billing_address_attributes_field input'), function(i, el) {
+  if($(el).attr('id') != 'piggybak_order_billing_address_attributes_id') {
+  var shipping_id = $(el).attr('id').replace('billing', 'shipping');
+  $('#' + shipping_id).val($(el).val());
+  }
+  });
+  $('#piggybak_order_shipping_address_attributes_country_id').val($('#piggybak_order_billing_address_attributes_country_id').val());
+  piggybak_states.update_state_option('shipping');
+  $('#piggybak_order_shipping_address_attributes_state_id').val($('#piggybak_order_billing_address_attributes_state_id').val());
+  return false;
+  });

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

@@ -1,5 +1,5 @@
 :ruby
-  type = form.jquery_namespace(field).match("billing") ? "billing" : "shipping"
+  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 }
 

data/lib/piggybak.rb

@@ -266,6 +266,14 @@ module Piggybak
           visible false
 
           edit do
+            field :copy_from_billing do
+              visible do
+                bindings[:object].is_shipping
+              end 
+              partial "copy_from_billing"
+              label "Help"
+              help "Copies address from billing to shipping."
+            end
             field :firstname
             field :lastname
             field :address1

data/lib/piggybak/cli.rb

@@ -36,7 +36,7 @@ module Piggybak
     desc "inject_devise", "add devise"
     def inject_devise
       puts 'add reference to devise in GEMFILE'
-      insert_into_file "GEMFILE", "gem 'devise'\n", :after => "source 'https://rubygems.org'\n"
+      insert_into_file "Gemfile", "gem 'devise'\n", :after => "source 'https://rubygems.org'\n"
     end
 
     

data/lib/piggybak/version.rb

@@ -1,3 +1,3 @@
 module Piggybak
-  VERSION = "0.6.8"
+  VERSION = "0.6.9"
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: piggybak
 version: !ruby/object:Gem::Version
-  version: 0.6.8
+  version: 0.6.9
   prerelease: 
 platform: ruby
 authors:
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2012-10-25 00:00:00.000000000 Z
+date: 2012-10-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -134,6 +134,7 @@ files:
 - app/helpers/piggybak_helper.rb
 - app/views/rails_admin/main/_recorded_changer.html.erb
 - app/views/rails_admin/main/_polymorphic_nested.html.haml
+- app/views/rails_admin/main/_copy_from_billing.html.haml
 - app/views/rails_admin/main/_location_select.html.haml
 - app/views/rails_admin/main/_order_details.html.erb
 - app/views/rails_admin/main/_ip_address.html.erb
@@ -211,7 +212,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3697325078829363009
+      hash: -716439778691107520
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -220,7 +221,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 3697325078829363009
+      hash: -716439778691107520
 requirements: []
 rubyforge_project: 
 rubygems_version: 1.8.23