solidus_me 3.1.0 → 3.2.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 9db290c638a2d01484e2fa15aab8c66e9aa5aa9d655360b2aa59a290654c9131
-  data.tar.gz: c6f27dc5ad820d3b778805e138b566de84733caa75a1ec0f49d0bbcb21580ecd
+  metadata.gz: 7038411a1992fbe76be03e3ea54363e0a9a53bb813377951dad557aa718f3e09
+  data.tar.gz: 710ff6fccbe6dd9c9419fae66cd9ae77e14acb44f7a6a559f5b046d2651e670a
 SHA512:
-  metadata.gz: 69fbcd15348fe78ff501e5245558da1be4156a298889a4afb347f70350d99cd4d857f5ae3445de1d5d02e4e4bbfd3f945b56cd62bb328776fd344cd98d3f1569
-  data.tar.gz: 229e6ce800fb87c1330033303358ac7ae6f5ca41eb934e5da7dbdeb60c6a913d968dcc2047696da70a6b094f47c9870c0b69f6d9f936ac6dd299b4bc0d0d267e
+  metadata.gz: 3d1d04d17d6f872b078bcd1a038bd048ad766bc8294a5ed075bf08e5f3b60af050234e15be9b92dd8b4040288591b54b04d7fd2406f0e8886f210392744f197c
+  data.tar.gz: bdb62ee68a0920a1cae31658760649bb4c5f6148f09afaa1a4d0920afc77323de282eea87d8ce97b2ffc387ad0cd5f09c06a1b8c65c1c51f0a0d029ef7b34142

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.1.0"
+  VERSION = "3.2.0"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_me
 version: !ruby/object:Gem::Version
-  version: 3.1.0
+  version: 3.2.0
 platform: ruby
 authors:
 - Hamilton Tumenas Borges
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-10-11 00:00:00.000000000 Z
+date: 2024-10-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core