flowcommerce_spree 0.0.10 → 0.0.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ad7616da6a9fb5e7fbffe0a8869730ffedacb91deec3a5d08f328d2b876338ad
-  data.tar.gz: 76ffd0d23d05028ba0d24df80fa5a092efe62f0b5f14ddde339e73ede5ee53bc
+  metadata.gz: d0e6c714f8986d91af70150c8365f3bde79a15b843151cc84bf5fabd83cf7e87
+  data.tar.gz: 4b0b172606e24bddd55d8254da339af2bf4751b441d918478310835102c9f282
 SHA512:
-  metadata.gz: 1eb2b92c39dd528cc4990d9957ee5dba29fbdfa39d7f7a4b821d07a6f5cb366541821b67a6d23ccbc9854b3c3c0867e0cd3fff8b36f64cea627b2fa6d7da47df
-  data.tar.gz: 75175908d8ff3a85ca061ea82890af39544e66bf5898409e0b38d467bc40880eb6ac8e1773263cc5e933ef54d28bf00a2fb1a3f5cddbd935793b92c7fa0e89f2
+  metadata.gz: 915818b7f7ffd75a3e2adf67d25403b5ea342b0095f2b051d4044ef91c942bee15e2e6b0a235a62f53b7e95af88f6b2626f0a3a58767214e413ad9fc3695a36a
+  data.tar.gz: '048827e500e921d90c3dba7169644a09702f89551be7083820b0d4c337a97a0f513609417dee1f9017f266a8f28bf846dcb5c124262dee7fed03defecbda97fd'

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/lib/flowcommerce_spree/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FlowcommerceSpree
-  VERSION = '0.0.10'
+  VERSION = '0.0.11'
 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.11
 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-08-05 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: active_model_serializers