flowcommerce_spree 0.0.9 → 0.0.13

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: f47f9a9debf77ea1ca7d10d8a2661a4abac350f3602b98a50686919476038187
-  data.tar.gz: '04964f886f5dab774f4e1631a5ab9c0bda612e35599ad4c639dc7dcee8d7396b'
+  metadata.gz: 4805d4a464c5441b33c467972ef7750f5c350b6748dad10fb5a8d079e0c72b2c
+  data.tar.gz: dd5a4de7ff06de36712c55b4602d5eb6e490939978ec1bc71a15765393478229
 SHA512:
-  metadata.gz: fc5929eff62c6c11b58eed26b580d0cc34c3c51e5a4a81869773a115e5210ac9808e740fb00112de84f5fcc6afc63db404bd97960398bf09d021d588f2624520
-  data.tar.gz: 9311543f7e2b18e55326f1826d7240b6315efed2ac7f81c94c60d4c8236f5d4e5381cbb5e7e956880723d76384cf89b23e8306ac8026c14af36ad16344b8bd56
+  metadata.gz: 465a5624b6a9e4a80732dca72a5d618f1cd14064fb3005212f25f7e9d687c2f2c48ab90992bcae145cb87a8de16bc33c37e5d924c545372fb31f0ff7f90df2d2
+  data.tar.gz: dcfc5356d0954104ab64c0d4da2282fd21cba1600613c84565734d50ed58bd1c1289bd936e3d8624f2703ed80a3e48c7af4ad20442041fb9dc590c3852839b37

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/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/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.13'
 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.13
 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-26 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