zanders 1.1.3 → 1.1.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 269b12e1e124d14cf438fb40a13b30ae9c435eb7
-  data.tar.gz: 458ec56b48e881fcae15e08d97fc8701593e6545
+  metadata.gz: f322c5bca40309ab0cb1a548e4dbe213c67377a2
+  data.tar.gz: 5467c31791ce482cde3eb8b606348b500c6833c4
 SHA512:
-  metadata.gz: 56afce793cf465d7ca30052688ef44b69f6f13bfe36f02388d656fe6c715976bb7140973614ecd599d7f27d049965f432a62522631fb60536cb9b991c9e009b4
-  data.tar.gz: 487a7835f118e60692788d3bd332d2ba4cf2f0988c2333ba2bf6f03709f749c8aa85612d0763f479b9f649f3cebd42b86fc70c3ffb521ed3e5d32e6c83d078d7
+  metadata.gz: 8bf5de21a653979d233fdf9fe48d0f155f98cc8b64fa4766afe197824865d52f40e2521ce43bd1bbc86527c68a8af24551ac3f6290e6476fcbb567741272f9f1
+  data.tar.gz: d1f380b3f62c5ab9df6beea23d62f144c00b3c33faa31f10252958c3760f5b3ce8c8a6c8bb1ebcda41135863ec0cf9ecb84b16330e76f5258ca3163b1f8d2317

data/lib/zanders/order.rb

@@ -39,9 +39,11 @@ module Zanders
     # purchase_order - internal identifier for the order
     #
     # Returns an order_number
-    def create_order(items, address, purchase_order, details = {})
+    def create_order(items, address, purchase_order_number, details = {})
       order = build_order_data
-      order_items = Array.new
+      order_items   = Array.new
+      order[:order] = Hash.new
+      shipping_information = Array.new
 
       items.each do |item|
         order_items.push(item: [
@@ -51,50 +53,59 @@ module Zanders
         ])
       end
 
-      ship_to_number = Zanders::Address.ship_to_number(address, @options)
+      shipping_information.push(*[
+        { key: 'shipDate', value: Time.now.strftime("%Y-%m-%d") },
+        { key: 'shipViaCode', value: 'UG' },
+        { key: 'purchaseOrderNumber', value: purchase_order_number }
+      ])
 
-      if ship_to_number[:success]
-        shipping_information = [
-          { key: 'shipToNo', value: ship_to_number[:ship_to_number] },
-          { key: 'shipDate', value: Time.now.strftime("%Y-%m-%d") },
-          { key: 'shipViaCode', value: 'UG' },
-          { key: 'purchaseOrderNumber', value: purchase_order }
-        ]
+      if address[:fflno].present?
+        ship_to_number = Zanders::Address.ship_to_number(address, @options)
 
-        if details[:name]
-          shipping_information.push(
-            { key: 'shipInstructions', value: format_shipping_instructions(details[:name], details[:phone_number]) }
-          )
+        if ship_to_number[:success]
+          shipping_information.push({key: 'shipToNo', value: ship_to_number[:ship_to_number] })
         end
+      else
+        shipping_information.push(*[
+          { key: 'shipToAddress1',  value: address[:address1] },
+          { key: 'shipToAddress2',  value: address[:address2] },
+          { key: 'shipToCity',      value: address[:city]     },
+          { key: 'shipToState',     value: address[:state]    },
+          { key: 'shipToZip',       value: address[:zip]      }
+        ])
+      end
 
-        # NOTE-david
-        # order(ns2 map)
-        #   item
-        #     key
-        #     value(ns2map)
-        #       item  - order item
-        #       item  - order item
-        #   item
-        #     "
-        #   
-        order[:order] = Hash.new
-        order[:order][:item] = shipping_information
-
-        order_items = {item: order_items, attributes!: { item: { "xsi:type" => "ns2:Map"}, value: {"SOAP-ENC:arrayType" => "ns2:Map[2]", "xsi:type" => "SOAP-ENV:Array"} }}
-
-        order[:order][:item].push({
-          key: 'items',
-          value: order_items
-        })
-
-        response = soap_client(ORDER_API_URL).call(:create_order, message: order)
-        response = response.body[:create_order_response][:return][:item]
-
-        if response.first[:value] == "0"
-          { success: true, order_number: response.last[:value] }
-        else
-          { success: false, error_code: response.first[:value] }
-        end
+      if details[:name]
+        shipping_information.push(
+          { key: 'shipInstructions', value: format_shipping_instructions(details[:name], details[:phone_number]) }
+        )
+      end
+
+      # NOTE-david
+      # order(ns2 map)
+      #   item
+      #     key
+      #     value(ns2map)
+      #       item  - order item
+      #       item  - order item
+      #   item
+      #     "
+      #
+      order_items = {item: order_items, attributes!: { item: { "xsi:type" => "ns2:Map"}, value: {"SOAP-ENC:arrayType" => "ns2:Map[2]", "xsi:type" => "SOAP-ENV:Array"} }}
+      order[:order][:item] = shipping_information
+
+      order[:order][:item].push({
+        key: 'items',
+        value: order_items
+      })
+
+      response = soap_client(ORDER_API_URL).call(:create_order, message: order)
+      response = response.body[:create_order_response][:return][:item]
+
+      if response.first[:value] == "0"
+        { success: true, order_number: response.last[:value] }
+      else
+        { success: false, error_code: response.first[:value] }
       end
     end
 

data/lib/zanders/version.rb

@@ -1,3 +1,3 @@
 module Zanders
-  VERSION = "1.1.3"
+  VERSION = "1.1.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: zanders
 version: !ruby/object:Gem::Version
-  version: 1.1.3
+  version: 1.1.4
 platform: ruby
 authors:
 - David Knight
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2017-07-26 00:00:00.000000000 Z
+date: 2017-08-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: nokogiri