effective_orders 2.1.5 → 2.1.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: fc912e7bf2fc4e12905abff50fab57ca0b8479eb
-  data.tar.gz: 8da57b67b1b09169180d2782e690d0dbdc69389f
+  metadata.gz: f067a482a08a63b26a23649c3ff1cbeabdf5a3c9
+  data.tar.gz: b1c1adc7ce23f8196a072155261e3a9139761d0f
 SHA512:
-  metadata.gz: bbf1ba883263abc262431f857bed188b8f9de0653b93cb337ef0338b0773e537ff2d090a5c36b94d29f340b4e4e179263c2e12caff7dc420feada264256fc905
-  data.tar.gz: 29744efe4ccfdfe874b5ee905be298950d50dd59c9bdf3070df56751586e8bc9abd621c2a8bf2a2370452d3f7759fe41577e91c313b49accca2af0c3084b4be4
+  metadata.gz: 253b5d1cb1877f869558aceaf15be0230f896bddc419821d3bb322a00aff98f576db9103ad8829fe08706a1dca1d2aa03d39398a558b4cad9999a7ec97dce2e7
+  data.tar.gz: 2f0d3b522ad5c12632f9d6263459b13a26e2064a1ae838aa9a41dac3fc183a6998207f3937c1dabf6a08c7d47f0010c19cf4b20b828a4fe4a358c6232622efa1

data/app/controllers/effective/orders_controller.rb

@@ -73,14 +73,10 @@ module Effective
       @order.attributes = order_params
       @order.user_id = current_user.id
 
-      if EffectiveOrders.require_shipping_address
-        if @order.shipping_address_same_as_billing? && @order.billing_address.present?
-          @order.shipping_address = @order.billing_address
-        end
-      end
-
       EffectiveOrders.authorized?(self, (@order.persisted? ? :update : :create), @order)
 
+      @order.valid?  # This makes sure the correct shipping_address is copied from billing_address if shipping_address_same_as_billing
+
       Effective::Order.transaction do
         begin
           if @order.save_billing_address? && @order.user.respond_to?(:billing_address=) && @order.billing_address.present?

data/app/helpers/effective_orders_helper.rb

@@ -165,16 +165,18 @@ module EffectiveOrdersHelper
   end
 
   def payment_card_label(card)
-    case card.to_s.downcase[0]
-    when nil
+    card = card.to_s.downcase.gsub(' ', '').strip
+
+    case card
+    when ''
       'None'
-    when 'v'
+    when 'v', 'visa'
       'Visa'
-    when 'm'
+    when 'm', 'mc', 'master', 'mastercard'
       'MasterCard'
-    when 'a'
+    when 'a', 'ax', 'american', 'americanexpress'
       'American Express'
-    when 'd'
+    when 'd', 'discover'
       'Discover'
     else
       card.to_s

data/app/models/effective/order.rb

@@ -11,7 +11,7 @@ module Effective
       :shipping => { singular: true, use_full_name: EffectiveOrders.use_address_full_name }
     )
 
-    attr_accessor :save_billing_address, :save_shipping_address, :shipping_address_same_as_billing # save these addresses to the user if selected
+    attr_accessor :save_billing_address, :save_shipping_address # save these addresses to the user if selected
     attr_accessor :terms_and_conditions # Yes, I agree to the terms and conditions
 
     # Settings in the /admin action forms
@@ -126,7 +126,6 @@ module Effective
       # Set up defaults
       self.save_billing_address = true
       self.save_shipping_address = true
-      self.shipping_address_same_as_billing = true
 
       self.user = user || (items.first.user if items.first.kind_of?(Effective::Cart))
 
@@ -290,10 +289,6 @@ module Effective
       ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.send_mark_as_paid_email_to_buyer)
     end
 
-    def shipping_address_same_as_billing?
-      ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.shipping_address_same_as_billing)
-    end
-
     def skip_buyer_validations?
       ::ActiveRecord::ConnectionAdapters::Column::TRUE_VALUES.include?(self.skip_buyer_validations)
     end

data/app/views/effective/orders/_checkout_step1.html.haml

@@ -25,13 +25,9 @@
         - if EffectiveOrders.require_shipping_address
           %div{class: "col-sm-#{12 / num_addresses}"}
             %h3 Shipping Address
-            - if EffectiveOrders.require_billing_address && EffectiveOrders.require_shipping_address
-              .shipping_address_fields{style: (f.object.shipping_address_same_as_billing? && (f.object.errors[:shipping_address] || []).blank?) ? 'display: none;' : 'display: block;'}
-                = effective_address_fields(f, :shipping_address)
-                - if f.object.user.respond_to?(:shipping_address=)
-                  = f.input :save_shipping_address, as: :boolean, label: 'Save as my default shipping address', required: false
-
-              = f.input :shipping_address_same_as_billing, as: :boolean, label: 'My shipping address is the same as my billing address', required: false
+            = effective_address_fields(f, :shipping_address)
+            - if f.object.user.respond_to?(:shipping_address=)
+              = f.input :save_shipping_address, as: :boolean, label: 'Save as my default shipping address', required: false
 
     - if EffectiveOrders.collect_note
       = render partial: 'effective/orders/order_note_fields', locals: { form: f }

data/lib/effective_orders.rb

@@ -118,9 +118,9 @@ module EffectiveOrders
 
   def self.permitted_params
     [
-      :note, :save_billing_address, :save_shipping_address, :shipping_address_same_as_billing, :terms_and_conditions,
-      billing_address: [:full_name, :address1, :address2, :city, :country_code, :state_code, :postal_code],
-      shipping_address: [:full_name, :address1, :address2, :city, :country_code, :state_code, :postal_code],
+      :note, :save_billing_address, :save_shipping_address, :terms_and_conditions,
+      billing_address: EffectiveAddresses.permitted_params,
+      shipping_address: EffectiveAddresses.permitted_params,
       user_attributes: (EffectiveOrders.collect_user_fields || []),
       order_items_attributes: [:stripe_coupon_id, :class, :id]
     ]

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '2.1.5'.freeze
+  VERSION = '2.1.6'.freeze
 end

data/spec/controllers/orders_controller_spec.rb

@@ -93,7 +93,6 @@ describe Effective::OrdersController, type: :controller do
       post :create, effective_order: {
         billing_address: billing_atts, save_billing_address: false,
         shipping_address: shipping_atts, save_shipping_address: false,
-        shipping_address_same_as_billing: false,
         user_attributes: {first_name: 'First', last_name: 'Last', email: 'email@somwhere.com'}
       }
 
@@ -108,7 +107,6 @@ describe Effective::OrdersController, type: :controller do
       post :create, effective_order: {
         billing_address: billing_atts, save_billing_address: false,
         shipping_address: shipping_atts, save_shipping_address: false,
-        shipping_address_same_as_billing: false
       }
 
       (assigns(:order).valid? && assigns(:order).persisted?).should eq true
@@ -123,8 +121,7 @@ describe Effective::OrdersController, type: :controller do
     it 'assign addresses to the order and the user' do
       post :create, effective_order: {
         billing_address: billing_atts, save_billing_address: true,
-        shipping_address: shipping_atts, save_shipping_address: true,
-        shipping_address_same_as_billing: false
+        shipping_address: shipping_atts, save_shipping_address: true
       }
 
       (assigns(:order).valid? && assigns(:order).persisted?).should eq true
@@ -141,8 +138,7 @@ describe Effective::OrdersController, type: :controller do
     it 'does not assign the billing_address to user if save_billing_address is false' do
       post :create, effective_order: {
         billing_address: billing_atts, save_billing_address: false,
-        shipping_address: shipping_atts, save_shipping_address: true,
-        shipping_address_same_as_billing: false
+        shipping_address: shipping_atts, save_shipping_address: true
       }
 
       (assigns(:order).valid? && assigns(:order).persisted?).should eq true
@@ -159,8 +155,7 @@ describe Effective::OrdersController, type: :controller do
     it 'does not assign the shipping_address to user if save_shipping_address is false' do
       post :create, effective_order: {
         billing_address: billing_atts, save_billing_address: true,
-        shipping_address: shipping_atts, save_shipping_address: false,
-        shipping_address_same_as_billing: false
+        shipping_address: shipping_atts, save_shipping_address: false
       }
 
       (assigns(:order).valid? && assigns(:order).persisted?).should eq true
@@ -177,8 +172,7 @@ describe Effective::OrdersController, type: :controller do
     it 'assign billing address to the order shipping_address when shipping_address_same_as_billing' do
       post :create, effective_order: {
         billing_address: billing_atts, save_billing_address: true,
-        shipping_address: shipping_atts, save_shipping_address: true,
-        shipping_address_same_as_billing: true
+        shipping_address: shipping_atts.merge(shipping_address_same_as_billing: 1), save_shipping_address: true,
       }
 
       (assigns(:order).valid? && assigns(:order).persisted?).should eq true
@@ -194,8 +188,7 @@ describe Effective::OrdersController, type: :controller do
 
     it 'assign billing address to the order shipping_address when shipping_address_same_as_billing and no shipping provided' do
       post :create, effective_order: {
-        billing_address: billing_atts, save_billing_address: true,
-        shipping_address_same_as_billing: true
+        billing_address: billing_atts, save_billing_address: true, shipping_address: { shipping_address_same_as_billing: 1 }
       }
 
       (assigns(:order).valid? && assigns(:order).persisted?).should eq true
@@ -211,9 +204,8 @@ describe Effective::OrdersController, type: :controller do
 
     it 'assign billing address to the order shipping_address but not the user when shipping_address_same_as_billing provided' do
       post :create, effective_order: {
-        billing_address: billing_atts, save_billing_address: false,
-        save_shipping_address: false,
-        shipping_address_same_as_billing: true
+        billing_address: billing_atts, save_billing_address: false, shipping_address: { shipping_address_same_as_billing: 1 },
+        save_shipping_address: false
       }
 
       (assigns(:order).valid? && assigns(:order).persisted?).should eq true
@@ -230,8 +222,7 @@ describe Effective::OrdersController, type: :controller do
     it 'is invalid when passed an invalid address' do
       post :create, effective_order: {
         billing_address: billing_atts, save_billing_address: true,
-        shipping_address: shipping_atts.tap { |x| x[:address1] = nil }, save_shipping_address: true,
-        shipping_address_same_as_billing: false
+        shipping_address: shipping_atts.tap { |x| x[:address1] = nil }, save_shipping_address: true
       }
 
       (assigns(:order).valid? && assigns(:order).persisted?).should eq false
@@ -277,7 +268,7 @@ describe Effective::OrdersController, type: :controller do
     end
 
     it 'prevents the order from proceeding when missing a required address' do
-      post :create, effective_order: { billing_address: billing_atts, save_billing_address: true, shipping_address_same_as_billing: false }
+      post :create, effective_order: { billing_address: billing_atts, save_billing_address: true }
 
       (assigns(:order).valid? && assigns(:order).persisted?).should eq false
       assigns(:order).errors[:shipping_address].present?.should eq true

data/spec/dummy/log/test.log

@@ -8,3 +8,13 @@
    (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
    (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.2ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") FROM "orders"
+   (0.1ms)  SELECT MAX("orders"."id") FROM "orders"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 2.1.5
+  version: 2.1.6
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-04-12 00:00:00.000000000 Z
+date: 2016-04-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -114,14 +114,14 @@ dependencies:
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - ">="
       - !ruby/object:Gem::Version
-        version: 1.5.0
+        version: 1.6.0
 - !ruby/object:Gem::Dependency
   name: stripe-ruby-mock
   requirement: !ruby/object:Gem::Requirement
@@ -265,7 +265,6 @@ files:
 - app/assets/javascripts/effective_orders.js
 - app/assets/javascripts/effective_orders/providers/stripe_charges.js.coffee
 - app/assets/javascripts/effective_orders/providers/stripe_subscriptions.js.coffee
-- app/assets/javascripts/effective_orders/shipping_address_toggle.js.coffee
 - app/assets/stylesheets/effective_orders.scss
 - app/assets/stylesheets/effective_orders/_order.scss
 - app/controllers/admin/customers_controller.rb

data/app/assets/javascripts/effective_orders/shipping_address_toggle.js.coffee

@@ -1,30 +0,0 @@
-hideShippingAddressFields = (shipping_address) ->
-  shipping_address.hide().find('input,select').removeAttr('required')
-
-showShippingAddressFields = (shipping_address) ->
-  shipping_address.show().find("input:not([name$='[address2]']),select:not([name$='[state_code]'])").prop('required', true)
-
-initShippingAddressFields = ->
-  effective_order = $('.effective-order').first()
-
-  if effective_order.length > 0
-    shipping_address_same_as_billing = effective_order.find('#effective_order_shipping_address_same_as_billing')
-    shipping_address = effective_order.find('.shipping_address_fields')
-
-    if shipping_address_same_as_billing.length > 0 && shipping_address.length > 0
-      if shipping_address_same_as_billing.is(':checked')
-        hideShippingAddressFields(shipping_address)
-      else
-        showShippingAddressFields(shipping_address)
-
-$ -> initShippingAddressFields()
-$(document).on 'page:change', -> initShippingAddressFields()
-
-$(document).on 'change', '#effective_order_shipping_address_same_as_billing', (event) ->
-  obj = $(event.currentTarget)
-  shipping_address = obj.closest('form').find('.shipping_address_fields')
-
-  if obj.is(':checked')
-    hideShippingAddressFields(shipping_address)
-  else
-    showShippingAddressFields(shipping_address)