flowcommerce_spree 0.0.9 → 0.0.10

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f47f9a9debf77ea1ca7d10d8a2661a4abac350f3602b98a50686919476038187
-  data.tar.gz: '04964f886f5dab774f4e1631a5ab9c0bda612e35599ad4c639dc7dcee8d7396b'
+  metadata.gz: ad7616da6a9fb5e7fbffe0a8869730ffedacb91deec3a5d08f328d2b876338ad
+  data.tar.gz: 76ffd0d23d05028ba0d24df80fa5a092efe62f0b5f14ddde339e73ede5ee53bc
 SHA512:
-  metadata.gz: fc5929eff62c6c11b58eed26b580d0cc34c3c51e5a4a81869773a115e5210ac9808e740fb00112de84f5fcc6afc63db404bd97960398bf09d021d588f2624520
-  data.tar.gz: 9311543f7e2b18e55326f1826d7240b6315efed2ac7f81c94c60d4c8236f5d4e5381cbb5e7e956880723d76384cf89b23e8306ac8026c14af36ad16344b8bd56
+  metadata.gz: 1eb2b92c39dd528cc4990d9957ee5dba29fbdfa39d7f7a4b821d07a6f5cb366541821b67a6d23ccbc9854b3c3c0867e0cd3fff8b36f64cea627b2fa6d7da47df
+  data.tar.gz: 75175908d8ff3a85ca061ea82890af39544e66bf5898409e0b38d467bc40880eb6ac8e1773263cc5e933ef54d28bf00a2fb1a3f5cddbd935793b92c7fa0e89f2

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

@@ -22,16 +22,25 @@ module FlowcommerceSpree
         errors << { message: 'Order number param missing' } && (return self) unless order_number
 
         if (order = Spree::Order.find_by(number: order_number))
-          upsert_order_captures(order, capture)
-          payments = order.flow_io_payments
-          map_payment_captures_to_spree(order, payments) if payments.present?
-          order
+          if order.payments.any?
+            store_payment_capture(order, capture)
+          else
+            FlowcommerceSpree::UpdatePaymentCaptureWorker.perform_in(1.minute, order.number, capture)
+            order
+          end
         else
           errors << { message: "Order #{order_number} not found" }
           self
         end
       end
 
+      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?
+        order
+      end
+
       private
 
       def upsert_order_captures(order, capture)

data/app/workers/flowcommerce_spree/flow_io_worker.rb

@@ -0,0 +1,16 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  class FlowIoWorker
+    include Sidekiq::Worker
+
+    sidekiq_retries_exhausted do |message, exception|
+      Rails.logger.warn("[!] #{self.class} max attempts reached: #{message} - #{exception}")
+      notification_setting = FlowcommerceSpree::Config.notification_setting
+      return unless notification_setting[:slack].present?
+
+      slack_message = "[#{Rails.env}] #{message}"
+      Slack_client.chat_postMessage(channel: notification_setting[:slack][:channel], text: slack_message)
+    end
+  end
+end

data/app/workers/flowcommerce_spree/import_item_worker.rb

@@ -1,19 +1,9 @@
 # frozen_string_literal: true
 
 module FlowcommerceSpree
-  class ImportItemWorker
-    include Sidekiq::Worker
+  class ImportItemWorker < FlowIoWorker
     sidekiq_options retry: 3, queue: :flow_io
 
-    sidekiq_retries_exhausted do |message, exception|
-      Rails.logger.warn("[!] FlowcommerceSpree::ImportItemWorker max attempts reached: #{message} - #{exception}")
-      notification_setting = FlowcommerceSpree::Config.notification_setting
-      return unless notification_setting[:slack].present?
-
-      slack_message = "[#{Rails.env}] #{message}"
-      Slack_client.chat_postMessage(channel: notification_setting[:slack][:channel], text: slack_message)
-    end
-
     def perform(variant_sku)
       variant = Spree::Variant.find_by sku: variant_sku
       return unless variant

data/app/workers/flowcommerce_spree/update_payment_capture_worker.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  class UpdatePaymentCaptureWorker < FlowIoWorker
+    sidekiq_options retry: 3, queue: :flow_io
+
+    def perform(order_number, capture = {})
+      order = Spree::Order.find_by number: order_number
+      raise 'Order has no payments' if order.payments.empty?
+
+      FlowcommerceSpree::Webhooks::CaptureUpsertedV2.new({ capture: capture }.as_json)
+                                                    .store_payment_capture(order, capture)
+    end
+  end
+end

data/lib/flowcommerce_spree/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.9
+  version: 0.0.10
 platform: ruby
 authors:
 - Aurel Branzeanu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-06-30 00:00:00.000000000 Z
+date: 2021-08-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -244,7 +244,9 @@ files:
 - app/views/spree/admin/promotions/edit.html.erb
 - app/views/spree/admin/shared/_order_summary.html.erb
 - app/views/spree/admin/shared/_order_summary_flow.html.erb
+- app/workers/flowcommerce_spree/flow_io_worker.rb
 - app/workers/flowcommerce_spree/import_item_worker.rb
+- app/workers/flowcommerce_spree/update_payment_capture_worker.rb
 - config/rails_best_practices.yml
 - config/routes.rb
 - db/migrate/20201021160159_add_type_and_meta_to_spree_zone.rb