flowcommerce_spree 0.0.17 → 0.0.18

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10b41982519fa82948ce03663d36ee56bb19a9efe227a8c723dea3e20614c730
-  data.tar.gz: a9a4ad3ea162660a65208dfd1b86dbc89ab7d9084b7a641a198be685453e7390
+  metadata.gz: a58357f2f4891679ea1b21bf15603d6d61964e1a07d3d4c5259b834207be4605
+  data.tar.gz: 16f2b8a0ba784bfeb3685178f0efe12fbd3ddd963d4e7058c84397f7b4d3ac5f
 SHA512:
-  metadata.gz: b480ab7c7664a2d5526bfa9250b0a5a7dd296d1ce24d3fe602ca3cd6ddce2f4a987077310843c2d181a7f8fab1cc84134f7259f0b547d2f5e6d12d855c1de342
-  data.tar.gz: 01ba4ac9afd4e712436112ea49d538068b4d6192ea64f319580a6ee9340d77048a406f500b073118362c29f4c331ed23cb2a10954ad0399dc66da982bd940e9d
+  metadata.gz: 4fe235560e3132fcd9ed90d4b3e6577af09817f59a79564ad41b2a60477d08158e7fe52ed67eaea28749af87e59c192a5c98c16f360ea48d810dc97396a4fdde
+  data.tar.gz: 0beb3883f44c1b08f520e3a94490b03e960c87fa8be7c41f38399ddbc4ff3db9801e3f47adca93056d6e4e9b2b86c773dfcc670bad6b3954a41279ab6ac472a5

data/app/services/flowcommerce_spree/order_sync.rb

@@ -120,13 +120,33 @@ module FlowcommerceSpree
     def add_item(line_item)
       variant    = line_item.variant
       price_root = variant.flow_data&.dig('exp', @experience, 'prices')&.[](0) || {}
-
+      discount_data = map_discounts(line_item)
       # create flow order line item
-      { center: FLOW_CENTER,
-        number: variant.sku,
-        quantity: line_item.quantity,
-        price: { amount: price_root['amount'] || variant.price,
-                 currency: price_root['currency'] || variant.cost_currency } }
+      res = { center: FLOW_CENTER,
+              number: variant.sku,
+              quantity: line_item.quantity,
+              price: { amount: price_root['amount'] || variant.price,
+                       currency: price_root['currency'] || variant.cost_currency },
+              discounts: {
+                discounts: discount_data
+              } }
+      res
+    end
+
+    def map_discounts(line_item)
+      line_item.adjustments.promotion.eligible.map do |adjustment|
+        {
+          offer: {
+            discriminator: 'discount_offer_fixed',
+            money: {
+              amount: adjustment.amount.to_f,
+              currency: line_item.currency
+            }
+          },
+          target: 'item',
+          label: adjustment.label
+        }
+      end
     end
 
     def write_response_to_order

data/app/services/flowcommerce_spree/order_updater.rb

@@ -63,7 +63,8 @@ module FlowcommerceSpree
         payment.update_column(:identifier, p['id'])
       end
 
-      return if @order.payments.sum(:amount) < @order.amount || @order.state == 'complete'
+      return if @order.completed?
+      return if @order.payments.sum(:amount) < @order.flow_io_total_amount || @order.flow_io_balance_amount > 0
 
       @order.state = 'confirm'
       @order.save!

data/lib/flowcommerce_spree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlowcommerceSpree
-  VERSION = '0.0.17'
+  VERSION = '0.0.18'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.17
+  version: 0.0.18
 platform: ruby
 authors:
 - Aurel Branzeanu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-09-24 00:00:00.000000000 Z
+date: 2021-11-01 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -285,7 +285,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.8
+rubygems_version: 3.0.3
 signing_key: 
 specification_version: 4
 summary: Integration of Spree with Flow API