flowcommerce_spree 0.0.11 → 0.0.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: d0e6c714f8986d91af70150c8365f3bde79a15b843151cc84bf5fabd83cf7e87
-  data.tar.gz: 4b0b172606e24bddd55d8254da339af2bf4751b441d918478310835102c9f282
+  metadata.gz: 8ed3330958e03459888c682dd28c10106da11922d09009f661d3e8d1a29d32a4
+  data.tar.gz: ae942f91846355379eac2fb8a54b8ca6156c749b20732137250c35e3a2cc605f
 SHA512:
-  metadata.gz: 915818b7f7ffd75a3e2adf67d25403b5ea342b0095f2b051d4044ef91c942bee15e2e6b0a235a62f53b7e95af88f6b2626f0a3a58767214e413ad9fc3695a36a
-  data.tar.gz: '048827e500e921d90c3dba7169644a09702f89551be7083820b0d4c337a97a0f513609417dee1f9017f266a8f28bf846dcb5c124262dee7fed03defecbda97fd'
+  metadata.gz: cc69d6f4e090cf11bdd80f95f7534451ae060b862f896ac0fbeff276f51b98a672cb7132245408fe97393c8cc118cba8917ee570f530d20534d0a375697e423e
+  data.tar.gz: 73b06be7f5ef0d6db3532e992f7f3daba0eb71e9a65e3d72b25ba5a4044630213781979cc74e768689f1f729180f46064e41d581ff4ab50f3957100319ed6e32

data/app/controllers/concerns/current_zone_loader_decorator.rb

@@ -6,14 +6,18 @@ CurrentZoneLoader.module_eval do
   def current_zone
     return @current_zone if defined?(@current_zone)
 
-    @current_zone = if (session_region_name = session['region']&.[]('name'))
+    @current_zone = if (session_region_name = session['region']&.[](:name))
                       Spree::Zones::Product.find_by(name: session_region_name, status: 'active')
                     end
 
-    @current_zone ||= if request_iso_code.present?
-                        @current_zone = flow_zone
-                        @current_zone ||= Spree::Country.find_by(iso: request_iso_code)&.product_zones&.active&.first
-                      end
+    @current_zone ||= fetch_current_zone
+    @current_zone
+  end
+
+  def fetch_current_zone
+    if request_iso_code.present?
+      @current_zone = flow_zone || Spree::Country.find_by(iso: request_iso_code)&.product_zones&.active&.first
+    end
 
     @current_zone ||= Spree::Zones::Product.find_by(name: 'International') ||
                       Spree::Zones::Product.new(name: 'International', taxon_ids: [], currencies: %w[USD CAD])
@@ -21,8 +25,8 @@ CurrentZoneLoader.module_eval do
     current_zone_name = @current_zone.name
     session['region'] = { name: current_zone_name, available_currencies: @current_zone.available_currencies,
                           request_iso_code: request_iso_code }
-
     Rails.logger.debug("Using product zone: #{current_zone_name}")
+
     @current_zone
   end
 

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/controllers/users/sessions_controller_decorator.rb

@@ -11,7 +11,9 @@ module Users
         FlowcommerceSpree::OrderSync.new(order: current_order, flow_session_id: flow_session_id).synchronize!
       return render json: { error: :checkout_token_missing }, status: 422 if checkout_token.blank?
 
-      render json: { checkout_url: "https://checkout.flow.io/tokens/#{checkout_token}" }, status: 200
+      checkout_url = ENV['FLOW_CHECKOUT_URL'] || 'https://checkout.flow.io'
+
+      render json: { checkout_url: "#{checkout_url}/tokens/#{checkout_token}" }, status: 200
     end
 
     private

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
@@ -90,18 +92,25 @@ module Spree
                                                            currency: order.currency)
         response = FlowcommerceSpree.client.refunds.post(FlowcommerceSpree::ORGANIZATION, refund_form)
         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.11'
+  VERSION = '0.0.15'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: flowcommerce_spree
 version: !ruby/object:Gem::Version
-  version: 0.0.11
+  version: 0.0.15
 platform: ruby
 authors:
 - Aurel Branzeanu
@@ -9,7 +9,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-08-05 00:00:00.000000000 Z
+date: 2021-09-03 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