shopify_transporter 2.5.0 → 2.5.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9332dbc1df8f90380027783d5e079153d4cb82e0268a46a0e79d2dbfdcc994ba
-  data.tar.gz: 11118012b99e576de3f579d2f04764f67d3b38d3f19e9de9747fd6a66a98813a
+  metadata.gz: 4d00e959d012ed055eda454c043cf1b07575fe40acaf7c8f16610e9cad461597
+  data.tar.gz: 8d7325220f9c1823846535512572f97c095dd6cfa8abd539e730cc257f43980b
 SHA512:
-  metadata.gz: 449e03e75680cad6c9c37df3265c14fb96fa7147db69f923f7f9452ee556cf30086b540b5c3b984f59b2e836a7e6a9affa1c851a112cd4a1fa0e7450aa67e4c5
-  data.tar.gz: 67453eaca770aca247c342540772cfd1cdf96acd2a47470088e64b5546bd73825bb94ce6729332547e09660242a5f21071f994a522a4c8682baef0f231840f1d
+  metadata.gz: a820cae8aabbb4ba0a875fbc1658fc89b1dfcd934f7f9597e76404be6703980d443913793b2789c8ad8cb854ea614be826b7161cde5c9b1dd7b6aef491231832
+  data.tar.gz: d6e94eb60260aac40acd7fab52c94730d1b0fa411d582744e08f566fccac88af713925c3053099cd7c94a2f009f80f8d965851c88e3baf86dd0422cf99af6e83

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

@@ -26,13 +26,25 @@ module ShopifyTransporter
             line_items.group_by { |line_item| line_item['sku'] }.map do |_, associated_items|
               case associated_items.size
               when 1
-                associated_items.first
+                associated_items.first.except('product_type')
               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
+                next line_items_without_type(associated_items) unless should_merge_child_into_parent?(parent, child)
+
+                next parent.merge(child.slice('name')).except('product_type')
+              else
+                next line_items_without_type(associated_items)
+              end
+            end.flatten
+          end
+
+          def should_merge_child_into_parent?(parent, child)
+            parent.present? && child.present? && child['price'].present? && child['price'].to_f == 0
+          end
+
+          def line_items_without_type(line_items)
+            line_items.map { |item| item.except('product_type') }
           end
 
           def line_items_array(input)

data/lib/shopify_transporter/version.rb

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

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: shopify_transporter
 version: !ruby/object:Gem::Version
-  version: 2.5.0
+  version: 2.5.1
 platform: ruby
 authors:
 - Shopify
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2018-12-11 00:00:00.000000000 Z
+date: 2018-12-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: bundler