spree_zaez_tnt_mercurio 3.0.1 → 3.0.2

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: b6120bbc4b11e1faa0227ab3248eea24e4429dce
-  data.tar.gz: f517de387fb8e5a1837876c8b511d018b05d4358
+  metadata.gz: ba68ab9165117c8288b562c5d69a9fd30e16a56e
+  data.tar.gz: 9f40076a39ede30a1f1e1793e3a101be3f29c526
 SHA512:
-  metadata.gz: 287a20d61471473ae1b3cce67953053d610e0f72794ccd3d3a14502f96f326455ff3439b8d8565f3d03837123a8f5c826ece18949909da424274371538050b34
-  data.tar.gz: 877f488988aa72477fcbce31b385b6086254fc97d241d2633218189e9c3428b39fb38e84308dc8416ff6630642592e8322e885cfafeda64cd5abbb0d1333a081
+  metadata.gz: d091d1de66c916a060a04eef96850efb838cb7d662b3ef6ab17d39ad226b4a68ce9f28c5de618308830db76b1a977b93a1b411930705b76c2be8fecc6afe1814
+  data.tar.gz: 476fe603c4111537f88588e6a04c04c6f9f7df69b48aa84620bbbb6fb6696f9400e2d362697b7f6dfb102a465413855022f5223e706c5fa1019f0b795e950ef2

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/calculator/shipping/tnt_mercurio_base_calculator.rb

@@ -34,9 +34,10 @@ module Spree
 
       @delivery_time = response[:calcula_frete_response][:out][:prazo_entrega].to_i + Spree::TntMercurioConfig.additional_days
 
-      response[:calcula_frete_response][:out][:vl_total_frete].to_f + Spree::TntMercurioConfig.additional_value
+      cost = response[:calcula_frete_response][:out][:vl_total_frete].to_f + Spree::TntMercurioConfig.additional_value
+      {cost: cost, delivery_time: @delivery_time}
     rescue
-      false
+      {}
     end
   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/20150725185732_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/shared_examples/tnt_calculator.rb

@@ -86,7 +86,7 @@ shared_examples_for 'tnt calculator' do
       savon.expects(:calcula_frete).with(message: @params).returns(fixture)
       response = calculator.compute_package(@package)
 
-      expect(response).to eq(69.29)
+      expect(response[:cost]).to eq(69.29)
       expect(calculator.delivery_time).to eq(3)
 
     end
@@ -113,7 +113,7 @@ shared_examples_for 'tnt calculator' do
       savon.expects(:calcula_frete).with(message: @params).returns(fixture)
       response = calculator.compute_package(@package)
 
-      expect(response).to eq(79.29)
+      expect(response[:cost]).to eq(79.29)
 
       # set value default after test
       Spree::TntMercurioConfig.additional_value = 0
@@ -132,7 +132,7 @@ shared_examples_for 'tnt calculator' do
       savon.expects(:calcula_frete).with(message: @params).returns(fixture)
       response = calculator.compute_package(@package)
 
-      expect(response).to be false
+      expect(response).to eq Hash.new
     end
 
     it 'should return false if the credentials are invalid' do
@@ -152,7 +152,7 @@ shared_examples_for 'tnt calculator' do
 
       response = calculator.compute_package(@package)
 
-      expect(response).to be false
+      expect(response).to eq Hash.new
     end
   end
 

data/spree_zaez_tnt_mercurio.gemspec

@@ -2,7 +2,7 @@
 Gem::Specification.new do |s|
   s.platform    = Gem::Platform::RUBY
   s.name        = 'spree_zaez_tnt_mercurio'
-  s.version     = '3.0.1'
+  s.version     = '3.0.2'
   s.summary     = 'Implements diverse functions in order to enable the use of services from TNT Mercúrio in Spree Commerce'
   s.description = 'Implements diverse functions in order to enable the use of services from TNT Mercúrio in Spree Commerce'
   s.required_ruby_version = '>= 2.0.0'

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_zaez_tnt_mercurio
 version: !ruby/object:Gem::Version
-  version: 3.0.1
+  version: 3.0.2
 platform: ruby
 authors:
 - Zaez Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-20 00:00:00.000000000 Z
+date: 2015-07-25 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -282,15 +282,22 @@ files:
 - app/assets/stylesheets/spree/backend/spree_zaez_tnt_mercurio.css
 - app/assets/stylesheets/spree/frontend/spree_zaez_tnt_mercurio.css
 - app/controllers/spree/admin/tnt_mercurio_settings_controller.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/per_item_decorator.rb
+- app/models/spree/calculator/shipping/price_sack_decorator.rb
 - app/models/spree/calculator/shipping/tnt_mercurio_anc.rb
 - app/models/spree/calculator/shipping/tnt_mercurio_base_calculator.rb
 - app/models/spree/calculator/shipping/tnt_mercurio_rnc.rb
+- app/models/spree/stock/estimator_decorator.rb
 - app/overrides/spree/admin/shared/sub_menu/_configuration/add_tnt_mercurio_settings_tab.html.erb.deface
 - app/views/spree/admin/tnt_mercurio_settings/edit.html.erb
 - bin/rails
 - config/locales/en.yml
 - config/locales/pt-br.yml
 - config/routes.rb
+- db/migrate/20150725185732_add_delivery_time_to_spree_shipping_rates.rb
 - lib/generators/spree_zaez_tnt_mercurio/install/install_generator.rb
 - lib/spree/tnt_mercurio_configuration.rb
 - lib/spree_zaez_tnt_mercurio.rb