solidus_tec_estimator 1.0.2 → 1.0.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec04ac8776ab72173ed80d8e4c94ec6f7f96e09e67fb05f86588d680fe2cdaa3
-  data.tar.gz: 7f0019e36d4c414e1489b53c6489fb1e2d50fe25d0f6a8fefaba2e832fc0f340
+  metadata.gz: 3cea9190ff9059d6ba553fcac90d0452323a87f8df52c96b06101717516c95a7
+  data.tar.gz: 2bcd8fcdaeeda88b8b83b1dbbad6c1742492884b7d82045447effc37aef92c60
 SHA512:
-  metadata.gz: f40c6c0d165ece193dc40263667b4fa08043bdcac88431af801aeb9b0584d2aef128f1d12e0d1c3c4b3b3e29e93b0e6378f43523964631e906fcc52f35319862
-  data.tar.gz: 30da2db3d0463e33ca81c86ddab5c1f7d1a40b063d6d47e4fa77d4ac3e5de31510c8113c591cc145cc2bd4c8e4f2cf2352ab0536f67c1668a4ca8ec620c4504e
+  metadata.gz: 5fcc90dbeed6618efceee3c250d6d65c5367452dc9f6802ff1645b3294658e418ca5c8ba2893af0455857e15d69a1b666e6a5a9257b6c3a69af182d596421104
+  data.tar.gz: 3b016c9cdb534fec3c2a8d82d529b13b7b8967ee7e1c62a7c0c3e52e487de52a27874f87556eaa3104c19c37b1e4a5a3b8646e98ad7e110c7c043f4bb81a23a1

data/app/models/solidus_tec_estimator/estimator.rb

@@ -14,7 +14,7 @@ module SolidusTecEstimator
         end
       end.compact
       rates += providers(package).map do |provider|
-        provider_shipping_methods = provider.spree_shipping_methods.available_to_store(package.shipment.order.store).available_in_stock_location(package.stock_location)
+        provider_shipping_methods = remove_unavailable_methods(shipping_methods: provider.spree_shipping_methods, package: package)
         provider.class_name.constantize.new(package, provider_shipping_methods).shipping_rates
       end.flatten.compact
 
@@ -32,10 +32,8 @@ module SolidusTecEstimator
     end
 
     def shipping_methods(package)
-      package.shipping_methods
-        .available_to_store(package.shipment.order.store)
-        .available_for_address(package.shipment.order.ship_address)
-        .where(available_to_users: true)
+      remove_unavailable_methods(shipping_methods: package.shipping_methods, package: package)
+        .where(provider_id: nil)
         .includes(:calculator)
         .to_a.select do |ship_method|
           calculator = ship_method.calculator
@@ -47,5 +45,12 @@ module SolidusTecEstimator
       SolidusTecEstimator::Provider.where(active: true)
     end
 
+    def remove_unavailable_methods shipping_methods:, package:
+      shipping_methods.available_to_store(package.shipment.order.store)
+      .available_in_stock_location(package.stock_location)
+      .available_for_address(package.shipment.order.ship_address)
+      .where(available_to_users: true)
+    end
+
   end
 end

data/app/models/solidus_tec_estimator/provider.rb

@@ -1,5 +1,11 @@
 module SolidusTecEstimator
   class Provider < ApplicationRecord
     has_many :spree_shipping_methods, class_name: "Spree::ShippingMethod"
+
+    after_create :install_provider
+
+    def install_provider
+      self.class_name.constantize.install
+    end
   end
 end

data/app/models/solidus_tec_estimator/providers/local_delivery.rb

@@ -8,6 +8,18 @@ module SolidusTecEstimator
         @shipping_methods = shipping_methods
       end
 
+      def self.install
+        Spree::ShippingMethod.find_or_create_by(code: self.name.underscore) do |shipping_method|
+          shipping_method.name = "Entrega de moto"
+          shipping_method.carrier = "Entrega local"
+          shipping_method.code = self.name.underscore
+          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
+
       def shipping_rates
         shipping_rates = []
         if ship_address_city == "São João da Boa Vista" && tem_estoque_na_f1? && package.weight <= 10000
@@ -27,16 +39,7 @@ module SolidusTecEstimator
       end
 
       def build_shipping_rate(package)
-        shipping_method = Spree::ShippingMethod.find_or_create_by(
-          carrier: "Entrega local",
-          service_level: ""
-        ) do |shipping_method|
-          shipping_method.name = "Entrega de moto"
-          shipping_method.calculator = Spree::Calculator::Shipping::FlatRate.create
-          shipping_method.shipping_categories = Spree::ShippingCategory.all
-          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.to_s.underscore)
 
         time_now = Time.now.in_time_zone('America/Sao_Paulo')
         if time_now < time_now.change({hour: 16}) && time_now.on_weekday?
@@ -60,7 +63,7 @@ module SolidusTecEstimator
       end
 
       def ship_address_city
-        Cep.find_by(codigo_postal: package.order.last_zipcode).try(:localidade) || package.order.ship_address.city
+        Cep.find_by(codigo_postal: package.order.ship_address&.zipcode).try(:localidade) || package.order.ship_address.city
       end
 
       def self.calculate_delivery_time rate

data/lib/solidus_tec_estimator/version.rb

@@ -1,3 +1,3 @@
 module SolidusTecEstimator
-  VERSION = '1.0.2'
+  VERSION = '1.0.4'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_tec_estimator
 version: !ruby/object:Gem::Version
-  version: 1.0.2
+  version: 1.0.4
 platform: ruby
 authors:
 - ulysses
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-12 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core