solidus_me 3.0.0 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 18b2087c7138f439e7653a3c01bb919fec8db078ad8581c9684f8129377c3a51
-  data.tar.gz: c54e202d154f70b7f3124a5d86d6ca7d1af6626979d1ac4beb9672344bb6ea99
+  metadata.gz: 9ee90fa75f6efce0402e68f7992665696df6f0fc0fea34c1098489216bfa462d
+  data.tar.gz: 130f9dec9c6ca3730f25a07e062d22172368967cf752ebce0c131cfbf418c56c
 SHA512:
-  metadata.gz: 65c235b6adc9de111a611df497368e8cee192c1c730812975b0bf5c9fde645d889aa9a9979ecbffd6d18b12d0325c5b928bc55af7832a2c83e934bbf2b138cf0
-  data.tar.gz: f210df49830604944ce755fda0f83a664a088756c9ea89c5158650653ffb2ccfe403ec7e4bccac64b6028590751882d59827cce13087345eabe88b1a0a282a7d
+  metadata.gz: '08327213cb9db79a153e56150d7d70ad364148e28cfa4d92dc2c14e80199b27f1da0dc5e5dda75a78cbda68c49b1ccc70fb364359080130a51d8be0bbd27babd'
+  data.tar.gz: c34ecfaa9435d0603d86e156a1d950463e7e187f59229b69bc1b74f4f09f114e882a9c86222b49eb5d37996f3b5cb286474d1e3b0bd864024a4b9dadf2659700

data/app/models/solidus_me/melhor_envio.rb

@@ -1,13 +1,39 @@
 module SolidusMe
 
   class MelhorEnvio
-    
+    SHIPPING_METHODS = [
+      { name: "Correios PAC", carrier: "Correios", service_level: "PAC", external_id: 1 },
+      { name: "Correios SEDEX", carrier: "Correios", service_level: "SEDEX", external_id: 2 },
+      { name: "Correios Mini Envios", carrier: "Correios", service_level: "Mini Envios", external_id: 17 },
+      { name: "Jadlog .Package", carrier: "Jadlog", service_level: ".Package", external_id: 3 },
+      { name: "Jadlog .Com", carrier: "Jadlog", service_level: ".Com", external_id: 4 }
+    ]
+
     attr_accessor :package, :shipping_methods
     def initialize(package, shipping_methods)
       @package = package
       @shipping_methods = shipping_methods
     end
 
+    def self.generate_code external_id
+      (self.name.underscore + "_#{external_id}").downcase
+    end
+
+    def self.install
+      SHIPPING_METHODS.each do |provider_method|
+        Spree::ShippingMethod.find_or_create_by(code: generate_code(provider_method[:external_id])) do |shipping_method|
+          shipping_method.name = provider_method[:name]
+          shipping_method.carrier = provider_method[:carrier]
+          shipping_method.service_level = provider_method[:service_level]
+          shipping_method.code = generate_code(provider_method[:external_id])
+          shipping_method.calculator = Spree::Calculator::Shipping::FlatRate.create
+          shipping_method.shipping_categories = [Spree::ShippingCategory.first]
+          shipping_method.available_to_users = false
+          shipping_method.provider_id = SolidusTecEstimator::Provider.find_by(class_name: self.to_s).id
+        end
+      end
+    end
+
     def shipping_rates
       @me_account = Account.first
       return [] if @me_account.blank?
@@ -19,7 +45,6 @@ module SolidusMe
       shipping_rates = melhor_envio_rates.map do |melhor_envio_rate|
         build_shipping_rate(melhor_envio_rate, package)
       end
-      shipping_rates = shipping_rates.select { |rate| shipping_methods.include?(rate.shipping_method) }
 
       shipping_rates
     end
@@ -30,13 +55,8 @@ module SolidusMe
       price = package.contents.map { |content| content.price }.sum
       weight = package.weight
 
-      variants = package.contents.map { |content| content.variant }
-      height_cm = height(variants)
-      width_cm = width(variants)
-      length_cm = length(variants)
-
       zipcode = package.order.ship_address.zipcode
-      services = @me_account.services.blank? ? ["SEDEX", "PAC", "Mini Envios", ".Package", ".Com"] : @me_account.services
+      available_shipping_method_codes = @shipping_methods.pluck(:code)
 
       rates = @me_client.rates(
         from: @me_account.postal_code_from,
@@ -44,22 +64,13 @@ module SolidusMe
         weight_kg: (weight / 1000.00),
         contents_value_brl: price
       )
-      rates.select { |rate| rate.price > 0 && services.include?(rate.service_name) }
+      rates.select { |rate| rate.price > 0 && available_shipping_method_codes.include?(self.class.generate_code(rate.id)) }
     rescue
       []
     end
 
     def build_shipping_rate(melhor_envio_rate, package)
-      shipping_method = Spree::ShippingMethod.find_or_create_by(
-        carrier: melhor_envio_rate.carrier_name,
-        service_level: melhor_envio_rate.service_name
-      ) do |shipping_method|
-        shipping_method.name = "#{melhor_envio_rate.carrier_name} #{melhor_envio_rate.service_name}"
-        shipping_method.calculator = Spree::Calculator::Shipping::FlatRate.create
-        shipping_method.shipping_categories = [Spree::ShippingCategory.first]
-        shipping_method.available_to_users = true
-        shipping_method.provider_id = SolidusTecEstimator::Provider.find_by(class_name: self.class.to_s).id
-      end
+      shipping_method = Spree::ShippingMethod.find_by(code: self.class.generate_code(melhor_envio_rate.id))
 
       Spree::ShippingRate.new(
         shipment: package.shipment,
@@ -70,18 +81,6 @@ module SolidusMe
       )
     end
 
-    def height variants
-      variants.pluck(:height, :width, :depth).map(&:max).compact.max
-    end
-
-    def width variants
-      variants.pluck(:height, :width, :depth).map { |dimensions| dimensions.sort[1] }.compact.max
-    end
-
-    def length variants
-      variants.pluck(:height, :width, :depth).map(&:min).compact.sum
-    end
-
   end
 
 end

data/app/models/solidus_me/shipping_estimator.rb

@@ -60,8 +60,8 @@ module SolidusMe
         shipment: package.shipment,
         shipping_method: shipping_method,
         cost: melhor_envio_rate.price,
-        min_delivery_time: melhor_envio_rate.delivery_range["min"],
-        max_delivery_time: melhor_envio_rate.delivery_range["max"]
+        min_delivery_time: (Time.now + melhor_envio_rate.delivery_range["min"].days),
+        max_delivery_time: (Time.now + melhor_envio_rate.delivery_range["max"].days)
       )
     end
 

data/lib/solidus_me/version.rb

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

metadata

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