flowcommerce_spree 0.0.13 → 0.0.17

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 4805d4a464c5441b33c467972ef7750f5c350b6748dad10fb5a8d079e0c72b2c
-  data.tar.gz: dd5a4de7ff06de36712c55b4602d5eb6e490939978ec1bc71a15765393478229
+  metadata.gz: 10b41982519fa82948ce03663d36ee56bb19a9efe227a8c723dea3e20614c730
+  data.tar.gz: a9a4ad3ea162660a65208dfd1b86dbc89ab7d9084b7a641a198be685453e7390
 SHA512:
-  metadata.gz: 465a5624b6a9e4a80732dca72a5d618f1cd14064fb3005212f25f7e9d687c2f2c48ab90992bcae145cb87a8de16bc33c37e5d924c545372fb31f0ff7f90df2d2
-  data.tar.gz: dcfc5356d0954104ab64c0d4da2282fd21cba1600613c84565734d50ed58bd1c1289bd936e3d8624f2703ed80a3e48c7af4ad20442041fb9dc590c3852839b37
+  metadata.gz: b480ab7c7664a2d5526bfa9250b0a5a7dd296d1ce24d3fe602ca3cd6ddce2f4a987077310843c2d181a7f8fab1cc84134f7259f0b547d2f5e6d12d855c1de342
+  data.tar.gz: 01ba4ac9afd4e712436112ea49d538068b4d6192ea64f319580a6ee9340d77048a406f500b073118362c29f4c331ed23cb2a10954ad0399dc66da982bd940e9d

data/app/controllers/flowcommerce_spree/orders_controller.rb

@@ -5,6 +5,8 @@ module FlowcommerceSpree
     wrap_parameters false
 
     skip_before_action :setup_tracking, only: :order_completed
+    skip_before_action :prepare_order
+    skip_before_action :before_render
 
     # proxy enpoint between flow and thankyou page.
     # /flow/order_completed endpoint
@@ -14,7 +16,11 @@ module FlowcommerceSpree
       flow_updater = FlowcommerceSpree::OrderUpdater.new(order: order)
       flow_updater.complete_checkout
 
-      redirect_to "/thankyou?order=#{params[:order]}&t=#{params[:t]}"
+      redirection_path = "/thankyou?order=#{params[:order]}&t=#{params[:t]}"
+      locale = order.locale_path
+      redirection_path = "/#{locale}#{redirection_path}" if locale
+
+      redirect_to redirection_path
     end
   end
 end

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

@@ -6,6 +6,7 @@ module Spree
       class FlowIo < ShippingCalculator
         preference :lower_boundary, :decimal, default: 100
         preference :charge_default, :decimal, default: 15
+        preference :sample_product_cost, :decimal, default: 9
 
         def self.description
           'FlowIO Calculator'
@@ -26,6 +27,10 @@ module Spree
           preferred_lower_boundary
         end
 
+        def default_sample_charge
+          preferred_sample_product_cost
+        end
+
         private
 
         def flow_order(package)

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

@@ -5,7 +5,9 @@
 module Spree
   class Gateway
     class FlowIo < Gateway
+      REFUND_VALID_STATES = %w[succeeded pending].freeze
       REFUND_SUCCESS = 'succeeded'
+      REFUND_PENDING = 'pending'
 
       def provider_class
         self.class
@@ -59,13 +61,17 @@ module Spree
         ActiveMerchant::Billing::Response.new(false, e.to_s, {}, {})
       end
 
-      def void(authorization_id, _source, options = {})
+      def void(authorization_id, options = {})
         amount = (options[:subtotal] + options[:shipping]) * 0.01
-        reversal_form = Io::Flow::V0::Models::ReversalForm.new(key: options[:order_id],
-                                                               authorization_id: authorization_id,
-                                                               amount: amount,
-                                                               currency: options[:currency])
-        FlowcommerceSpree.client.reversals.post(FlowcommerceSpree::ORGANIZATION, reversal_form)
+        order = Spree::Order.find_by(number: options[:order_id].split('-').first)
+        refund_form = Io::Flow::V0::Models::RefundForm.new(order_number: order.number,
+                                                           amount: amount,
+                                                           currency: options[:currency],
+                                                           authorization_id: authorization_id)
+        response = FlowcommerceSpree.client.refunds.post(FlowcommerceSpree::ORGANIZATION, refund_form)
+        validate_flow_refund_response(response, order)
+
+        ActiveMerchant::Billing::Response.new(true, 'flow-payment-void', {}, {})
       end
 
       def create_profile(payment)
@@ -89,19 +95,31 @@ module Spree
                                                            amount: amount,
                                                            currency: order.currency)
         response = FlowcommerceSpree.client.refunds.post(FlowcommerceSpree::ORGANIZATION, refund_form)
+        result = validate_flow_refund_response(response, order)
+        result
+      end
+
+      def validate_flow_refund_response(response, order)
         response_status = response.status.value
-        if response_status == REFUND_SUCCESS
+        if REFUND_VALID_STATES.include? response_status
           add_refund_to_order(response, order)
+          schedule_status_check(response, order)
           ActiveMerchant::Billing::Response.new(true,
                                                 REFUND_SUCCESS,
                                                 response.to_hash,
                                                 authorization: response.authorization.id)
         else
-          msg = "Partial refund fail. Details: #{response_status}"
-          ActiveMerchant::Billing::Response.new(false, msg, {}, {})
+          ActiveMerchant::Billing::Response.new(false, "Partial refund fail. Details: #{response_status}", {}, {})
         end
       end
 
+      def schedule_status_check(response, order)
+        return if response.status.value != REFUND_PENDING
+
+        Rails.logger.warn("[!] #{self.class} for #{order.number} - refund request without succeeded status.")
+        FlowcommerceSpree::RefundStatusWorker.perform_async(order.number, response.key)
+      end
+
       def add_refund_to_order(response, order)
         order.flow_data ||= {}
         order.flow_data['refunds'] ||= []

data/app/services/flowcommerce_spree/order_sync.rb

@@ -54,19 +54,20 @@ module FlowcommerceSpree
     end
 
     def refresh_checkout_token
-      root_url = Rails.application.routes.url_helpers.root_url
       order_number = @order.number
+      root_url = Rails.application.routes.url_helpers.root_url
+      root_url_with_locale = "#{root_url}#{@order.try(:locale_path)}"
       confirmation_url = "#{root_url}flow/order-completed?order=#{order_number}&t=#{@order.guest_token}"
       @order.flow_io_attribute_add('flow_return_url', confirmation_url)
-      @order.flow_io_attribute_add('checkout_continue_shopping_url', root_url)
+      @order.flow_io_attribute_add('checkout_continue_shopping_url', root_url_with_locale)
 
       FlowcommerceSpree.client.checkout_tokens.post_checkout_and_tokens_by_organization(
         FlowcommerceSpree::ORGANIZATION, discriminator: 'checkout_token_reference_form',
                                          order_number: order_number,
                                          session_id: @flow_session_id,
-                                         urls: { continue_shopping: root_url,
+                                         urls: { continue_shopping: root_url_with_locale,
                                                  confirmation: confirmation_url,
-                                                 invalid_checkout: root_url }
+                                                 invalid_checkout: root_url_with_locale }
       )&.id
     end
 

data/app/workers/flowcommerce_spree/refund_status_worker.rb

@@ -0,0 +1,15 @@
+# frozen_string_literal: true
+
+module FlowcommerceSpree
+  class RefundStatusWorker < FlowIoWorker
+    sidekiq_options retry: 3, queue: :flow_io
+
+    def perform(order_number, refund_key)
+      response = FlowcommerceSpree.client.refunds.get_by_key(FlowcommerceSpree::ORGANIZATION, refund_key)
+      response_status = response.status.value
+      return if response_status == 'succeeded'
+
+      raise "Refund with capture pending for order: #{order_number}, refund status: #{response_status}"
+    end
+  end
+end

data/lib/flowcommerce_spree/version.rb

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

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.13
+  version: 0.0.17
 platform: ruby
 authors:
 - Aurel Branzeanu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-26 00:00:00.000000000 Z
+date: 2021-09-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers
@@ -246,6 +246,7 @@ files:
 - 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/refund_status_worker.rb
 - app/workers/flowcommerce_spree/update_payment_capture_worker.rb
 - config/rails_best_practices.yml
 - config/routes.rb