flowcommerce_spree 0.0.17 → 0.0.20

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 10b41982519fa82948ce03663d36ee56bb19a9efe227a8c723dea3e20614c730
-  data.tar.gz: a9a4ad3ea162660a65208dfd1b86dbc89ab7d9084b7a641a198be685453e7390
+  metadata.gz: c53cdffe59a872bd84ce53aedf0765dff2f282a09114b49da5835ce16b612eb6
+  data.tar.gz: c4279e859c545ce2b7e212fb388b461956aa53ce26fa85db352395e4d9ade47e
 SHA512:
-  metadata.gz: b480ab7c7664a2d5526bfa9250b0a5a7dd296d1ce24d3fe602ca3cd6ddce2f4a987077310843c2d181a7f8fab1cc84134f7259f0b547d2f5e6d12d855c1de342
-  data.tar.gz: 01ba4ac9afd4e712436112ea49d538068b4d6192ea64f319580a6ee9340d77048a406f500b073118362c29f4c331ed23cb2a10954ad0399dc66da982bd940e9d
+  metadata.gz: 29b8e1d3af99d46c5bf9830c790f7a16f8ebd3abe7ab213ff9dcfec690fd629769696bf27edb5eef1475aead7a74e3a1fa8fb658161def03bd77478952692e79
+  data.tar.gz: 2a68a12590e79515fbe94f5a2a1bafc035eda7059895cbf4c475396b3b9f31400c889356ef540650f4675269c8078227665816c3192cde811d84a3152fc38ad1

data/app/helpers/spree/core/controller_helpers/flow_io_order_helper_decorator.rb

@@ -26,8 +26,8 @@ module Spree
 
           attrs_to_update = {}
 
-          # Update last_ip_address only for a new request_id
-          attrs_to_update = { last_ip_address: ip_address } if @request_id != request_id
+          # Update last_ip_address only when last_ip_address is different.
+          attrs_to_update = { last_ip_address: ip_address } if @current_order.last_ip_address != ip_address
 
           # :meta is a jsonb column costly to update every time, especially with all the flow.io data, that's why
           # here it is updated only if no zone_id there was inside :meta

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,16 @@ module FlowcommerceSpree
         payment.update_column(:identifier, p['id'])
       end
 
-      return if @order.payments.sum(:amount) < @order.amount || @order.state == 'complete'
+      if @order.payments.blank?
+        payment_method = Spree::PaymentMethod.find_by type: 'Spree::Gateway::FlowIo'
+        placeholder_payment = Spree::Payment.new(amount: @order.flow_io_total_amount, order: @order,
+                                                 source: nil, payment_method_id: payment_method.id, state: 'pending')
+        @order.payments << placeholder_payment
+        @order.save
+      end
+
+      return if @order.completed?
+      return if @order.payments.sum(:amount) < @order.flow_io_total_amount
 
       @order.state = 'confirm'
       @order.save!

data/app/services/flowcommerce_spree/webhooks/capture_upserted_v2.rb

@@ -54,7 +54,7 @@ module FlowcommerceSpree
 
       def map_payment_captures_to_spree(order, payments)
         order.flow_data['captures']&.each do |c|
-          next unless (payment = captured_payment(payments, c))
+          next unless (payment = captured_payment(payments, c, order))
 
           payment.capture_events.create!(amount: c['amount'], meta: { 'flow_data' => { 'id' => c['id'] } })
           return if payment.completed? || payment.capture_events.sum(:amount) < payment.amount
@@ -68,10 +68,18 @@ module FlowcommerceSpree
         FlowcommerceSpree::OrderUpdater.new(order: order).finalize_order
       end
 
-      def captured_payment(flow_order_payments, capture)
+      def captured_payment(flow_order_payments, capture, order)
         return unless capture['status'] == 'succeeded'
-
         auth = capture.dig('authorization', 'id')
+        payment = order.payments.first
+
+        if flow_order_payments.blank? && payment.response_code.blank?
+          payment.response_code = capture.dig('authorization', 'key')
+          payment.identifier = capture.dig('authorization', 'key')
+          payment.save
+          return payment
+        end
+
         return unless flow_order_payments&.find { |p| p['reference'] == auth }
 
         return unless (payment = Spree::Payment.find_by(response_code: auth))

data/lib/flowcommerce_spree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlowcommerceSpree
-  VERSION = '0.0.17'
+  VERSION = '0.0.20'
 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.20
 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: 2022-03-17 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.1
 signing_key: 
 specification_version: 4
 summary: Integration of Spree with Flow API