solidus_me 3.0.1 → 3.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 6c4a738fff9ed84b19c321528752084dc9babb7a0b4d0244c701ef8f4ff70ce4
-  data.tar.gz: b0a0bb227356491430735369efa29905c1ed1ba69ef291a0a0f2e8942aeb7705
+  metadata.gz: 9db290c638a2d01484e2fa15aab8c66e9aa5aa9d655360b2aa59a290654c9131
+  data.tar.gz: c6f27dc5ad820d3b778805e138b566de84733caa75a1ec0f49d0bbcb21580ecd
 SHA512:
-  metadata.gz: 317e8749cf16503be49ede490d313e7db31decf89a182ee980a83f18afe3bc257aff67216956a3a32f4ea83e1e31050124eb8011a5ca547d4a8cc4781a23f20b
-  data.tar.gz: 63e591008b243e92dfa89cedb389a608524840540bd2945e58b4c250ec23ab67b382aafbdcd89dbcdf48459f461c67040a3df60825e079d173a0557b608c894a
+  metadata.gz: 69fbcd15348fe78ff501e5245558da1be4156a298889a4afb347f70350d99cd4d857f5ae3445de1d5d02e4e4bbfd3f945b56cd62bb328776fd344cd98d3f1569
+  data.tar.gz: 229e6ce800fb87c1330033303358ac7ae6f5ca41eb934e5da7dbdeb60c6a913d968dcc2047696da70a6b094f47c9870c0b69f6d9f936ac6dd299b4bc0d0d267e

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?
@@ -18,8 +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
-      shipping_rates = shipping_rates.select { |rate| shipping_methods.include?(rate.shipping_method) }
+      end.compact
 
       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,44 +64,27 @@ 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
+      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
 
-    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/lib/solidus_me/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module SolidusMe
-  VERSION = "3.0.1"
+  VERSION = "3.1.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.1
+  version: 3.1.0
 platform: ruby
 authors:
 - Hamilton Tumenas Borges
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-12 00:00:00.000000000 Z
+date: 2024-10-11 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