flowcommerce_spree 0.0.10 → 0.0.14

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad7616da6a9fb5e7fbffe0a8869730ffedacb91deec3a5d08f328d2b876338ad
-  data.tar.gz: 76ffd0d23d05028ba0d24df80fa5a092efe62f0b5f14ddde339e73ede5ee53bc
+  metadata.gz: 78bcd2ec2168ade147fb11d14e8a8f94a30133a0f6fa2df225c3abd0cbb7a7ff
+  data.tar.gz: fc255f7fc844d6209cd852c84a8f86db9cb97b3ad8d1e80586e5f692ec51a055
 SHA512:
-  metadata.gz: 1eb2b92c39dd528cc4990d9957ee5dba29fbdfa39d7f7a4b821d07a6f5cb366541821b67a6d23ccbc9854b3c3c0867e0cd3fff8b36f64cea627b2fa6d7da47df
-  data.tar.gz: 75175908d8ff3a85ca061ea82890af39544e66bf5898409e0b38d467bc40880eb6ac8e1773263cc5e933ef54d28bf00a2fb1a3f5cddbd935793b92c7fa0e89f2
+  metadata.gz: 15778423ce300091577ff41aad2c639da5ddb59421db10cf37e7844a9c74997220a0864788675a98d81c330f2fa800fe7ee38bcf703cb813333f2cf99af01687
+  data.tar.gz: 8b0795bf474136c0c7abd383933b2d809e6e1efc26e00b4c40164f389d707d50c75e7c6f950fc3285d3fc898a7442c2555dfc6d959b067b5a8851c7c9a56fc63

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

@@ -14,7 +14,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/flow_io_product_decorator.rb

@@ -28,9 +28,9 @@ module Spree
       flow_data["#{flow_exp.key}.excluded"].to_i != 1
     end
 
-    def price_range(product_zone)
+    def price_range(product_zone, currencies = [])
       prices = {}
-      master_prices.each do |p|
+      master_prices_with_currencies(currencies).each do |p|
         currency = p.currency
         min = nil
         max = nil
@@ -40,15 +40,15 @@ module Spree
             price = v.price_in(currency)
             next if price.nil? || price.amount.nil?
 
-            min = price if min.nil? || min.amount > price.amount
-            max = price if max.nil? || max.amount < price.amount
+            min = [price, min].compact.min { |a, b| a.amount <=> b.amount }
+            max = [price, max].compact.max { |a, b| a.amount <=> b.amount }
           end
         else
           min = max = master.price_in(currency)
         end
 
-        rmin = min&.amount&.to_s(:rounded, precision: 0) || 0
-        rmax = max&.amount&.to_s(:rounded, precision: 0) || 0
+        rmin = round_with_precision(min, 0)
+        rmax = round_with_precision(max, 0)
 
         prices[currency] = { min: rmin, max: rmax }
       end
@@ -56,6 +56,10 @@ module Spree
       add_flow_price_range(prices, product_zone)
     end
 
+    def round_with_precision(number, precision)
+      number&.amount&.to_s(:rounded, precision: precision) || 0
+    end
+
     def add_flow_price_range(prices, product_zone)
       flow_experience_key = product_zone&.flow_data&.[]('key')
       return prices if flow_experience_key.blank?
@@ -70,8 +74,8 @@ module Spree
           price = v.flow_local_price(flow_experience_key)
           next if price.amount.nil? || price.currency != currency
 
-          min = price if min.nil? || min.amount > price.amount
-          max = price if max.nil? || max.amount < price.amount
+          min = [price, min].compact.min { |a, b| a.amount <=> b.amount }
+          max = [price, max].compact.max { |a, b| a.amount <=> b.amount }
         end
       end
 
@@ -80,8 +84,8 @@ module Spree
         max ||= master_price
       end
 
-      rmin = min&.amount&.to_s(:rounded, precision: 0) || 0
-      rmax = max&.amount&.to_s(:rounded, precision: 0) || 0
+      rmin = round_with_precision(min, 0)
+      rmax = round_with_precision(max, 0)
 
       prices[currency] = { min: rmin, max: rmax }
       prices

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.10'
+  VERSION = '0.0.14'
 end

metadata

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