spree_zaez_tnt_mercurio 3.0.5 → 3.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 966b5356c9ed10b8d9e496b7b12b6405953e0c6e
-  data.tar.gz: 5d0f30f2309827cfe1de19ab69e16421a9593e04
+  metadata.gz: 9cc60f9d84ddfc41bcd742b737788c07ddfc7637
+  data.tar.gz: 96a93ecb203ce23196c214a28963999aa3379b78
 SHA512:
-  metadata.gz: 58873204fa9cba5e6f2db0854c9e2b7e0561aff76a2ebb16c1e3f43df72fe3e3fe538f04270b42c401d691a357bf826909aa6b936511ac2fa1f773cc0379b9d1
-  data.tar.gz: 820b934164264da1726bf3079557369ec490232a8d5438c9a3a1976709f661c39e36b4506524c3cad9160d7732d473c6020d18c4bb68f78a5770d0830b6eb320
+  metadata.gz: 06fe17363a5fdaabfb44b7858c919ccb75094e74993e7c5e20983c11a6fb4191eedd56c5f208f914cc735c0d0955e31e7cb28f74538403271fde39a1f8f0a9e9
+  data.tar.gz: 836fcbcc1c6695b2f3a207cd89a859f1cb507921cc5f652d97c6b743b4b7c75d06f0005eb2ac4397b5f876864c7d18ca3464ec32354aac26b8d1ad4fa36b6565

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

@@ -39,8 +39,39 @@ module Spree
 
       cost = response[:calcula_frete_response][:out][:vl_total_frete].to_f + Spree::TntMercurioConfig.additional_value
       {cost: cost, delivery_time: @delivery_time}
+    rescue
+      try_calculate_from_orders(zipcode_to, object.weight)
+    end
+
+    # Tenta buscar um pedido feito para o mesmo CEP de entrega e
+    # que tenha um peso parecido (diferenca de 1kg para mais ou menos)
+    # para recuperar o valor do frete e o tempo de entrega
+    def try_calculate_from_orders(zipcode, weight)
+      shipping_type = "Spree::Calculator::Shipping::TntMercurio#{shipping_method}"
+      calculator = Spree::Calculator.find_by(type: shipping_type, calculable_type: 'Spree::ShippingMethod')
+      return {} if calculator.nil?
+      shipping_method_id = calculator.calculable_id
+
+      shipping_rates_id = Spree::ShippingRate.joins(:shipping_method).joins(shipment: :order).
+          joins('INNER JOIN spree_addresses ON spree_addresses.id = spree_orders.ship_address_id').
+          where(shipping_method_id: shipping_method_id, spree_addresses: { zipcode: zipcode }).
+          group('spree_shipping_rates.id').pluck(:id)
+
+      init_value = weight - 1
+      final_value = weight + 1
+
+      shipping_rates_id.each do |id|
+        shipping_rate = Spree::ShippingRate.find(id)
+        weight = shipping_rate.shipment.to_package.weight
+
+        if weight.between?(init_value, final_value)
+          return { cost: shipping_rate.cost.to_f, delivery_time: shipping_rate.delivery_time }
+        end
+      end
+      {}
     rescue
       {}
     end
+
   end
 end

data/lib/spree_zaez_tnt_mercurio/factories.rb

@@ -6,4 +6,12 @@ FactoryGirl.define do
     ship_address
   end
 
+  factory :shipping_rate, class: Spree::ShippingRate do
+    selected 1
+    cost 10
+    delivery_time 3
+    association :shipping_method, factory: :shipping_method
+    association :shipment, factory: :shipment
+  end
+
 end

data/spec/shared_examples/tnt_calculator.rb

@@ -156,4 +156,53 @@ shared_examples_for 'tnt calculator' do
     end
   end
 
+  context 'using information of previuos order' do
+
+    let(:previous_order) { create(:shipped_order) }
+    let(:shipping_method) { create(:shipping_method, name: 'TNT') }
+    let!(:shipping_calculator) { create(:calculator,
+                                        calculable: shipping_method,
+                                        type: "Spree::Calculator::Shipping::TntMercurio#{calculator.shipping_method}") }
+
+    before do
+      create(:shipping_rate, shipment: previous_order.shipments.first, cost: 15,
+             delivery_time: 5, shipping_method: shipping_method, selected: 1)
+
+      # New Order
+      user = create(:user, authentication_token: '12345678900')
+      @new_order = create(:order, line_items: previous_order.line_items,
+                      ship_address: previous_order.ship_address, user: user)
+      stock_location = create(:stock_location, zipcode: '08465312')
+      shipment = create(:shipment, order: @new_order, stock_location: stock_location)
+      @new_package = shipment.to_package
+
+      @new_params = {in0: {login: 'teste@email.com',
+                           senha: 'password',
+                           nr_identif_cliente_rem: '1234678900000',
+                           nr_inscricao_estadual_remetente: '344028650118',
+                           nr_identif_cliente_dest: '12345678900',
+                           tp_situacao_tributaria_remetente: 'CO',
+                           tp_pessoa_remetente: 'J',
+                           tp_pessoa_destinatario: 'F',
+                           tp_situacao_tributaria_destinatario: 'NC',
+                           cep_origem: '08465312',
+                           cep_destino: @new_order.ship_address.zipcode,
+                           vl_mercadoria: @new_order.total.to_s,
+                           ps_real: @new_package.weight.to_s,
+                           tp_servico: calculator.shipping_method,
+                           tp_frete: 'C',
+                           cd_divisao_cliente: 1}}
+    end
+
+    it 'should use information of previous orders when request to TNT fails' do
+      fixture = File.read('spec/fixtures/calcula_frete/error_response.xml')
+      savon.expects(:calcula_frete).with(message: @new_params).returns(fixture)
+      response = calculator.compute_package(@new_package)
+
+      expect(response[:cost]).to eq 15
+      expect(response[:delivery_time]).to eq 5
+    end
+
+  end
+
 end

data/spec/spec_helper.rb

@@ -24,6 +24,7 @@ Capybara.javascript_driver = :poltergeist
 # Requires supporting ruby files with custom matchers and macros, etc,
 # in spec/support/ and its subdirectories.
 Dir[File.join(File.dirname(__FILE__), 'support/**/*.rb')].each { |f| require f }
+Dir[File.join(File.dirname(__FILE__), 'shared_examples/**/*.rb')].each { |f| require f }
 
 # Requires factories and other useful helpers defined in spree_core.
 require 'spree/testing_support/authorization_helpers'

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.5'
+  s.version     = '3.0.6'
   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.5
+  version: 3.0.6
 platform: ruby
 authors:
 - Zaez Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2016-02-26 00:00:00.000000000 Z
+date: 2016-09-22 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core