effective_orders 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 5d975c31db44e626807e5a0f7b1ccb5c21016034daeaad2aef937a79894a322e
-  data.tar.gz: 5c0ced22f719a0e4c63004d7e0a973f7ae1415665788c0e7bab17519fe23c5e8
+  metadata.gz: 79642ded2e176dd43991e456466b69110f2e36ca107a9d49b5e1267ab57ed580
+  data.tar.gz: ec779c25f0fb3a8fcc55502105aa69e5a1d5586d2c4aedaef3bdbe4ad6194df3
 SHA512:
-  metadata.gz: c2ab9082782d9ed8a5cf18881a1c2a6db96a863a7df47862053fa2a951c8d43c9ba7b5f5527a39f0f71a26ccf55fa477fb9c7605eb3352bef71affd1a84879c3
-  data.tar.gz: b2241e34923fa1a102f96957763e3eaac53079f2c71c82a2863aae3a589659bcee0d536e07a92f4912025efd7621b9ca568d5ac988bfcf7af06622e1c93ca3b4
+  metadata.gz: 3fabbafe0cb9d7a3dc19e559f369ffc90a5a11fb3da6388bea46d6a9ea42255973f2b7467fadaa0b6e5d6752e56f788b422f9483612c25aeb581ff18d4b50a6f
+  data.tar.gz: 2caec2a2464df534b68004d4050f7ab1d638c6c5c831b7a172dce582b64b61bf0c23fdd25dc517e316d3868e3d7973e6250735a91e4275f9d4180aacc1f607f7

data/app/models/effective/order.rb

@@ -114,24 +114,40 @@ module Effective
 
     # Effective::Order.new()
     # Effective::Order.new(Product.first)
-    # Effective::Order.new(Product.all)
-    # Effective::Order.new(Product.first, user: User.first)
-    # Effective::Order.new(Product.first, Product.second, user: User.first)
-    # Effective::Order.new(user: User.first)
     # Effective::Order.new(current_cart)
+    # Effective::Order.new(Effective::Order.last)
 
-    # items can be an Effective::Cart, a single acts_as_purchasable, or an array of acts_as_purchasables
-    def initialize(*items, user: nil, billing_address: nil, shipping_address: nil)
-      super() # Call super with no arguments
+    # Effective::Order.new(items: Product.first)
+    # Effective::Order.new(items: [Product.first, Product.second], user: User.first)
+    # Effective::Order.new(items: Product.first, user: User.first, billing_address: Effective::Address.new, shipping_address: Effective::Address.new)
 
-      # Assign user
-      self.user = user || (items.first.user if items.first.kind_of?(Effective::Cart))
+    def initialize(atts = nil, &block)
+      super(purchase_state: EffectiveOrders::PENDING) # Initialize with state: PENDING
 
-      # Assign addresses
-      self.billing_address = billing_address if billing_address
-      self.shipping_address = shipping_address if shipping_address
+      return unless atts.present?
 
-      add(items) if items.present?
+      if atts.kind_of?(Hash)
+        items = Array(atts.delete(:item)) + Array(atts.delete(:items))
+
+        self.user = atts.delete(:user) || (items.first.user if items.first.respond_to?(:user))
+
+        if (address = atts.delete(:billing_address)).present?
+          self.billing_address = address
+          self.billing_address.full_name ||= user.to_s.presence
+        end
+
+        if (address = atts.delete(:shipping_address)).present?
+          self.shipping_address = address
+          self.shipping_address.full_name ||= user.to_s.presence
+        end
+
+        atts.each { |key, value| self.send("#{key}=", value) }
+
+        add(items) if items.present?
+      else # Attributes are not a Hash
+        self.user = atts.user if atts.respond_to?(:user)
+        add(atts)
+      end
     end
 
     # add(Product.first) => returns an Effective::OrderItem
@@ -169,8 +185,7 @@ module Effective
           title: item.title,
           quantity: item.quantity,
           price: item.price,
-          tax_exempt: item.tax_exempt || false,
-          seller_id: (item.purchasable.try(:seller).try(:id) rescue nil)
+          tax_exempt: (item.tax_exempt || false),
         ).tap { |order_item| order_item.purchasable = item.purchasable }
       end
 

data/lib/effective_orders/version.rb

@@ -1,3 +1,3 @@
 module EffectiveOrders
-  VERSION = '3.0.2'.freeze
+  VERSION = '3.0.3'.freeze
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: effective_orders
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Code and Effect
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2019-08-06 00:00:00.000000000 Z
+date: 2019-08-07 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails