solidus_tec_estimator 1.0.2 → 1.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: ec04ac8776ab72173ed80d8e4c94ec6f7f96e09e67fb05f86588d680fe2cdaa3
-  data.tar.gz: 7f0019e36d4c414e1489b53c6489fb1e2d50fe25d0f6a8fefaba2e832fc0f340
+  metadata.gz: 7b79cba56f610c4413e114eade5575811b3d9807c4f4b41f7dc2b61beae3419b
+  data.tar.gz: bd67403d4b0b66386773eb4c101fb5ef2c0b95215bfcd0e67c081cc435ec2e84
 SHA512:
-  metadata.gz: f40c6c0d165ece193dc40263667b4fa08043bdcac88431af801aeb9b0584d2aef128f1d12e0d1c3c4b3b3e29e93b0e6378f43523964631e906fcc52f35319862
-  data.tar.gz: 30da2db3d0463e33ca81c86ddab5c1f7d1a40b063d6d47e4fa77d4ac3e5de31510c8113c591cc145cc2bd4c8e4f2cf2352ab0536f67c1668a4ca8ec620c4504e
+  metadata.gz: a1b7a5c830056dcd7dc828e7d2c85efa6271b913654ed590400d5735bff145a20402bacbf1a93de462f4dcec3a7bb9e87370c319278bf943879002d2202fedc8
+  data.tar.gz: 8d365668eb83ed8d7a0836f6d706ea4b14ecde1ea933afe74b43489b319c74d527288813ef424bcd1eeceb025daf64e901085672ac332e763f9c3dff39044076

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?

data/lib/solidus_tec_estimator/version.rb

@@ -1,3 +1,3 @@
 module SolidusTecEstimator
-  VERSION = '1.0.2'
+  VERSION = '1.0.3'
 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.3
 platform: ruby
 authors:
 - ulysses
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-28 00:00:00.000000000 Z
+date: 2024-09-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core