spree_correios_shipping 1.0.0 → 1.1.0

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: c412c1b1303a8d164512c2a132cbc0dc9ef375d7
-  data.tar.gz: 1118dc4a8cf8a87e95aae84bd3414e2c80b6390a
+  metadata.gz: b7b84d13f0e661e7116f8acdac4aa83066412533
+  data.tar.gz: 67b190906f148d6630933f8ce2ae0a4bebe8dab9
 SHA512:
-  metadata.gz: 199ed99b11cb4e2b41d8a4a812d39e6dea7a72951c04e57f8151d3cd134e1171bc487d4772b3fb2dc9655820fc9ea3da57a046c46f00ffa12c56346be16976cf
-  data.tar.gz: 04d021a16b87a948d61cc9d8ca71a365213f247a5b4d9bdd3e9daa361ec86f3505128d986197a693e65ef7d012e836f61be9dcdeeb2e0a4870bba65568a382c4
+  metadata.gz: 41e4b2252376d33bc683704dbafc34ca1e5fb5d02fad70e1c7e35055e9d117681878fadeb345b1cd1cfd256873474bd500c8731576d1a61d5b69b987cae7aca1
+  data.tar.gz: 148a9b02e12d9caceca8e35dc7490c7da04b9518ae8ebf43f82710851ea89133ba2e28a990e71a3755fc0bedc51b4a2850adc546c5840b9adb2bc67ce87ef25c

data/README.md

@@ -1,10 +1,13 @@
 SpreeCorreiosShipping
 =====================
 [![Code Climate](https://codeclimate.com/github/locomotivapro/spree_correios_shipping/badges/gpa.svg)](https://codeclimate.com/github/locomotivapro/spree_correios_shipping)
+[![Gem Version](https://badge.fury.io/rb/spree_correios_shipping.svg)](http://badge.fury.io/rb/spree_correios_shipping)
 
 This is a gem to allow use Correios service for shipping methods in spree
 Currently just tested and working with spree > 3.1
 
+There is a 1.2 spree implementation, just use 1-2-stable branch.
+
 ## Installation
 
 1. Add the following to your Gemfile

data/app/models/spree/calculator/shipping/correios/base.rb

@@ -24,19 +24,14 @@ module Spree
         end
 
         def compute_package(package)
-          order = package.order
-          stock_location = package.stock_location
-
-          origin = build_location(stock_location)
-          destination = build_location(order.ship_address)
           service_code = self.class.service_code
+          retrieve_correios_response(package)
 
-          rates_result = retrieve_rates_from_cache(package, origin, destination)
+          return nil if @rates_result.kind_of?(Spree::ShippingError)
+          return nil if @rates_result.empty?
+          return nil unless @rates_result.is_a?(Hash)
 
-          return nil if rates_result.kind_of?(Spree::ShippingError)
-          return nil if rates_result.empty?
-          return nil unless rates_result.is_a?(Hash)
-          rate = rates_result[service_code][:price]
+          rate = @rates_result[service_code][:price]
 
           return nil unless rate
           return nil if rate.to_f == 0.0
@@ -44,7 +39,23 @@ module Spree
           return rate
         end
 
+        def timing_info(package)
+          @rates_result ||= retrieve_correios_response(package)
+          service_code = self.class.service_code
+          @rates_result[service_code][:timing_info]
+        end
+
         private
+        def retrieve_correios_response(package)
+          order = package.order
+          stock_location = package.stock_location
+
+          origin = build_location(stock_location)
+          destination = build_location(order.ship_address)
+
+          @rates_result = retrieve_rates_from_cache(package, origin, destination)
+        end
+
         def is_package_shippable?(package)
           if Spree::CorreiosShipping::Config[:split_shipments]
             heavy_items = package.contents.select { |content_item| content_item.variant.weight.to_f >= max_allowed_weight }
@@ -117,7 +128,7 @@ module Spree
               return {response.nome.downcase.to_sym => {price: response.valor, delivery_time: response.prazo_entrega}}  unless response.is_a?(Hash)
               response_hash = {}
               services.each do |service|
-                response_hash[service] = {price: response[service].valor, delivery_time: response[service].prazo_entrega}
+                response_hash[service] = {price: response[service].valor, timing_info: { days: response[service].prazo_entrega, info: response[service].msg_erro } }
               end
             end
 
@@ -130,35 +141,13 @@ module Spree
           #end
         end
 
+
         def retrieve_rates_from_cache package, origin, destination
           Rails.cache.fetch(cache_key(package)) do
             retrieve_rates(origin, destination, package)
           end
         end
 
-        #def retrieve_timings(origin, destination, packages)
-        #begin
-        #if carrier.respond_to?(:find_time_in_transit)
-        #response = carrier.find_time_in_transit(origin, destination, packages)
-        #return response
-        #end
-        #rescue ActiveMerchant::Shipping::ResponseError => re
-        #if re.response.is_a?(ActiveMerchant::Shipping::Response)
-        #params = re.response.params
-        #if params.has_key?("Response") && params["Response"].has_key?("Error") && params["Response"]["Error"].has_key?("ErrorDescription")
-        #message = params["Response"]["Error"]["ErrorDescription"]
-        #else
-        #message = re.message
-        #end
-        #else
-        #message = re.message
-        #end
-
-        #error = Spree::ShippingError.new("#{I18n.t(:shipping_error)}: #{message}")
-        #Rails.cache.write @cache_key+"-timings", error #write error to cache to prevent constant re-lookups
-        #raise error
-        #end
-        #end
       end
     end
   end

data/app/models/spree/shipping_rate_decorator.rb

@@ -0,0 +1,13 @@
+Spree::ShippingRate.class_eval do
+
+  def timing_info
+    if days || info
+      text = [Spree.t(:pre_delivery_days_info)]
+      text << "#{days} #{Spree.t(:delivery_days)}" if days
+      text << "(#{info})" if info
+      text.join(' ')
+    end
+  end
+
+end
+

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

@@ -0,0 +1,26 @@
+module Spree
+  Stock::Estimator.class_eval do
+
+    def calculate_shipping_rates(package, ui_filter)
+      shipping_methods(package, ui_filter).map do |shipping_method|
+        calculator = shipping_method.calculator
+        cost = calculator.compute(package)
+
+        timing_info = if calculator.respond_to? :timing_info
+                        calculator.timing_info(package)
+                      else
+                        {}
+                      end
+
+        shipping_method.shipping_rates.new(
+          cost: gross_amount(cost, taxation_options_for(shipping_method)),
+          tax_rate: first_tax_rate_for(shipping_method.tax_category),
+          days: timing_info[:days],
+          info: timing_info[:info]
+        ) if cost
+
+      end.compact
+    end
+
+  end
+end

data/app/overrides/spree/checkout/_delivery/add_timing_info.html.erb.deface

@@ -0,0 +1,2 @@
+<!-- insert_after ".rate-cost" -->
+<span class="rate-timing"><%= rate.timing_info %></span>

data/config/locales/pt-BR.yml

@@ -2,6 +2,8 @@ pt-BR:
   or: ou
   correios_shipping_settings: 'Preferências dos Correios (ECT)'
   spree:
+    pre_delivery_days_info: 'Prazo:'
+    delivery_days: dias
     edit_package: Editar Embalagem
     correios_shipping_settings: 'Preferências dos Correios (ECT)'
     correios_settings: Preferências
@@ -12,7 +14,7 @@ pt-BR:
   correios_shipping:
     id_correios: Identificação Correios
     password_correios: Senha (Fornecida pela ECT)
-    services: Serviços (utilize "_" ao invés de espaços e separe por vírgula). Não altera a menos que tenha certeza do que está fazendo!
+    services: Serviços (utilize "_" ao invés de espaços e separe por vírgula). Não altere a menos que tenha certeza do que está fazendo!
     default_item_weight: Peso do item padrão (quando peso não for fornecido)
     split_shipments: Permitir criar mais de um pacote para envio (Se o pedido passar das confs máximas da ECT)
     max_shipping_weight: Peso máximo aceito pela ECT

data/db/migrate/20151203140951_add_days_and_info_to_spree_shipping_rates.rb

@@ -0,0 +1,6 @@
+class AddDaysAndInfoToSpreeShippingRates < ActiveRecord::Migration
+  def change
+    add_column :spree_shipping_rates, :days, :string
+    add_column :spree_shipping_rates, :info, :string
+  end
+end

data/lib/spree_correios_shipping/version.rb

@@ -1,3 +1,3 @@
 module SpreeCorreiosShipping
-  VERSION = '1.0.0'
+  VERSION = '1.1.0'
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: spree_correios_shipping
 version: !ruby/object:Gem::Version
-  version: 1.0.0
+  version: 1.1.0
 platform: ruby
 authors:
 - Denis Tierno, Fabio Esposito
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2015-05-07 00:00:00.000000000 Z
+date: 2015-12-04 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: spree_core
@@ -149,10 +149,13 @@ files:
 - app/models/spree/calculator/shipping/correios/sedex_com_contrato5.rb
 - app/models/spree/calculator/shipping/correios/sedex_hoje.rb
 - app/models/spree/product_package.rb
+- app/models/spree/shipping_rate_decorator.rb
+- app/models/spree/stock/estimator_decorator.rb
 - app/models/spree/stock/splitter/correios_package.rb
 - app/models/spree/stock/splitter/correios_weight.rb
 - app/models/spree/stock_location_decorator.rb
 - app/overrides/spree/admin/shared/sub_menu/_configuration/add_correios_shipping_settings_tab.html.erb.deface
+- app/overrides/spree/checkout/_delivery/add_timing_info.html.erb.deface
 - app/views/spree/admin/correios_shipping_settings/edit.html.erb
 - app/views/spree/admin/product_packages/_form.html.erb
 - app/views/spree/admin/product_packages/edit.html.erb
@@ -163,6 +166,7 @@ files:
 - config/locales/pt-BR.yml
 - config/routes.rb
 - db/migrate/20150303111955_create_product_packages.rb
+- db/migrate/20151203140951_add_days_and_info_to_spree_shipping_rates.rb
 - lib/generators/spree_correios_shipping/install/install_generator.rb
 - lib/spree/correios_shipping_configuration.rb
 - lib/spree/shipping_error.rb