solidus_me 3.0.2 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9ee90fa75f6efce0402e68f7992665696df6f0fc0fea34c1098489216bfa462d
-  data.tar.gz: 130f9dec9c6ca3730f25a07e062d22172368967cf752ebce0c131cfbf418c56c
+  metadata.gz: 7038411a1992fbe76be03e3ea54363e0a9a53bb813377951dad557aa718f3e09
+  data.tar.gz: 710ff6fccbe6dd9c9419fae66cd9ae77e14acb44f7a6a559f5b046d2651e670a
 SHA512:
-  metadata.gz: '08327213cb9db79a153e56150d7d70ad364148e28cfa4d92dc2c14e80199b27f1da0dc5e5dda75a78cbda68c49b1ccc70fb364359080130a51d8be0bbd27babd'
-  data.tar.gz: c34ecfaa9435d0603d86e156a1d950463e7e187f59229b69bc1b74f4f09f114e882a9c86222b49eb5d37996f3b5cb286474d1e3b0bd864024a4b9dadf2659700
+  metadata.gz: 3d1d04d17d6f872b078bcd1a038bd048ad766bc8294a5ed075bf08e5f3b60af050234e15be9b92dd8b4040288591b54b04d7fd2406f0e8886f210392744f197c
+  data.tar.gz: bdb62ee68a0920a1cae31658760649bb4c5f6148f09afaa1a4d0920afc77323de282eea87d8ce97b2ffc387ad0cd5f09c06a1b8c65c1c51f0a0d029ef7b34142

data/app/models/solidus_me/melhor_envio.rb

@@ -44,7 +44,7 @@ module SolidusMe
       melhor_envio_rates = get_rates_from_melhor_envio(package)
       shipping_rates = melhor_envio_rates.map do |melhor_envio_rate|
         build_shipping_rate(melhor_envio_rate, package)
-      end
+      end.compact
 
       shipping_rates
     end
@@ -70,14 +70,18 @@ module SolidusMe
     end
 
     def build_shipping_rate(melhor_envio_rate, package)
+      return unless melhor_envio_rate.max_delivery_time
       shipping_method = Spree::ShippingMethod.find_by(code: self.class.generate_code(melhor_envio_rate.id))
+      estimate_prose = "Chegará em até #{ActionController::Base.helpers.pluralize(melhor_envio_rate.max_delivery_time, "dia", plural: "dias")} úteis"
 
       Spree::ShippingRate.new(
         shipment: package.shipment,
         shipping_method: shipping_method,
         cost: melhor_envio_rate.price,
-        min_delivery_time: (Time.now + melhor_envio_rate.delivery_range["min"].days),
-        max_delivery_time: (Time.now + melhor_envio_rate.delivery_range["max"].days)
+        min_delivery_time: melhor_envio_rate.min_delivery_time.business_days.from_now,
+        max_delivery_time: melhor_envio_rate.max_delivery_time.business_days.from_now,
+        estimate_prose: estimate_prose,
+        expires_in: Time.now + 2.hours
       )
     end
 

data/app/models/solidus_me/shipping_estimator.rb

@@ -32,7 +32,8 @@ module SolidusMe
       length_cm = length(variants)
 
       zipcode = package.order.ship_address.zipcode
-      services = @me_account.services.blank? ? ["SEDEX", "PAC", "Mini Envios", ".Package", ".Com"] : @me_account.services
+      services = @me_account.services.presence || ["SEDEX", "PAC", "Mini Envios", ".Package",
+                                                   ".Com"]
 
       rates = @me_client.rates(
         from: @me_account.postal_code_from,
@@ -41,7 +42,7 @@ module SolidusMe
         contents_value_brl: price
       )
       rates.select { |rate| rate.price > 0 && services.include?(rate.service_name) }
-    rescue
+    rescue StandardError
       [default_rate]
     end
 
@@ -55,35 +56,40 @@ module SolidusMe
         shipping_method.shipping_categories = Spree::ShippingCategory.all
         shipping_method.available_to_users = true
       end
+      estimate_prose = "Chegará em até #{ActionController::Base.helpers.pluralize(melhor_envio_rate.max_delivery_time,
+        'dia', plural: 'dias')} úteis"
 
       Spree::ShippingRate.new(
         shipment: package.shipment,
         shipping_method: shipping_method,
         cost: melhor_envio_rate.price,
-        min_delivery_time: (Time.now + melhor_envio_rate.delivery_range["min"].days),
-        max_delivery_time: (Time.now + melhor_envio_rate.delivery_range["max"].days)
+        min_delivery_time: melhor_envio_rate.min_delivery_time.business_days.from_now,
+        max_delivery_time: melhor_envio_rate.max_delivery_time.business_days.from_now,
+        estimate_prose: estimate_prose,
+        expires_in: Time.now + 2.hours
       )
     end
 
     def default_rate
-      default_rate = Data.define(:price, :service_name, :carrier_name, :delivery_range)
+      default_rate = Data.define(:price, :service_name, :carrier_name, :min_delivery_time, :max_delivery_time)
       default_rate.new(
         price: 15.00,
         service_name: "",
         carrier_name: "Frete padrão",
-        delivery_range: {"min" => 5, "max" => 5}
+        min_delivery_time: 5,
+        max_delivery_time: 7,
       )
     end
 
-    def height variants
+    def height(variants)
       variants.pluck(:height, :width, :depth).map(&:max).compact.max
     end
 
-    def width variants
+    def width(variants)
       variants.pluck(:height, :width, :depth).map { |dimensions| dimensions.sort[1] }.compact.max
     end
 
-    def length variants
+    def length(variants)
       variants.pluck(:height, :width, :depth).map(&:min).compact.sum
     end
   end

data/lib/solidus_me/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusMe
-  VERSION = "3.0.2"
+  VERSION = "3.2.0"
 end

data/lib/solidus_me.rb

@@ -2,6 +2,7 @@
 
 require "me_api"
 require "solidus_brazilian_adaptations"
+require "business_time"
 require "solidus_me/configuration"
 require "solidus_me/version"
 require "solidus_me/engine"

data/solidus_me.gemspec

@@ -32,6 +32,7 @@ Gem::Specification.new do |spec|
   spec.add_dependency "solidus_support", "~> 0.5"
   spec.add_dependency "me_api"
   spec.add_dependency "solidus_brazilian_adaptations"
+  spec.add_dependency "business_time"
 
   spec.add_development_dependency "solidus_dev_support", "~> 2.7"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_me
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.2.0
 platform: ruby
 authors:
 - Hamilton Tumenas Borges
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-09-11 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -72,6 +72,20 @@ dependencies:
     - - ">="
       - !ruby/object:Gem::Version
         version: '0'
+- !ruby/object:Gem::Dependency
+  name: business_time
+  requirement: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
+  type: :runtime
+  prerelease: false
+  version_requirements: !ruby/object:Gem::Requirement
+    requirements:
+    - - ">="
+      - !ruby/object:Gem::Version
+        version: '0'
 - !ruby/object:Gem::Dependency
   name: solidus_dev_support
   requirement: !ruby/object:Gem::Requirement