spree_zaez_correios 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4255be93af1ecf410479a091868addcdcc9a26e6
-  data.tar.gz: ca7511b5bf71f3b74bb5261f386d33603ee32c29
+  metadata.gz: 61ae0c0c9884577fa417290e0f39c6b3a72b9b86
+  data.tar.gz: fdf8b78e672d0fc650b957d0ba423d5a2740a8d1
 SHA512:
-  metadata.gz: e08390e104ca1fd045363840b246f7cab464bf4c72441a974b20a1c0f11d6cc4d5b6fbf35bb11f8540b46abdc78e3723a8f0e670a45fdedb0bb5133e23d6ff8a
-  data.tar.gz: 62eba9d2aad506f0f96205383ae3e5201943c74d0b449c7721c1b8c5f9cdc757b93b4f440c32fa4e8ac405135bea223598a3272d266b34dca54f6c5663f04a41
+  metadata.gz: abc07cf546ad3a9cd1360ef1f42c63b937a0961f4e52bf38a5964da270856789c22238117c324969296e21b1eff4f73fe4ec725affce69b761e8c7ed24bc8171
+  data.tar.gz: 52183607d0dbbcd2642529090345dbd1bf8d48f88e279246aba704b1dbe9bdae4fd5771c98aac9340312d55552045039dbe74889e919d3d01e53fadbe1547713

data/app/models/spree/calculator/shipping/correios_base_calculator.rb

@@ -44,10 +44,10 @@ module Spree
       return false if webservice.erro?
 
       @delivery_time = webservice.prazo_entrega + preferred_additional_days
-
-      webservice.valor + preferred_additional_value
+      cost = webservice.valor + preferred_additional_value
+      {cost: cost, delivery_time: @delivery_time}
     rescue
-      false
+      {}
     end
     
     def has_contract?

data/app/models/spree/calculator/shipping/flat_percent_item_total_decorator.rb

@@ -0,0 +1,7 @@
+Spree::Calculator::Shipping::FlatPercentItemTotal.class_eval do
+
+  def compute_package(package)
+    response = compute_from_price(total(package.contents))
+    {cost: response, delivery_time: nil}
+  end
+end

data/app/models/spree/calculator/shipping/flat_rate_decorator.rb

@@ -0,0 +1,6 @@
+Spree::Calculator::Shipping::FlatRate.class_eval do
+
+  def compute_package(package)
+    {cost: self.preferred_amount, delivery_time: nil}
+  end
+end

data/app/models/spree/calculator/shipping/flexi_rate_decorator.rb

@@ -0,0 +1,7 @@
+Spree::Calculator::Shipping::FlexiRate.class_eval do
+
+  def compute_package(package)
+    response = compute_from_quantity(package.contents.sum(&:quantity))
+    {cost: response, delivery_time: nil}
+  end
+end

data/app/models/spree/calculator/shipping/per_item_decorator.rb

@@ -0,0 +1,7 @@
+Spree::Calculator::Shipping::PerItem.class_eval do
+
+  def compute_package(package)
+    response = compute_from_quantity(package.contents.sum(&:quantity))
+    {cost: response, delivery_time: nil}
+  end
+end

data/app/models/spree/calculator/shipping/price_sack_decorator.rb

@@ -0,0 +1,7 @@
+Spree::Calculator::Shipping::PriceSack.class_eval do
+
+  def compute_package(package)
+    response = compute_from_price(total(package.contents))
+    {cost: response, delivery_time: nil}
+  end
+end

data/app/models/spree/stock/estimator_decorator.rb

@@ -0,0 +1,28 @@
+Spree::Stock::Estimator.class_eval do
+
+  # Override no metodo para poder salvar o tempo de entrega
+  def calculate_shipping_rates(package, ui_filter)
+    shipping_methods(package, ui_filter).map do |shipping_method|
+      response = shipping_method.calculator.compute(package)
+      cost = response[:cost]
+      delivery_time = response[:delivery_time]
+
+      tax_category = shipping_method.tax_category
+      if tax_category
+        tax_rate = tax_category.tax_rates.detect do |rate|
+          # If the rate's zone matches the order's zone, a positive adjustment will be applied.
+          # If the rate is from the default tax zone, then a negative adjustment will be applied.
+          # See the tests in shipping_rate_spec.rb for an example of this.d
+          rate.zone == order.tax_zone || rate.zone.default_tax?
+        end
+      end
+
+      if cost
+        rate = shipping_method.shipping_rates.new(cost: cost, delivery_time: delivery_time)
+        rate.tax_rate = tax_rate if tax_rate
+      end
+
+      rate
+    end.compact
+  end
+end

data/db/migrate/20150725181511_add_delivery_time_to_spree_shipping_rates.rb

@@ -0,0 +1,5 @@
+class AddDeliveryTimeToSpreeShippingRates < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_rates, :delivery_time, :integer
+  end
+end

data/spec/support/correios_shared_examples.rb

@@ -57,7 +57,7 @@ shared_examples_for 'correios calculator' do
     it 'should calculate shipping cost and delivery time' do
       price, delivery_time = get_correios_price_and_value_for("http://ws.correios.com.br/calculador/CalcPrecoPrazo.aspx?#{@default_query.to_query}")
 
-      expect(@calculator.compute_package(@package)).to eq(price)
+      expect(@calculator.compute_package(@package)[:cost]).to eq(price)
       expect(@calculator.delivery_time).to eq(delivery_time)
     end
 
@@ -75,7 +75,7 @@ shared_examples_for 'correios calculator' do
 
       @calculator.preferred_additional_value = 10.0
 
-      expect(@calculator.compute_package(@package)).to eq(price + 10.0)
+      expect(@calculator.compute_package(@package)[:cost]).to eq(price + 10.0)
     end
 
     it 'should change price according to declared value' do
@@ -83,7 +83,7 @@ shared_examples_for 'correios calculator' do
       price, delivery_time = get_correios_price_and_value_for("http://ws.correios.com.br/calculador/CalcPrecoPrazo.aspx?#{query.to_query}")
 
       @calculator.preferred_declared_value = true
-      expect(@calculator.compute_package(@package)).to eq(price)
+      expect(@calculator.compute_package(@package)[:cost]).to eq(price)
     end
 
     it 'should change price according to in hands' do
@@ -91,7 +91,7 @@ shared_examples_for 'correios calculator' do
       price, delivery_time = get_correios_price_and_value_for("http://ws.correios.com.br/calculador/CalcPrecoPrazo.aspx?#{query.to_query}")
 
       @calculator.preferred_receive_in_hands = true
-      expect(@calculator.compute_package(@package)).to eq(price)
+      expect(@calculator.compute_package(@package)[:cost]).to eq(price)
     end
 
     it 'should change price according to receipt notification' do
@@ -99,7 +99,7 @@ shared_examples_for 'correios calculator' do
       price, delivery_time = get_correios_price_and_value_for("http://ws.correios.com.br/calculador/CalcPrecoPrazo.aspx?#{query.to_query}")
 
       @calculator.preferred_receipt_notification = true
-      expect(@calculator.compute_package(@package)).to eq(price)
+      expect(@calculator.compute_package(@package)[:cost]).to eq(price)
     end
   end
 end

data/spree_zaez_correios.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zaez_correios'
-  s.version     = '3.0.2'
+  s.version     = '3.0.3'
   s.summary     = "Implements diverse functions in order to enable the use of services from Brazil's Correios in Spree Commerce"
   s.description = s.summary
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: spree_zaez_correios
 version: !ruby/object:Gem::Version
-  version: 3.0.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Zaez Team
@@ -254,13 +254,20 @@ files:
 - app/assets/stylesheets/spree/backend/spree_zaez_correios.css
 - app/assets/stylesheets/spree/frontend/spree_zaez_correios.css
 - app/models/spree/calculator/shipping/correios_base_calculator.rb
+- app/models/spree/calculator/shipping/flat_percent_item_total_decorator.rb
+- app/models/spree/calculator/shipping/flat_rate_decorator.rb
+- app/models/spree/calculator/shipping/flexi_rate_decorator.rb
 - app/models/spree/calculator/shipping/pac.rb
+- app/models/spree/calculator/shipping/per_item_decorator.rb
+- app/models/spree/calculator/shipping/price_sack_decorator.rb
 - app/models/spree/calculator/shipping/sedex.rb
 - app/models/spree/calculator/shipping/sedex10.rb
+- app/models/spree/stock/estimator_decorator.rb
 - bin/rails
 - config/locales/en.yml
 - config/locales/pt-br.yml
 - config/routes.rb
+- db/migrate/20150725181511_add_delivery_time_to_spree_shipping_rates.rb
 - lib/generators/spree_zaez_correios/install/install_generator.rb
 - lib/spree_zaez_correios.rb
 - lib/spree_zaez_correios/engine.rb