solidus_tec_estimator 0.0.1 → 0.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8075ac792c8dac51fa3711d40d07c0fc2fb0e3b5ff02897175cfe9cc73e6f5f9
-  data.tar.gz: a226fea6c4785db4fb17d4fd37e77e1fa3e47e3fc516ed2f7b7481c4253cb5c4
+  metadata.gz: 7e767590fc01f411d98c20069d71a1ed850c8dd32682e59d8d3c33c1cc397179
+  data.tar.gz: 44d790f17cb9e358db130f4ce66b2dd4512144b5524fde2f743887a57fe1591d
 SHA512:
-  metadata.gz: 8c41adbb7bbf0f8df9ecca9eafe8b7160543445c47f6f0fadb359f55fd08239b7b8fbcc49e9e4f042ddbd161c212063e1e474e383a728ce4b138c2f8b92d010c
-  data.tar.gz: 68ac4b5ac09c7b77b989736d45e32732d229e366d7f04016d4f1aa23b18e61b4a04371058134a83aae75455cf82edfa34cc53c761a37cd3dbe72f69b64e01526
+  metadata.gz: d8bf77f7f25fd6af4032075c76b0e5370b00432555730a7ead5710070752f06a084782edbecdddd449b98a7dbe26d266c129c7bfb4debd23face30361fcb02ea
+  data.tar.gz: 252cd3f1e914d7e00fb954b30bd3dd4453f86eb756cd41ce4c5684b442d82db4a0d353e4f751fdcc5b7181f212f8251d97301d740e499caa05609eb3e728e4a3

data/app/models/solidus_tec_estimator/estimator.rb

@@ -8,9 +8,7 @@ module SolidusTecEstimator
         if cost
           rate = shipping_method.shipping_rates.new(
             cost: cost,
-            shipment: package.shipment,
-            min_delivery_time: DateTime.now + (SolidusTecEstimator.config.min_delivery_time || 8),
-            max_delivery_time: DateTime.now + (SolidusTecEstimator.config.max_delivery_time || 10)
+            shipment: package.shipment
           )
           rate
         end
@@ -19,9 +17,9 @@ module SolidusTecEstimator
         provider_shipping_methods = provider.spree_shipping_methods.available_in_stock_location(package.stock_location)
         provider.class_name.constantize.new(package, provider_shipping_methods).shipping_rates
       end.flatten.compact
-      
+
       choose_default_shipping_rate(rates)
-      Spree::Config.shipping_rate_sorter_class.new(rates).sort
+      rates
     end
 
     private
@@ -49,25 +47,5 @@ module SolidusTecEstimator
       SolidusTecEstimator::Provider.where(active: true)
     end
 
-    def build_default_shipping_rate package
-      shipping_method = Spree::ShippingMethod.find_or_create_by(
-        carrier: "Frete Padrão",
-        service_level: ""
-      ) do |shipping_method|
-        shipping_method.name = "Frete Padrão"
-        shipping_method.calculator = Spree::Calculator::Shipping::FlatRate.create
-        shipping_method.shipping_categories = Spree::ShippingCategory.all
-        shipping_method.available_to_users = true
-      end
-
-      Spree::ShippingRate.new(
-        shipment: package.shipment,
-        shipping_method: shipping_method,
-        cost: 15.00,
-        min_delivery_time: 8,
-        max_delivery_time: 10
-      )
-    end
-
   end
 end

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

@@ -61,6 +61,17 @@ module SolidusTecEstimator
       def ship_address_city
         Cep.find_by(codigo_postal: package.order.last_zipcode).try(:localidade) || package.order.ship_address.city
       end
+
+      def self.calculate_delivery_time rate
+        if rate.max_delivery_time.today?
+          "Chegará em até 2 horas"
+        elsif rate.max_delivery_time.tomorrow?
+          "Chegará amanhã até às 10h"
+        else
+          "Chegará em #{ActionController::Base.helpers.pluralize((rate.max_delivery_time.to_datetime.end_of_day - DateTime.now).to_i, "dia", plural: "dias")}"
+        end
+      end
+
     end
   end
 end

data/lib/generators/solidus_tec_estimator/install/templates/initializer.rb

@@ -1,5 +1,3 @@
 SolidusTecEstimator.configure do |config|
-  config.min_delivery_time = 8
-  config.max_delivery_time = 10
   config.providers_classes = ["SolidusTecEstimator::Providers::LocalDelivery"]
 end

data/lib/solidus_tec_estimator/configuration.rb

@@ -1,6 +1,6 @@
 module SolidusTecEstimator
   class Configuration
-    attr_accessor :min_delivery_time, :max_delivery_time, :providers_classes
+    attr_accessor :providers_classes
   end
 
   class << self

data/lib/solidus_tec_estimator/version.rb

@@ -1,3 +1,3 @@
 module SolidusTecEstimator
-  VERSION = '0.0.1'
+  VERSION = '0.0.3'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: solidus_tec_estimator
 version: !ruby/object:Gem::Version
-  version: 0.0.1
+  version: 0.0.3
 platform: ruby
 authors:
 - ulysses
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2024-08-09 00:00:00.000000000 Z
+date: 2024-08-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: solidus_core
@@ -79,7 +79,6 @@ files:
 - app/models/solidus_tec_estimator/estimator.rb
 - app/models/solidus_tec_estimator/provider.rb
 - app/models/solidus_tec_estimator/providers/local_delivery.rb
-- app/models/solidus_tec_estimator/providers/planilha.rb
 - app/views/spree/admin/solidus_tec_estimator/providers/_form.html.erb
 - app/views/spree/admin/solidus_tec_estimator/providers/edit.html.erb
 - app/views/spree/admin/solidus_tec_estimator/providers/index.html.erb