correios_gem 1.4.2 → 1.4.3

data/lib/reverse_logistics/requests/create_shippings_with_collection.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module ReverseLogistics
-    class CreateShippingsWithCollection < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class CreateShippingsWithCollection < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @receiver = data[:receiver]
         @service_code = data[:service_code]
         @shippings = data[:shippings]
@@ -24,16 +14,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:solicitar_postagem_simultanea,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(ReverseLogistics.client.call(
+            :solicitar_postagem_simultanea,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
         rescue Savon::HTTPError => error
-          if error.http.code == 401
-            generate_exception("Unauthorized (#{error.http.code}).")
-          end
-          generate_exception("Unknown HTTP error (#{error.http.code}).")
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -41,7 +30,7 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(ReverseLogistics.namespaces) do
             xml['soap'].Body do
               xml['ns1'].solicitarPostagemSimultanea do
                 parent_namespace = xml.parent.namespace
@@ -69,7 +58,7 @@ module Correios
                   goods = shipping[:goods] || []
                   objects = shipping[:objects] || [{}]
                   xml.coletas_solicitadas do
-                    xml.tipo HELPER.shipping_type(shipping[:type])
+                    xml.tipo reverse_shipping_type(shipping[:type])
                     xml.id_cliente shipping[:code]
                     xml.valor_declarado shipping[:declared_value]
                     xml.descricao shipping[:description]
@@ -86,7 +75,7 @@ module Correios
                       xml.ddd_celular sender[:cellphone][0, 2]
                       xml.celular sender[:cellphone][2, sender[:phone].length - 1]
                       xml.email sender[:email]
-                      xml.sms HELPER.bool_to_string(sender[:send_sms])
+                      xml.sms bool_to_string(sender[:send_sms])
                       xml.identificacao sender[:document]
                       xml.logradouro sender_address[:street]
                       xml.numero sender_address[:number]
@@ -116,32 +105,27 @@ module Correios
 
       def format_response(response)
         response = response[:solicitar_postagem_simultanea_response][:solicitar_postagem_simultanea]
-        generate_exception(response[:msg_erro]) if response[:cod_erro].to_i != 0
+        generate_revese_logistics_exception(response)
 
         shippings = response[:resultado_solicitacao]
         shippings = [shippings] if shippings.is_a?(Hash)
 
-        formatted_shippings = []
-        shippings.each do |shipping|
-          formatted_shippings << format_shipping(shipping)
-        end
-
-        { shippings: formatted_shippings }
+        { shippings: shippings.map {|s| format_shipping(s)} }
       end
 
       def format_shipping(shipping)
         if shipping[:codigo_erro].to_i.zero?
           {
-            type: HELPER.shipping_type_inverse(shipping[:tipo]),
+            type: inverse_reverse_shipping_type(shipping[:tipo]),
             code: shipping[:id_cliente],
             ticket_number: shipping[:numero_coleta],
             label_number: shipping[:numero_etiqueta],
             object_id: shipping[:id_obj],
-            deadline: HELPER.convert_string_to_date(shipping[:prazo])
+            deadline: string_to_date(shipping[:prazo])
           }
         else
           {
-            type: HELPER.shipping_type_inverse(shipping[:tipo]),
+            type: inverse_reverse_shipping_type(shipping[:tipo]),
             code: shipping[:id_cliente],
             error: shipping[:descricao_erro]
           }

data/lib/reverse_logistics/requests/request_ticket_numbers.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module ReverseLogistics
-    class RequestTicketNumbers < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class RequestTicketNumbers < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @ticket_type = data[:ticket_type]
         @service = data[:service]
         @amount = data[:amount]
@@ -24,16 +14,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:solicitar_range,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(ReverseLogistics.client.call(
+            :solicitar_range,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
         rescue Savon::HTTPError => error
-          if error.http.code == 401
-            generate_exception("Unauthorized (#{error.http.code}).")
-          end
-          generate_exception("Unknown HTTP error (#{error.http.code}).")
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -41,15 +30,15 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(ReverseLogistics.namespaces) do
             xml['soap'].Body do
               xml['ns1'].solicitarRange do
                 parent_namespace = xml.parent.namespace
                 xml.parent.namespace = nil
 
                 xml.codAdministrativo @credentials.administrative_code
-                xml.tipo HELPER.ticket_type(@ticket_type)
-                xml.servico service(@service)
+                xml.tipo ticket_type(@ticket_type)
+                xml.servico reverse_shipping_service(@service)
                 xml.quantidade @amount
 
                 xml.parent.namespace = parent_namespace
@@ -61,7 +50,7 @@ module Correios
 
       def format_response(response)
         response = response[:solicitar_range_response][:solicitar_range]
-        generate_exception(response[:msg_erro]) if response[:cod_erro] != '0'
+        generate_revese_logistics_exception(response)
 
         initial_number = response[:faixa_inicial].to_i
         final_number = response[:faixa_final].to_i
@@ -74,17 +63,6 @@ module Correios
 
         { ticket_numbers: ticket_numbers }
       end
-
-      def service(service)
-        case service
-        when :pac
-          'LR'
-        when :sedex
-          'LS'
-        when :e_sedex
-          'LV'
-        end
-      end
     end
   end
 end

data/lib/reverse_logistics/requests/track_shipping.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module ReverseLogistics
-    class TrackShipping < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class TrackShipping < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @ticket_number = data[:ticket_number]
         @type = data[:type]
         @result_type = data[:result_type]
@@ -24,16 +14,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:acompanhar_pedido,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(ReverseLogistics.client.call(
+            :acompanhar_pedido,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
         rescue Savon::HTTPError => error
-          if error.http.code == 401
-            generate_exception("Unauthorized (#{error.http.code}).")
-          end
-          generate_exception("Unknown HTTP error (#{error.http.code}).")
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -41,7 +30,7 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(ReverseLogistics.namespaces) do
             xml['soap'].Body do
               xml['ns1'].acompanharPedido do
                 parent_namespace = xml.parent.namespace
@@ -49,8 +38,8 @@ module Correios
 
                 xml.codAdministrativo @credentials.administrative_code
                 xml.numeroPedido @ticket_number
-                xml.tipoSolicitacao HELPER.shipping_type(@type)
-                xml.tipoBusca HELPER.tracking_result_type(@result_type)
+                xml.tipoSolicitacao reverse_shipping_type(@type)
+                xml.tipoBusca reverse_tracking_result_type(@result_type)
 
                 xml.parent.namespace = parent_namespace
               end
@@ -61,7 +50,7 @@ module Correios
 
       def format_response(response)
         response = response[:acompanhar_pedido_response][:acompanhar_pedido]
-        generate_exception(response[:msg_erro]) if response[:cod_erro].to_i != 0
+        generate_revese_logistics_exception(response)
 
         events = response[:coleta][:historico]
         events = [events] if events.is_a?(Hash)
@@ -69,24 +58,14 @@ module Correios
         objects = response[:coleta][:objeto]
         objects = [objects] if objects.is_a?(Hash)
 
-        formatted_events = []
-        events.each do |event|
-          formatted_events << format_event(event)
-        end
-
-        formatted_objects = []
-        objects.each do |object|
-          formatted_objects << format_object(object)
-        end
-
         {
           ticket_number: response[:coleta][:numero_pedido],
-          type: HELPER.shipping_type_inverse(
+          type: inverse_reverse_shipping_type(
             response[:tipo_solicitacao]
           ),
           code: response[:coleta][:controle_cliente],
-          events: formatted_events,
-          objects: formatted_objects
+          events: events.map {|e| format_event(e)},
+          objects: objects.map {|o| format_object(o)}
         }
       end
 
@@ -94,7 +73,7 @@ module Correios
         {
           status: event[:status],
           description: event[:descricao_status],
-          time: HELPER.convert_string_to_date_time(
+          time: string_to_time(
             event[:data_atualizacao], event[:hora_atualizacao]
           ),
           note: event[:observacao]
@@ -110,7 +89,7 @@ module Correios
           last_event: {
             status: object[:ultimo_status],
             description: object[:descricao_status],
-            time: HELPER.convert_string_to_date_time(
+            time: string_to_time(
               object[:data_ultima_atualizacao], object[:hora_ultima_atualizacao]
             )
           }

data/lib/reverse_logistics/requests/track_shippings_by_date.rb

@@ -1,20 +1,10 @@
-require 'savon'
-require 'nokogiri'
-
-require_relative '../client'
-require_relative '../helper'
-require_relative '../../correios_exception.rb'
-
 module Correios
   module ReverseLogistics
-    class TrackShippingsByDate < CorreiosException
-      HELPER = Helper.new
-      CLIENT = Client.new
-
+    class TrackShippingsByDate < Helper
       def initialize(data = {})
         @credentials = Correios.credentials
-
         @show_request = data[:show_request]
+
         @type = data[:type]
         @date = data[:date]
         super()
@@ -23,16 +13,15 @@ module Correios
       def request
         puts xml if @show_request == true
         begin
-          format_response(CLIENT.client.call(:acompanhar_pedido_por_data,
-                                             soap_action: '',
-                                             xml: xml).to_hash)
+          format_response(ReverseLogistics.client.call(
+            :acompanhar_pedido_por_data,
+            soap_action: '',
+            xml: xml
+          ).to_hash)
         rescue Savon::SOAPFault => error
-          generate_exception(error)
+          generate_soap_fault_exception(error)
         rescue Savon::HTTPError => error
-          if error.http.code == 401
-            generate_exception("Unauthorized (#{error.http.code}).")
-          end
-          generate_exception("Unknown HTTP error (#{error.http.code}).")
+          generate_http_exception(error.http.code)
         end
       end
 
@@ -40,15 +29,15 @@ module Correios
 
       def xml
         Nokogiri::XML::Builder.new(encoding: 'UTF-8') do |xml|
-          xml['soap'].Envelope(HELPER.namespaces) do
+          xml['soap'].Envelope(ReverseLogistics.namespaces) do
             xml['soap'].Body do
               xml['ns1'].acompanharPedidoPorData do
                 parent_namespace = xml.parent.namespace
                 xml.parent.namespace = nil
 
                 xml.codAdministrativo @credentials.administrative_code
-                xml.tipoSolicitacao HELPER.shipping_type(@type)
-                xml.data HELPER.convert_date_to_string(@date)
+                xml.tipoSolicitacao reverse_shipping_type(@type)
+                xml.data date_to_string(@date)
 
                 xml.parent.namespace = parent_namespace
               end
@@ -59,21 +48,16 @@ module Correios
 
       def format_response(response)
         response = response[:acompanhar_pedido_por_data_response][:acompanhar_pedido_por_data]
-        generate_exception(response[:msg_erro]) if response[:cod_erro].present?
+        generate_revese_logistics_exception(response)
 
         shippings = response[:coleta]
         shippings = [shippings] if shippings.is_a?(Hash)
 
-        formatted_shippings = []
-        shippings.each do |shipping|
-          formatted_shippings << format_shippping(shipping)
-        end
-
         {
-          type: HELPER.shipping_type_inverse(
+          type: inverse_reverse_shipping_type(
             response[:tipo_solicitacao]
           ),
-          shippings: formatted_shippings
+          shippings: shippings.map {|s| format_shippping(s)}
         }
       end
 
@@ -84,21 +68,11 @@ module Correios
         objects = shipping[:objeto]
         objects = [objects] if objects.is_a?(Hash)
 
-        formatted_events = []
-        events.each do |event|
-          formatted_events << format_event(event)
-        end
-
-        formatted_objects = []
-        objects.each do |object|
-          formatted_objects << format_object(object)
-        end
-
         {
           ticket_number: shipping[:numero_pedido],
           code: shipping[:controle_cliente],
-          events: formatted_events,
-          objects: formatted_objects
+          events: events.map {|e| format_event(e)},
+          objects: objects.map {|o| format_object(o)}
         }
       end
 
@@ -106,7 +80,7 @@ module Correios
         {
           status: event[:status],
           description: event[:descricao_status],
-          time: HELPER.convert_string_to_date_time(
+          time: string_to_time(
             event[:data_atualizacao], event[:hora_atualizacao]
           ),
           note: event[:observacao]
@@ -122,7 +96,7 @@ module Correios
           last_event: {
             status: object[:ultimo_status],
             description: object[:descricao_status],
-            time: HELPER.convert_string_to_date_time(
+            time: string_to_time(
               object[:data_ultima_atualizacao], object[:hora_ultima_atualizacao]
             )
           }

data/lib/sigep/auxiliars/shipping_xml.rb

@@ -0,0 +1,100 @@
+module Correios
+  module Sigep
+    def self.shipping_xml(data)
+      helper = Helper.new
+      credentials = Correios.credentials
+      sender = data[:sender]
+      sender_address = sender[:address]
+      shippings = data[:shippings]
+
+      Nokogiri::XML::Builder.new(encoding: 'ISO-8859-1') do |xml|
+        xml.correioslog do
+          xml.tipo_arquivo 'Postagem'
+          xml.versao_arquivo '2.3'
+          xml.plp do
+            xml.id_plp
+            xml.valor_global
+            xml.mcu_unidade_postagem
+            xml.nome_unidade_postagem
+            xml.cartao_postagem credentials.card
+          end
+          xml.remetente do
+            xml.numero_contrato credentials.contract
+            xml.numero_diretoria sender[:board_id]
+            xml.codigo_administrativo credentials.administrative_code
+            xml.nome_remetente sender[:name]
+            xml.logradouro_remetente sender_address[:street]
+            xml.numero_remetente sender_address[:number]
+            xml.complemento_remetente sender_address[:additional]
+            xml.bairro_remetente sender_address[:neighborhood]
+            xml.cep_remetente sender_address[:zip_code]
+            xml.cidade_remetente sender_address[:city]
+            xml.uf_remetente sender_address[:state]
+            xml.telefone_remetente sender[:phone]
+            xml.fax_remetente sender[:fax]
+            xml.email_remetente sender[:email]
+          end
+          xml.forma_pagamento helper.payment_method(data[:payment_method])
+          shippings.each do |shipping|
+            receiver = shipping[:receiver]
+            receiver_address = receiver[:address]
+            object = shipping[:object]
+            invoice = shipping[:invoice] || {}
+            additional_services = shipping[:additional_services] || []
+            notes = shipping[:notes] || []
+
+            xml.objeto_postal do
+              xml.numero_etiqueta shipping[:label_number]
+              xml.codigo_objeto_cliente shipping[:code]
+              xml.codigo_servico_postagem shipping[:service_code]
+              xml.cubagem 0
+              xml.peso object[:weight]
+              xml.rt1 notes[0]
+              xml.rt2 notes[1]
+              xml.destinatario do
+                xml.nome_destinatario receiver[:name]
+                xml.telefone_destinatario receiver[:phone]
+                xml.celular_destinatario receiver[:cellphone]
+                xml.email_destinatario receiver[:email]
+                xml.logradouro_destinatario receiver_address[:street]
+                xml.complemento_destinatario receiver_address[:additional]
+                xml.numero_end_destinatario receiver_address[:number]
+              end
+              xml.nacional do
+                xml.bairro_destinatario receiver_address[:neighborhood]
+                xml.cidade_destinatario receiver_address[:city]
+                xml.uf_destinatario receiver_address[:state]
+                xml.cep_destinatario receiver_address[:zip_code]
+                xml.codigo_usuario_postal
+                xml.centro_custo_cliente shipping[:cost_center]
+                xml.numero_nota_fiscal invoice[:number]
+                xml.serie_nota_fiscal invoice[:serie]
+                xml.valor_nota_fiscal invoice[:value]
+                xml.natureza_nota_fiscal invoice[:kind]
+                xml.descricao_objeto shipping[:description]
+                xml.valor_a_cobrar shipping[:additional_value]
+              end
+              xml.servico_adicional do
+                additional_services.each do |additional_service|
+                  xml.codigo_servico_adicional additional_service
+                end
+                xml.valor_declarado shipping[:declared_value]
+              end
+              xml.dimensao_objeto do
+                xml.tipo_objeto helper.object_type(object[:type])
+                xml.dimensao_altura object[:height] || 0
+                xml.dimensao_largura object[:width] || 0
+                xml.dimensao_comprimento object[:length] || 0
+                xml.dimensao_diametro object[:diameter] || 0
+              end
+              xml.data_postagem_sara
+              xml.status_processamento 0
+              xml.numero_comprovante_postagem
+              xml.valor_cobrado
+            end
+          end
+        end
+      end.to_xml.encode(Encoding::UTF_8)
+    end
+  end
+end