flowcommerce_spree 0.0.20 → 0.0.22

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: c53cdffe59a872bd84ce53aedf0765dff2f282a09114b49da5835ce16b612eb6
-  data.tar.gz: c4279e859c545ce2b7e212fb388b461956aa53ce26fa85db352395e4d9ade47e
+  metadata.gz: ec0a5ef626881b9f75d419d95352d5e624b6bd798da06273d168e7c9b54fe225
+  data.tar.gz: 07f6c6f731489691d051fda0c3a8bbc756a378837fda6b82c2adb0e264ab93ad
 SHA512:
-  metadata.gz: 29b8e1d3af99d46c5bf9830c790f7a16f8ebd3abe7ab213ff9dcfec690fd629769696bf27edb5eef1475aead7a74e3a1fa8fb658161def03bd77478952692e79
-  data.tar.gz: 2a68a12590e79515fbe94f5a2a1bafc035eda7059895cbf4c475396b3b9f31400c889356ef540650f4675269c8078227665816c3192cde811d84a3152fc38ad1
+  metadata.gz: c2f194a02914aaa4a2e7be9a71b9fa45890eb93622b89e6fd266396daff25f015c1d3c60a051dab87944d85e312a37818e26b167d65693756105ef0743e604b9
+  data.tar.gz: 010a52e55f9b722f1fc318e0b76666170739648e7ec104939cd1acd99ee55a9cddba92bea8d056b625cc7a9e2326e4bf93a7a3a45f655f7b8fb3b515910dd7cb

data/app/models/spree/calculator/flow_io.rb

@@ -27,6 +27,8 @@ module Spree
         response.nil? ? 0 : response['rate']&.to_f
       end
 
+      def get_order_tax_amount(_taxable); end
+
       private
 
       def prev_tax_amount(item)

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,33 +51,31 @@ 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, order))
+          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, order)
-        return unless capture['status'] == 'succeeded'
-        auth = capture.dig('authorization', 'id')
-        payment = order.payments.first
+      def map_payment(payments, capture, order)
+        payments.present? ? captured_payment(payments, capture) : get_payments_from_flow(order, capture)
+      end
 
-        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
+      def captured_payment(flow_order_payments, capture)
+        auth = capture.dig('authorization', 'id')
 
         return unless flow_order_payments&.find { |p| p['reference'] == auth }
 
@@ -88,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.20'
+  VERSION = '0.0.22'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.20
+  version: 0.0.22
 platform: ruby
 authors:
 - Aurel Branzeanu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2022-03-17 00:00:00.000000000 Z
+date: 2022-11-30 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.3.1
+rubygems_version: 3.0.8
 signing_key: 
 specification_version: 4
 summary: Integration of Spree with Flow API