shopify_transporter 2.3.1 → 2.4.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 29372540546b779b2d3a248f7dd2c2079d9a22a2
-  data.tar.gz: b1729a6eea756fceb2871d3a7393170269bc2806
+  metadata.gz: d74afe8f2cffa7be367716d17ee580cb69e793f4
+  data.tar.gz: 5193dbb1507a03df56e4c945f07fedfa29fdc2f1
 SHA512:
-  metadata.gz: 2ed229bfda72b6f2a0bd1173b7c4dfdbd8cb33527b14da1e38e0482c51325f328778bf454942caf3972c8613626e794ffa2979de45070a851ceb64955f9765f2
-  data.tar.gz: 9cc15dd97c160becb4200f49259399f7a879a07b8ca396d4984dc370b1014c4cc10caed7976453fce0e321e16c5190901ca0e9f525c38abdd564c4b57517f097
+  metadata.gz: 3a0fc07d7ab1c33b3d5556c9a3464c5a120b89e71b48072b0579e9098093c20933c29e3a152ba8ea59c678bf4a0952e968c07736babad5418aa90f318a7453ae
+  data.tar.gz: c7d9751cfd089ee8d73383ac09635350a6a72b1555ddd8aec67c23a9b5607d80ff895492e1d0fc49b487857cedeb20a46a8a491363d39d12989542cc3cccdcac

data/lib/shopify_transporter/pipeline/magento/order/line_items.rb

@@ -19,14 +19,24 @@ module ShopifyTransporter
 
           def line_items(input)
             line_items = line_items_array(input)
-            line_items.map { |item| line_item(item) }
+            combine_associated_line_items(line_items.map { |item| line_item(item) })
+          end
+
+          def combine_associated_line_items(line_items)
+            line_items.group_by { |line_item| line_item['sku'] }.map do |_, associated_items|
+              case associated_items.size
+              when 1
+                associated_items.first
+              when 2
+                parent = associated_items.find { |x| x['product_type'] == 'configurable' }
+                child = associated_items.find { |x| x['product_type'] == 'simple' }
+                parent.merge(child.slice('name'))
+              end.except('product_type')
+            end
           end
 
           def line_items_array(input)
-            items_1 = input['items']
-            result = items_1 && items_1['result']
-            items_2 = result && result['items']
-            item = items_2 && items_2['item']
+            item = input.dig('items', 'result', 'items', 'item')
             return [] unless item
             item.is_a?(Array) ? item : [item]
           end
@@ -41,6 +51,7 @@ module ShopifyTransporter
               taxable: taxable?(item),
               fulfillment_status: fulfillment_status(item),
               tax_lines: tax_lines(item),
+              product_type: item['product_type'],
             }.stringify_keys
           end
 

data/lib/shopify_transporter/pipeline/magento/order/shipping_lines.rb

@@ -0,0 +1,41 @@
+# frozen_string_literal: true
+require 'shopify_transporter/pipeline/stage'
+require 'shopify_transporter/shopify'
+
+module ShopifyTransporter
+  module Pipeline
+    module Magento
+      module Order
+        class ShippingLines < Pipeline::Stage
+          def convert(input, record)
+            record.merge(
+              {
+                shipping_lines: shipping_lines(input),
+              }.stringify_keys
+            )
+          end
+
+          private
+
+          def shipping_lines(input)
+            [
+              {
+                code: input['shipping_description'],
+                title: input['shipping_description'],
+                price: input['shipping_amount'],
+                carrier_identifier: input['shipping_method'],
+                tax_lines: shipping_tax_lines(input),
+              }.stringify_keys,
+            ]
+          end
+
+          def shipping_tax_lines(input)
+            return unless input['shipping_tax_amount'].present? && input['shipping_tax_amount'].to_f != 0
+
+            [{ price: input['shipping_tax_amount'] }.stringify_keys]
+          end
+        end
+      end
+    end
+  end
+end

data/lib/shopify_transporter/shopify/customer.rb

@@ -57,12 +57,36 @@ module ShopifyTransporter
       ).freeze
 
       def top_level_row_values
-        base_hash.merge(record_hash.slice(*TOP_LEVEL_ATTRIBUTES)).values
+        return top_level_attributes.values unless able_to_merge_default_address?
+
+        top_level_attributes.merge(default_address.compact).values_at(*Customer.columns)
+      end
+
+      def top_level_attributes
+        base_hash.merge(record_hash.slice(*TOP_LEVEL_ATTRIBUTES))
+      end
+
+      def default_address
+        return {} unless at_least_one_address?
+
+        record_hash['addresses'][0].slice(*ADDRESS_ATTRIBUTES)
+      end
+
+      def at_least_one_address?
+        record_hash['addresses'].present? && record_hash['addresses'][0].present?
+      end
+
+      def able_to_merge_default_address?
+        !top_level_attributes.compact.keys.any? do |key|
+          default_address[key].present? && top_level_attributes[key] != default_address[key]
+        end
       end
 
       def address_row_values
-        return [] unless record_hash['addresses']
-        record_hash['addresses'].map do |address_hash|
+        return [] unless at_least_one_address?
+
+        addresses = able_to_merge_default_address? ? record_hash['addresses'].drop(1) : record_hash['addresses']
+        addresses.map do |address_hash|
           address = address_hash.slice(*ADDRESS_ATTRIBUTES)
           populate_missing_address_attributes!(address)
           row_values_from(address) if self.class.has_values?(address)

data/lib/shopify_transporter/shopify/order.rb

@@ -26,6 +26,8 @@ module ShopifyTransporter
             'Lineitem fulfillment status', 'Tax 1 Title', 'Tax 1 Price', 'Tax 1 Rate', 'Tax 2 Title',
             'Tax 2 Price', 'Tax 2 Rate', 'Tax 3 Title', 'Tax 3 Price', 'Tax 3 Rate',
             'Transaction amount', 'Transaction kind', 'Transaction status',
+            'Shipping line code', 'Shipping line price', 'Shipping line title', 'Shipping line carrier identifier',
+            'Shipping Tax Price',
             'Discount code', 'Discount amount', 'Discount type',
             'Metafield Namespace', 'Metafield Key', 'Metafield Value', 'Metafield Value Type'
           ].to_csv
@@ -47,6 +49,7 @@ module ShopifyTransporter
           csv << top_level_row_values
           line_item_row_values.each { |row| csv << row }
           transaction_row_values.each { |row| csv << row }
+          shipping_line_row_values.each { |row| csv << row }
           discount_row_values.each { |row| csv << row }
           metafield_row_values.each { |row| csv << row }
         end
@@ -82,6 +85,12 @@ module ShopifyTransporter
         code amount type
       )
 
+      SHIPPING_LINE_PREFIX = 'shipping_line_'
+
+      SHIPPING_LINE_ATTRIBUTES = %w(
+        code price title carrier_identifier
+      )
+
       def address_hash_for(address_hash, prefix)
         return {} if address_hash.blank?
 
@@ -111,7 +120,7 @@ module ShopifyTransporter
 
         record_hash['line_items'].map do |line_item_hash|
           line_item = line_item_hash.slice(*LINE_ITEM_ATTRIBUTES)
-            .transform_keys! { |k| "#{LINE_ITEM_PREFIX}#{k}" }
+            .transform_keys { |k| "#{LINE_ITEM_PREFIX}#{k}" }
             .merge(tax_line_hash(line_item_hash))
 
           row_values_from(line_item) if self.class.has_values?(line_item)
@@ -123,7 +132,7 @@ module ShopifyTransporter
 
         record_hash['transactions'].map do |transaction_hash|
           transaction = transaction_hash.slice(*TRANSACTION_ATTRIBUTES)
-            .transform_keys! { |k| "#{TRANSACTION_PREFIX}#{k}" }
+            .transform_keys { |k| "#{TRANSACTION_PREFIX}#{k}" }
 
           row_values_from(transaction) if self.class.has_values?(transaction)
         end.compact
@@ -134,11 +143,33 @@ module ShopifyTransporter
 
         record_hash['discounts'].map do |discount_hash|
           discount = discount_hash.slice(*DISCOUNT_ATTRIBUTES)
-            .transform_keys! { |k| "#{DISCOUNT_PREFIX}#{k}" }
+            .transform_keys { |k| "#{DISCOUNT_PREFIX}#{k}" }
 
           row_values_from(discount) if self.class.has_values?(discount)
         end.compact
       end
+
+      def shipping_line_row_values
+        return [] unless record_hash['shipping_lines']
+
+        record_hash['shipping_lines'].map do |shipping_line_hash|
+          shipping_line = shipping_line_hash.slice(*SHIPPING_LINE_ATTRIBUTES)
+            .transform_keys { |k| "#{SHIPPING_LINE_PREFIX}#{k}" }
+            .merge(shipping_tax_hash(shipping_line_hash))
+
+          row_values_from(shipping_line) if self.class.has_values?(shipping_line)
+        end.compact
+      end
+
+      def shipping_tax_hash(shipping_line_hash)
+        return {} if shipping_line_hash['tax_lines'].blank?
+
+        shipping_line_hash['tax_lines'].map do |tax_line|
+          tax_line.each_with_object({}) do |(key, val), hash|
+            hash["shipping_tax_#{key}"] = val
+          end
+        end.reduce({}, :merge)
+      end
     end
   end
 end

data/lib/shopify_transporter/version.rb

@@ -1,4 +1,4 @@
 # frozen_string_literal: true
 module ShopifyTransporter
-  VERSION = '2.3.1'
+  VERSION = '2.4.0'
 end

data/lib/templates/magento/config.tt

@@ -30,6 +30,7 @@ object_types:
       - AddressesAttribute
       - Transactions
       - Discounts
+      - ShippingLines
 
 extract_configuration:
   soap:

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_transporter
 version: !ruby/object:Gem::Version
-  version: 2.3.1
+  version: 2.4.0
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-10-25 00:00:00.000000000 Z
+date: 2018-10-31 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler
@@ -163,6 +163,7 @@ files:
 - lib/shopify_transporter/pipeline/magento/order/addresses_attribute.rb
 - lib/shopify_transporter/pipeline/magento/order/discounts.rb
 - lib/shopify_transporter/pipeline/magento/order/line_items.rb
+- lib/shopify_transporter/pipeline/magento/order/shipping_lines.rb
 - lib/shopify_transporter/pipeline/magento/order/top_level_attributes.rb
 - lib/shopify_transporter/pipeline/magento/order/transactions.rb
 - lib/shopify_transporter/pipeline/magento/product/top_level_attributes.rb