flowcommerce_spree 0.0.18 → 0.0.21

checksums.yaml

@@ -1,7 +1,4 @@
 ---
-SHA256:
-  metadata.gz: a58357f2f4891679ea1b21bf15603d6d61964e1a07d3d4c5259b834207be4605
-  data.tar.gz: 16f2b8a0ba784bfeb3685178f0efe12fbd3ddd963d4e7058c84397f7b4d3ac5f
 SHA512:
-  metadata.gz: 4fe235560e3132fcd9ed90d4b3e6577af09817f59a79564ad41b2a60477d08158e7fe52ed67eaea28749af87e59c192a5c98c16f360ea48d810dc97396a4fdde
-  data.tar.gz: 0beb3883f44c1b08f520e3a94490b03e960c87fa8be7c41f38399ddbc4ff3db9801e3f47adca93056d6e4e9b2b86c773dfcc670bad6b3954a41279ab6ac472a5
+  metadata.gz: 95290cdfeae1006b8ebedf57d37755bf553c11111d09bb6fb81e856e15672763ecefb751f2a3d928e6e81c27f8a62fdc1c96de562b8b86ecb12c790735b02234
+  data.tar.gz: 6fc0c835d7c0e6fc9ee7e0dd95e6faa4924c81c09f8014cba04c1fb053825157f76415a9f15dc7c4f6b4098344bce937e151da84c359619f34f55dbed5b17cb2

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_updater.rb

@@ -63,8 +63,16 @@ module FlowcommerceSpree
         payment.update_column(:identifier, p['id'])
       end
 
+      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.flow_io_balance_amount > 0
+      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

@@ -36,8 +36,7 @@ module FlowcommerceSpree
 
       def store_payment_capture(order, capture)
         upsert_order_captures(order, capture)
-        payments = order.flow_io_payments
-        map_payment_captures_to_spree(order, payments) if payments.present?
+        map_payment_captures_to_spree(order)
         order
       end
 
@@ -52,26 +51,32 @@ module FlowcommerceSpree
         order.update_column(:meta, order.meta.to_json)
       end
 
-      def map_payment_captures_to_spree(order, payments)
+      def map_payment_captures_to_spree(order)
+        payments = order.flow_io_payments
         order.flow_data['captures']&.each do |c|
-          next unless (payment = captured_payment(payments, c))
+          next unless c['status'] == 'succeeded'
+
+          payment = map_payment(payments, c, order)
+          next unless payment
 
           payment.capture_events.create!(amount: c['amount'], meta: { 'flow_data' => { 'id' => c['id'] } })
           return if payment.completed? || payment.capture_events.sum(:amount) < payment.amount
 
           payment.complete
         end
-
         return if order.completed?
         return unless order.flow_io_captures_sum >= order.flow_io_total_amount && order.flow_io_balance_amount <= 0
 
         FlowcommerceSpree::OrderUpdater.new(order: order).finalize_order
       end
 
-      def captured_payment(flow_order_payments, capture)
-        return unless capture['status'] == 'succeeded'
+      def map_payment(payments, capture, order)
+        payments.present? ? captured_payment(payments, capture) : get_payments_from_flow(order, capture)
+      end
 
+      def captured_payment(flow_order_payments, capture)
         auth = capture.dig('authorization', 'id')
+
         return unless flow_order_payments&.find { |p| p['reference'] == auth }
 
         return unless (payment = Spree::Payment.find_by(response_code: auth))
@@ -80,6 +85,23 @@ module FlowcommerceSpree
 
         payment
       end
+
+      def get_payments_from_flow(order, capture)
+        flow_io_order ||= FlowcommerceSpree.client.orders
+                                           .get_by_number(FlowcommerceSpree::ORGANIZATION, order.number).to_hash
+        return unless flow_io_order[:payments]
+
+        order.flow_data['order']['payments'] = flow_io_order[:payments]
+        attrs_to_update = { meta: order.meta.to_json }
+        attrs_to_update.merge!(order.prepare_flow_addresses)
+        order.update_columns(attrs_to_update)
+        payment = order.payments.first
+        payment.response_code = capture.dig('authorization', 'id')
+        payment.identifier = capture.dig('authorization', 'id')
+        payment.save
+
+        payment
+      end
     end
   end
 end

data/lib/flowcommerce_spree/version.rb

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

metadata

@@ -1,15 +1,15 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.18
+  version: 0.0.21
 platform: ruby
 authors:
 - Aurel Branzeanu
 - Sebastian De Luca
-autorequire: 
+autorequire:
 bindir: bin
 cert_chain: []
-date: 2021-11-01 00:00:00.000000000 Z
+date: 2022-03-29 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -270,7 +270,7 @@ homepage: https://github.com/mejuri-inc/flowcommerce_spree
 licenses:
 - MIT
 metadata: {}
-post_install_message: 
+post_install_message:
 rdoc_options: []
 require_paths:
 - lib
@@ -285,8 +285,8 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.0.3
-signing_key: 
+rubygems_version: 3.0.9
+signing_key:
 specification_version: 4
 summary: Integration of Spree with Flow API
 test_files: []