effective_orders 1.2.9 → 1.2.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c71ba80f793adc23f37e25de7767711398b01ab5
-  data.tar.gz: cf193e4c089fd19bf330ae3ca3fc5fe7bdb2d762
+  metadata.gz: 3b29d74d59a97f8495f964a6cf603c3a6d6c5fe9
+  data.tar.gz: 55e0bdee49dffebbe95c85ea115da785d48b38d9
 SHA512:
-  metadata.gz: 398fcd93fa0a67539a2426c1b7fe2a77bf75279861c793d5eaac92ab6ac157bf1264e5d3be2d9771825c75f3116d04cdc88af9ca98334bcb86c02e6ab08aa6a2
-  data.tar.gz: cf05526fff7c2fd3a92f42f403750d547ce36fb3fc7b5eab0360f7c036f8a0b72a0d87d0cf859108ad53925c4396ddc04d62c050bae97b8aa3f8069f62c81a79
+  metadata.gz: 53c79475f15bfe79c2c7b937eff479cef6324cfa1bf9bd2d9a3fe28a52466f791d28c3867c3fb624ed8881673ff730c0e769fefaeb7c74428f1349862016c826
+  data.tar.gz: 86d6f55c1486df3d90bf1bdc7763e60d659e078a1ae5e5f48d37cd4090cd87e3aebf9c9d2bdc0925f0c36bfe63e5d0d3859fea9ed3e554394580f7893bd11aec

data/app/models/effective/order.rb

@@ -96,14 +96,14 @@ module Effective
     def user=(user)
       super
 
-      if user.respond_to?(:billing_address) && EffectiveOrders.require_billing_address
+      if user.respond_to?(:billing_address) && (billing_address.blank? || billing_address.empty?)
         self.billing_address = user.billing_address
-        self.billing_address.full_name = billing_name if self.billing_address.present? && self.billing_address.full_name.blank?
+        self.billing_address.full_name = billing_name if billing_address.present? && billing_address.full_name.blank?
       end
 
-      if user.respond_to?(:shipping_address) && EffectiveOrders.require_shipping_address
+      if user.respond_to?(:shipping_address) && (shipping_address.blank? || shipping_address.empty?)
         self.shipping_address = user.shipping_address
-        self.shipping_address.full_name = billing_name if self.shipping_address.present? && self.shipping_address.full_name.blank?
+        self.shipping_address.full_name = billing_name if shipping_address.present? &&shipping_address.full_name.blank?
       end
     end
 

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

@@ -2,13 +2,13 @@
   %thead
     %tr
       %th{:style => 'text-align: left;'}= "#{order.purchased? ? 'Sold to' : 'Bill to'}"
-      - if EffectiveOrders.require_shipping_address && order.shipping_address.present?
+      - if order.shipping_address.present? && !order.shipping_address.empty?
         %th{:style => 'text-align: left;'} Ship to
 
   %tbody
     %tr
       %td{:style => 'text-align: left;'}
-        - if EffectiveOrders.require_billing_address && order.billing_address.present?
+        - if order.billing_address.present? && !order.billing_address.empty?
           = render :partial => 'effective/addresses/address', :locals => {:address => order.billing_address, :email => order.user.email}
         - else
           = order.billing_name
@@ -16,6 +16,6 @@
           = mail_to(order.user.email)
           %br
 
-      - if EffectiveOrders.require_shipping_address && order.shipping_address.present?
+      - if order.shipping_address.present? && !order.shipping_address.empty?
         %td{:style => 'text-align: left;'}
           = render :partial => 'effective/addresses/address', :locals => {:address => order.shipping_address}

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '1.2.9'.freeze
+  VERSION = '1.2.10'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 1.2.9
+  version: 1.2.10
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-02-03 00:00:00.000000000 Z
+date: 2015-02-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails