spree_zaez_tnt_mercurio 3.0.2 → 3.0.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ba68ab9165117c8288b562c5d69a9fd30e16a56e
-  data.tar.gz: 9f40076a39ede30a1f1e1793e3a101be3f29c526
+  metadata.gz: d5519071aed3a2ca1b4d3d2a8e723b8a15b90a31
+  data.tar.gz: d834262495bd2e2f7f6bd20e37dd90545751862b
 SHA512:
-  metadata.gz: d091d1de66c916a060a04eef96850efb838cb7d662b3ef6ab17d39ad226b4a68ce9f28c5de618308830db76b1a977b93a1b411930705b76c2be8fecc6afe1814
-  data.tar.gz: 476fe603c4111537f88588e6a04c04c6f9f7df69b48aa84620bbbb6fb6696f9400e2d362697b7f6dfb102a465413855022f5223e706c5fa1019f0b795e950ef2
+  metadata.gz: 49cb649a33a9cbe721bbee10b6fed083338e3d0a4cd7fb2b3ba9de274f490bd4b52a3f7f53de8d9c628a3fc93a4d0aa531fb6e1cadad7687ca33bc6dbbf6a725
+  data.tar.gz: 09c3031573787fb3ad089a4f6d8779357201e92ffc32ce41c91ca6e6744a58c4f6b73ba473da9da3e3a2b8d6eeeb212faedd2e465972bed136f4ba8e0694fd52

data/.gitignore

@@ -12,3 +12,4 @@ nbproject
 pkg
 *.swp
 spec/dummy
+*.gem

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

@@ -1,11 +1,16 @@
 Spree::Stock::Estimator.class_eval do
 
-  # Override no metodo para poder salvar o tempo de entrega
+  # Override to save the delivery time
   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]
+      if response.is_a? Hash
+        cost = response[:cost]
+        delivery_time = response[:delivery_time]
+      elsif %w(Float BigDecimal).include? response.class.to_s
+        cost = response
+        delivery_time = nil
+      end
 
       tax_category = shipping_method.tax_category
       if tax_category

data/spec/models/spree/stock/estimator_decorator_spec.rb

@@ -0,0 +1,33 @@
+require 'spec_helper'
+
+module Spree
+  module Stock
+    describe Estimator do
+      let!(:shipping_method) { create(:shipping_method) }
+      let(:package) { build(:stock_package, contents: inventory_units.map { |i| ContentItem.new(inventory_unit) }) }
+      let(:order) { build(:order_with_line_items) }
+      let(:inventory_units) { order.inventory_units }
+
+      subject { Estimator.new(order) }
+
+      context '#shipping rates' do
+        before(:each) do
+          shipping_method.zones.first.members.create(:zoneable => order.ship_address.country)
+          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :available?).and_return(true)
+          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :compute).and_return({cost: 4.00, delivery_time: 1})
+          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :preferences).and_return({:currency => currency})
+          allow_any_instance_of(ShippingMethod).to receive_message_chain(:calculator, :marked_for_destruction?)
+
+          allow(package).to receive_messages(:shipping_methods => [shipping_method])
+        end
+
+        let(:currency) { 'USD' }
+
+        it 'should save the delivery time on shipping rate' do
+          shipping_rates = subject.shipping_rates(package)
+          expect(shipping_rates.first.delivery_time).to eq 1
+        end
+      end
+    end
+  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.2'
+  s.version     = '3.0.3'
   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.2
+  version: 3.0.3
 platform: ruby
 authors:
 - Zaez Team
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-07-25 00:00:00.000000000 Z
+date: 2015-07-27 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -282,11 +282,6 @@ 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
@@ -309,6 +304,7 @@ files:
 - spec/fixtures/calcula_frete/success_response.xml
 - spec/models/spree/calculator/shipping/tnt_mercurio_anc_spec.rb
 - spec/models/spree/calculator/shipping/tnt_mercurio_rnc_spec.rb
+- spec/models/spree/stock/estimator_decorator_spec.rb
 - spec/models/spree/tnt_mercurio_configuration_spec.rb
 - spec/shared_examples/tnt_calculator.rb
 - spec/spec_helper.rb
@@ -347,6 +343,7 @@ test_files:
 - spec/fixtures/calcula_frete/success_response.xml
 - spec/models/spree/calculator/shipping/tnt_mercurio_anc_spec.rb
 - spec/models/spree/calculator/shipping/tnt_mercurio_rnc_spec.rb
+- spec/models/spree/stock/estimator_decorator_spec.rb
 - spec/models/spree/tnt_mercurio_configuration_spec.rb
 - spec/shared_examples/tnt_calculator.rb
 - spec/spec_helper.rb

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

@@ -1,7 +0,0 @@
-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

@@ -1,6 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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

@@ -1,7 +0,0 @@
-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