deliveries 0.2.1 → 0.3.1

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 8600bc0cc56888deaa08129100cc3d3539c0151cdb6580eae01a2c8e837cbad6
-  data.tar.gz: a8a2433d3d0fab403364049d166bc97b7fa0be01991bf246c6e5b3ce4923439b
+  metadata.gz: 722f7e2f87a1066c05cde809502b9b6d967046893fcb87e8c1a1409840c039f5
+  data.tar.gz: 9d27f01af8de8e2d8b17553b3066ae0cabdac0d3e5d3a45892251e81decd65aa
 SHA512:
-  metadata.gz: 25de14c9c5b522e9bf60f9d439e7b9672fcf5fe484b34ea2817970e1c895eab2ad80b6b5885d47b5ec21f89d19048d6c84e9d52741b8f452031831136d4ab54a
-  data.tar.gz: 154fff2aa85ea1071aed9aaf831c867e010566891b161e5c31b1612c436faa81ad694832d861e630bfbefc810e6f79e8ef949e858eade78bab22d2f9567d3901
+  metadata.gz: 6c2e379b47f9499484147b878851c4ab935f7cbbfcf23eb2624b05d5438d4016e363586e2bed09cbadba55faa72c5942d416459b184f5f8cbc2e6b12648d9c87
+  data.tar.gz: ab0445d3c2af3fe97db2cdd00c3b54a88f5008459efc274bfbacdce0cf445a350961aa774b5d317f496c2a2bd20c208e660895d27ae3f242be8c787dec9766f4

data/CHANGELOG.md

@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.3.1] - 2023-01-13
+### Fixed
+- Inpost week hours
+
+## [0.3.0] - 2021-11-26
+### Added
+- Envialia courier integration
+
 ## [0.2.1] - 2021-11-04
 ### Fixed
 - Field `clienteRecogida` must have the same value as `codDest` in Correos Express pickup.
@@ -21,8 +29,10 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ## [0.1.0] - 2021-09-27
 🎉 First release!
 
-[Unreleased]: https://github.com/ecommerce-ventures/deliveries/compare/v0.2.1...HEAD
+[Unreleased]: https://github.com/ecommerce-ventures/deliveries/compare/v0.3.1...HEAD
+[0.3.1]: https://github.com/ecommerce-ventures/deliveries/compare/v0.3.0...v0.3.1
+[0.3.0]: https://github.com/ecommerce-ventures/deliveries/compare/v0.2.1...v0.3.0
 [0.2.1]: https://github.com/ecommerce-ventures/deliveries/compare/v0.2.0...v0.2.1
 [0.2.0]: https://github.com/ecommerce-ventures/deliveries/compare/v0.1.1...v0.2.0
 [0.1.1]: https://github.com/ecommerce-ventures/deliveries/compare/v0.1.0...v0.1.1
-[0.1.0]: https://github.com/ecommerce-ventures/deliveries/releases/tag/v0.1.0
+[0.1.0]: https://github.com/ecommerce-ventures/deliveries/releases/tag/v0.1.0

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    deliveries (0.2.1)
+    deliveries (0.3.1)
       activesupport (>= 5.2.0)
       hexapdf
       httparty
@@ -12,7 +12,7 @@ PATH
 GEM
   remote: https://rubygems.org/
   specs:
-    activesupport (6.1.4.1)
+    activesupport (6.1.7)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)
@@ -27,40 +27,55 @@ GEM
     builder (3.2.4)
     byebug (11.1.3)
     cmdparse (3.0.7)
-    concurrent-ruby (1.1.9)
+    concurrent-ruby (1.1.10)
     crack (0.4.5)
       rexml
+    date (3.3.3)
     diff-lcs (1.4.4)
     geom2d (0.3.1)
-    gyoku (1.3.1)
+    gyoku (1.4.0)
       builder (>= 2.1.2)
+      rexml (~> 3.0)
     hashdiff (1.0.1)
-    hexapdf (0.17.3)
+    hexapdf (0.28.0)
       cmdparse (~> 3.0, >= 3.0.3)
       geom2d (~> 0.3)
-    httparty (0.20.0)
-      mime-types (~> 3.0)
+      openssl (>= 2.2.1)
+    httparty (0.21.0)
+      mini_mime (>= 1.0.0)
       multi_xml (>= 0.5.2)
-    httpi (2.5.0)
+    httpi (3.0.1)
       rack
-      socksify
-    i18n (1.8.11)
+    i18n (1.12.0)
       concurrent-ruby (~> 1.0)
-    mime-types (3.3.1)
-      mime-types-data (~> 3.2015)
-    mime-types-data (3.2021.0901)
-    mini_magick (4.11.0)
-    minitest (5.14.4)
+    mail (2.8.0.1)
+      mini_mime (>= 0.1.1)
+      net-imap
+      net-pop
+      net-smtp
+    mini_magick (4.12.0)
+    mini_mime (1.1.2)
+    minitest (5.17.0)
     multi_xml (0.6.0)
-    nokogiri (1.12.5-x86_64-linux)
+    net-imap (0.3.4)
+      date
+      net-protocol
+    net-pop (0.1.2)
+      net-protocol
+    net-protocol (0.2.1)
+      timeout
+    net-smtp (0.3.3)
+      net-protocol
+    nokogiri (1.13.10-x86_64-linux)
       racc (~> 1.4)
     nori (2.6.0)
+    openssl (3.1.0)
     parallel (1.21.0)
     parser (3.0.2.0)
       ast (~> 2.4.1)
     public_suffix (4.0.6)
-    racc (1.6.0)
-    rack (2.2.3)
+    racc (1.6.2)
+    rack (3.0.3)
     rainbow (3.0.0)
     rake (13.0.6)
     regexp_parser (2.1.1)
@@ -90,27 +105,28 @@ GEM
     rubocop-ast (1.12.0)
       parser (>= 3.0.1.1)
     ruby-progressbar (1.11.0)
-    savon (2.12.1)
+    savon (2.13.0)
       akami (~> 1.2)
       builder (>= 2.1.2)
       gyoku (~> 1.2)
-      httpi (~> 2.3)
+      httpi (>= 2.4.5)
+      mail (~> 2.5)
       nokogiri (>= 1.8.1)
       nori (~> 2.4)
       wasabi (~> 3.4)
-    socksify (1.7.1)
-    tzinfo (2.0.4)
+    timeout (0.3.1)
+    tzinfo (2.0.5)
       concurrent-ruby (~> 1.0)
     unicode-display_width (1.8.0)
-    wasabi (3.6.1)
+    wasabi (3.8.0)
       addressable
-      httpi (~> 2.0)
+      httpi (~> 3.0)
       nokogiri (>= 1.4.2)
     webmock (3.14.0)
       addressable (>= 2.8.0)
       crack (>= 0.3.2)
       hashdiff (>= 0.4.0, < 2.0.0)
-    zeitwerk (2.5.1)
+    zeitwerk (2.6.6)
 
 PLATFORMS
   x86_64-linux

data/README.md

@@ -6,7 +6,7 @@ Deliveries is a gem that gives you the ability to integrate multiple shipping se
 
 Add the following line to your Gemfile
 
-```bash
+```ruby
 gem 'deliveries'
 ```
 Then run:
@@ -20,7 +20,7 @@ bundle install
 Each courier requires a different configuration, below we will leave some examples
 
 #### 1. Mondial Relay
-```bash
+```ruby
 Deliveries.courier(:mondial_relay).configure do |config|
   config.mondial_relay_merchant = '...'
   config.mondial_relay_key = '...'
@@ -28,7 +28,7 @@ end
 ```
 
 #### 2. Mondial Relay Dual
-```bash
+```ruby
 Deliveries.courier(:mondial_relay_dual).configure do |config|
   config.dual_carrier_login = '...'
   config.dual_carrier_password = '...'
@@ -48,7 +48,7 @@ end
 ```
 
 #### 3. Correos Express
-```bash
+```ruby
 Deliveries.courier(:correos_express).configure do |config|
   config.username = '...'
   config.password = '...'
@@ -67,7 +67,7 @@ end
 ```
 
 #### 4. Spring
-```bash
+```ruby
 Deliveries.courier(:spring).configure do |config|
   config.api_key = '...'
   config.countries = {
@@ -89,7 +89,7 @@ end
 ```
 
 #### 5. UPS
-```bash
+```ruby
 Deliveries.courier(:ups).configure do |config|
   config.license_number = '...'
   config.username = '...'
@@ -103,25 +103,36 @@ Deliveries.courier(:ups).configure do |config|
 end
 ```
 
+#### Time Zone
+
+This library uses Active Support's Time extension, so a time zone must be set before using it:
+
+```ruby
+require 'active_support/time'
+
+# Configure time zone
+Time.zone = 'Madrid'
+```
+
 ## Usage
 
 #### Get collection point by country and postcode
 
-```bash
+```ruby
 # Example Using Ups
 
 Deliveries.courier(:ups).get_collection_points(postcode: '...', country: 'it')
 ```
 #### Get collection point info
 
-```bash
+```ruby
 # Example Using Mondial Relay
 
 Deliveries.courier(:mondial_relay).get_collection_point(global_point_id: 'mondial_relay~fr~00000~XXXXXX')
 ```
 
 #### Create a Shipment
-```bash
+```ruby
 # Example Using Correos Express
 
 sender = Deliveries::Address.new(
@@ -158,7 +169,7 @@ response = Deliveries.courier(:correos_express).create_shipment(
 ```
 
 #### Create a Pickup
-```bash
+```ruby
 # Example Using Spring
 
 sender = Deliveries::Address.new(
@@ -193,7 +204,7 @@ response = Deliveries.courier(:spring).create_pickup(
 ```
 
 #### Download a Label
-```bash
+```ruby
 # Example Using Spring
 
 label = Deliveries.courier(:spring).get_label(tracking_code: '...')

data/lib/deliveries/couriers/envialia/authentication.rb

@@ -0,0 +1,50 @@
+require 'httparty'
+
+module Deliveries
+  module Couriers
+    module Envialia
+      module Authentication
+        include HTTParty
+
+        def session_id
+          response = HTTParty.post(
+            login_endpoint,
+            body: login_body,
+            headers: login_headers,
+            debug_output: Deliveries.debug ? Deliveries.logger : nil
+          )
+
+          raise Deliveries::ClientError unless response.success?
+
+          response.dig('Envelope', 'Header', 'ROClientIDHeader', 'ID')
+        end
+
+        def login_body
+          <<~XML
+            <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+              <soapenv:Body>
+                <tns:LoginWSService___LoginCli2 xmlns:tns="http://tempuri.org/">
+                  <strCodAge>#{Deliveries.courier(:envialia).config(:agency_code)}</strCodAge>
+                  <strCliente>#{Deliveries.courier(:envialia).config(:username)}</strCliente>
+                  <strPass>#{Deliveries.courier(:envialia).config(:password)}</strPass>
+                </tns:LoginWSService___LoginCli2>
+              </soapenv:Body>
+            </soapenv:Envelope>
+          XML
+        end
+
+        def login_headers
+          { 'Content-Type' => 'application/json;charset=UTF-8', 'Accept' => 'application/json' }
+        end
+
+        def login_endpoint
+          if Envialia.live?
+            Envialia::ENVIALIA_LOGIN_ENDPOINT_LIVE
+          else
+            Envialia::ENVIALIA_LOGIN_ENDPOINT_TEST
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deliveries/couriers/envialia/labels/generate.rb

@@ -0,0 +1,88 @@
+require 'httparty'
+
+module Deliveries
+  module Couriers
+    module Envialia
+      module Labels
+        class Generate
+          include HTTParty
+          include Authentication
+
+          attr_accessor :tracking_codes
+
+          def initialize(tracking_codes:)
+            self.tracking_codes = tracking_codes.respond_to?(:each) ? tracking_codes : [tracking_codes]
+          end
+
+          def execute
+            decoded_labels = []
+
+            tracking_codes.each do |tracking_code|
+              response = self.class.post(
+                api_endpoint,
+                body: body(tracking_code),
+                headers: headers,
+                debug_output: Deliveries.debug ? Deliveries.logger : nil
+              )
+
+              raise Deliveries::ClientError unless response.success?
+
+              labels = response.dig('Envelope', 'Body', 'WebServService___ConsEtiquetaEnvio6Response', 'strEtiquetas')
+
+              if labels.blank?
+                raise Deliveries::APIError.new(
+                  'No hay etiqutas disponibles',
+                  404
+                )
+              else
+                decoded_labels << Base64.decode64(labels).force_encoding('binary')
+              end
+            end
+
+            decoded_labels
+          end
+
+          private
+
+          def body(tracking_code)
+            <<~XML
+              <?xml version="1.0" encoding="utf-8"?>
+              <soap:Envelope
+                xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/"
+                xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance"
+                xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+                <soap:Header>
+                  <ROClientIDHeader xmlns="http://tempuri.org/">
+                    <ID>#{session_id}</ID>
+                  </ROClientIDHeader>
+                </soap:Header>
+                <soap:Body>
+                  <WebServService___ConsEtiquetaEnvio6>
+                    <strCodAgeOri>#{Deliveries.courier(:envialia).config(:agency_code)}</strCodAgeOri>
+                    <strAlbaran>#{tracking_code}</strAlbaran>
+                    <strBulto></strBulto>
+                    <boPaginaA4>false</boPaginaA4>
+                    <intNumEtiqImpresasA4>0</intNumEtiqImpresasA4>
+                    <strFormato>PDF</strFormato>
+                  </WebServService___ConsEtiquetaEnvio6>
+                </soap:Body>
+              </soap:Envelope>
+            XML
+          end
+
+          def headers
+            { 'Content-Type' => 'application/json;charset=UTF-8', 'Accept' => 'application/json' }
+          end
+
+          def api_endpoint
+            if Envialia.live?
+              Envialia::ENVIALIA_ENDPOINT_LIVE
+            else
+              Envialia::ENVIALIA_ENDPOINT_TEST
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deliveries/couriers/envialia/pickups/create.rb

@@ -0,0 +1,147 @@
+require 'httparty'
+
+module Deliveries
+  module Couriers
+    module Envialia
+      module Pickups
+        class Create
+          include HTTParty
+          include Authentication
+
+          attr_accessor :sender, :receiver, :parcels,
+                        :reference_code, :pickup_date, :remarks, :tracking_code
+
+          def initialize(sender:, receiver:, parcels:,
+                         reference_code:, pickup_date:, remarks:, tracking_code:)
+
+            self.sender = sender
+            self.receiver = receiver
+            self.parcels = parcels
+            self.reference_code = reference_code
+            self.pickup_date = pickup_date
+            self.remarks = remarks
+            self.tracking_code = tracking_code
+          end
+
+          def execute
+            response = self.class.post(
+              api_endpoint,
+              body: body,
+              headers: headers,
+              debug_output: Deliveries.debug ? Deliveries.logger : nil
+            )
+
+            raise Deliveries::ClientError unless response.success?
+
+            pickup_number = response.dig('Envelope', 'Body', 'WebServService___GrabaRecogida3Response', 'strCodOut')
+
+            if pickup_number
+              Deliveries::Pickup.new(
+                courier_id: 'envialia',
+                sender: sender,
+                receiver: receiver,
+                parcels: parcels,
+                reference_code: reference_code,
+                tracking_code: pickup_number,
+                pickup_date: pickup_date
+              )
+            else
+              exception = response.dig('Envelope', 'Body', 'Fault')
+
+              if exception['faultcode'].eql?('Exception')
+                exception_code, exception_str = exception['faultstring'].split(':')
+              else
+                exception_code = 400
+                exception_str = exception['faultstring']
+              end
+
+              raise Deliveries::APIError.new(
+                exception_str.strip,
+                exception_code.to_i
+              )
+            end
+          end
+
+          private
+
+          def body
+            <<~XML
+              <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+                <soap:Header>
+                <ROClientIDHeader xmlns="http://tempuri.org/">
+                  <ID>#{session_id}</ID>
+                </ROClientIDHeader>
+                </soap:Header>
+                <soap:Body>
+                <WebServService___GrabaRecogida3 xmlns="http://tempuri.org/">
+                  <strCod></strCod>
+                  <strAlbaran>#{tracking_code}</strAlbaran>
+                  <strCodAgeCargo>#{Deliveries.courier(:envialia).config(:agency_code)}</strCodAgeCargo>
+                  <strCodAgeOri></strCodAgeOri>
+                  <dtFecRec>#{pickup_date.strftime('%Y/%m/%d')}</dtFecRec>
+                  <strNomOri>#{sender.name}</strNomOri>
+                  <strPobOri>#{sender.city}</strPobOri>
+                  <strDirOri>#{sender.street}</strDirOri>
+                  <strCPOri>#{format_postcode(sender.postcode, sender.country)}</strCPOri>
+                  <strTlfOri>#{sender.phone}</strTlfOri>
+                  <strNomDes>#{receiver.name}</strNomDes>
+                  <strPobDes>#{receiver.city}</strPobDes>
+                  <strDirDes>#{receiver.street}</strDirDes>
+                  <strCPDes>#{format_postcode(receiver.postcode, receiver.country)}</strCPDes>
+                  <strTlfDes>#{receiver.phone}</strTlfDes>
+                  <strCodPais>#{receiver.country}</strCodPais>
+                  <intBul>#{parcels}</intBul>
+                  <strCodTipoServ>72</strCodTipoServ>
+                  <dPesoOri>0</dPesoOri>
+                  <dAltoOri>0</dAltoOri>
+                  <dAnchoOri>0</dAnchoOri>
+                  <dLargoOri>0</dLargoOri>
+                  <dReembolso>0</dReembolso>
+                  <dValor>0</dValor>
+                  <dAnticipo>0</dAnticipo>
+                  <dCobCli>0</dCobCli>
+                  <strObs>#{remarks}</strObs>
+                  <boSabado>false</boSabado>
+                  <boRetorno>false</boRetorno>
+                  <boGestOri>false</boGestOri>
+                  <boGestDes>false</boGestDes>
+                  <boAnulado>false</boAnulado>
+                  <boAcuse>false</boAcuse>
+                  <strRef>#{reference_code}</strRef>
+                  <dBaseImp>0</dBaseImp>
+                  <dImpuesto>0</dImpuesto>
+                  <boPorteDebCli>false</boPorteDebCli>
+                  <strDesDirEmails>#{receiver.email}</strDesDirEmails>
+                  <boCampo5>false</boCampo5>
+                  <boPagoDUAImp>false</boPagoDUAImp>
+                  <boPagoImpDes>false</boPagoImpDes>
+                </WebServService___GrabaRecogida3>
+              </soap:Body>
+              </soap:Envelope>
+            XML
+          end
+
+          def headers
+            { 'Content-Type' => 'application/json;charset=UTF-8', 'Accept' => 'application/json' }
+          end
+
+          def api_endpoint
+            if Envialia.live?
+              Envialia::ENVIALIA_ENDPOINT_LIVE
+            else
+              Envialia::ENVIALIA_ENDPOINT_TEST
+            end
+          end
+
+          def format_postcode(postcode, country)
+            if country.to_sym.downcase == :pt
+              postcode&.split('-')&.first
+            else
+              postcode
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deliveries/couriers/envialia/pickups/trace/format_response.rb

@@ -0,0 +1,94 @@
+require 'active_support/time'
+require 'active_support/core_ext/hash/conversions'
+require 'active_support/core_ext/time'
+
+module Deliveries
+  module Couriers
+    module Envialia
+      module Pickups
+        class Trace
+          class FormatResponse
+            attr_accessor :response
+
+            def initialize(response:)
+              self.response = response
+            end
+
+            STATUS_CODES = {
+              'R0' => 'Solicitada',
+              'R1' => 'Lectura en delegación',
+              'R2' => 'Asignada',
+              'R3' => 'Incidencia',
+              'R4' => 'Realizada',
+              'R5' => 'Pendiente de asignación',
+              'R6' => 'Recogida fallida',
+              'R7' => 'Finalizada',
+              'R8' => 'Anulada',
+              'R9' => 'Lectura repartidor'
+            }.freeze
+
+            def execute
+              body = response.dig('Envelope', 'Body', 'WebServService___ConsRecEstadosResponse', 'strRecEstados')
+              parsed_response = Hash.from_xml(body).dig('CONSULTA', 'REC_ESTADOS')
+
+              checkpoints = formatted_checkpoints(parsed_response)
+
+              tracking_info_params = {}
+              tracking_info_params[:courier_id] = 'envialia'
+              tracking_info_params[:tracking_code] = nil
+              tracking_info_params[:status] = checkpoints.last.try(:status)
+              tracking_info_params[:checkpoints] = checkpoints
+
+              tracking_info_params
+            end
+
+            private
+
+            def formatted_checkpoints(shipment_statuses)
+              checkpoints = []
+              if shipment_statuses.is_a?(Array)
+                shipment_statuses.each do |shipment_status|
+                  checkpoints << formatted_checkpoint(shipment_status)
+                end
+              else
+                checkpoints << formatted_checkpoint(shipment_statuses)
+              end
+
+              checkpoints
+            end
+
+            def formatted_checkpoint(shipment_status)
+              status = STATUS_CODES[shipment_status['V_COD_TIPO_EST']]
+
+              date = shipment_status['D_FEC_HORA_ALTA']
+
+              Deliveries::Checkpoint.new(
+                status: status(status),
+                location: nil,
+                tracked_at: Time.zone.strptime(date, '%m/%d/%Y %H:%M:%S'),
+                description: status
+              )
+            end
+
+            def status(code)
+              case code
+              when 'Solicitada', 'Lectura en delegación', 'Asignada'
+                :registered
+              when 'Realizada', 'Recogida Parcial (Múltiples Destinos)'
+                :in_transit
+              when 'Recogida fallida', 'Datos insuficientes', 'Error al emitir la recogida'
+                :delivery_failed
+              when 'Anulada', 'Recogida anulada'
+                :cancelled
+              when 'Finalizada'
+                :delivered
+              else
+                :unknown_status
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deliveries/couriers/envialia/pickups/trace.rb

@@ -0,0 +1,69 @@
+require 'httparty'
+
+module Deliveries
+  module Couriers
+    module Envialia
+      module Pickups
+        class Trace
+          include HTTParty
+          include Authentication
+
+          attr_accessor :tracking_code
+
+          def initialize(tracking_code:)
+            self.tracking_code = tracking_code
+          end
+
+          def execute
+            response = self.class.post(
+              api_endpoint,
+              body: body,
+              headers: headers,
+              debug_output: Deliveries.debug ? Deliveries.logger : nil
+            )
+
+            raise Deliveries::ClientError unless response.success?
+
+            if response.dig('Envelope', 'Body', 'WebServService___ConsRecEstadosResponse', 'strRecEstados').nil?
+              raise Deliveries::APIError.new(
+                'No se han encontrado datos para este envío',
+                '402'
+              )
+            else
+              response
+            end
+          end
+
+          def body
+            <<~XML
+              <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+                <soapenv:Header>
+                  <tns:ROClientIDHeader xmlns:tns="http://tempuri.org/">
+                    <tns:ID>#{session_id}</tns:ID>
+                  </tns:ROClientIDHeader>
+                </soapenv:Header>
+                <soapenv:Body>
+                  <tns:WebServService___ConsRecEstados xmlns:tns="http://tempuri.org/">
+                    <tns:strCodRec>#{tracking_code}</tns:strCodRec>
+                  </tns:WebServService___ConsRecEstados>
+                </soapenv:Body>
+              </soapenv:Envelope>
+            XML
+          end
+
+          def headers
+            { 'Content-Type' => 'application/json;charset=UTF-8', 'Accept' => 'application/json' }
+          end
+
+          def api_endpoint
+            if Envialia.live?
+              Envialia::ENVIALIA_ENDPOINT_LIVE
+            else
+              Envialia::ENVIALIA_ENDPOINT_TEST
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deliveries/couriers/envialia/shipments/create.rb

@@ -0,0 +1,148 @@
+require 'httparty'
+
+module Deliveries
+  module Couriers
+    module Envialia
+      module Shipments
+        class Create
+          include HTTParty
+          include Authentication
+
+          attr_accessor :sender, :receiver, :collection_point, :parcels,
+                        :reference_code, :shipment_date, :remarks
+
+          def initialize(sender:, receiver:, collection_point:, parcels:,
+                         reference_code:, shipment_date:, remarks:)
+            self.sender = sender
+            self.receiver = receiver
+            self.collection_point = collection_point
+            self.parcels = parcels
+            self.reference_code = reference_code
+            self.shipment_date = shipment_date
+            self.remarks = remarks
+          end
+
+          def execute
+            response = self.class.post(
+              api_endpoint,
+              body: body,
+              headers: headers,
+              debug_output: Deliveries.debug ? Deliveries.logger : nil
+            )
+
+            raise Deliveries::ClientError unless response.success?
+
+            tracking_code = response.dig('Envelope', 'Body', 'WebServService___GrabaEnvio8Response', 'strAlbaranOut')
+
+            if tracking_code
+              Deliveries::Shipment.new(
+                courier_id: 'envialia',
+                sender: sender,
+                receiver: receiver,
+                parcels: parcels,
+                reference_code: reference_code,
+                tracking_code: tracking_code,
+                shipment_date: shipment_date,
+                label: nil
+              )
+            else
+              exception = response.dig('Envelope', 'Body', 'Fault')
+
+              if exception['faultcode'].eql?('Exception')
+                exception_code, exception_str = exception['faultstring'].split(':')
+              else
+                exception_code = 400
+                exception_str = exception['faultstring']
+              end
+
+              raise Deliveries::APIError.new(
+                exception_str.strip,
+                exception_code.to_i
+              )
+            end
+          end
+
+          private
+
+          def body
+            <<~XML
+              <soap:Envelope xmlns:soap="http://schemas.xmlsoap.org/soap/envelope/" xmlns:xsi="http://www.w3.org/2001/XMLSchema-instance" xmlns:xsd="http://www.w3.org/2001/XMLSchema">
+                <soap:Header>
+                  <ROClientIDHeader xmlns="http://tempuri.org/">
+                    <ID>#{session_id}</ID>
+                  </ROClientIDHeader>
+                </soap:Header>
+                <soap:Body>
+                  <WebServService___GrabaEnvio8 xmlns="http://tempuri.org/">
+                    <strCodAgeCargo>#{Deliveries.courier(:envialia).config(:agency_code)}</strCodAgeCargo>
+                    <strCodAgeOri>#{Deliveries.courier(:envialia).config(:agency_code)}</strCodAgeOri>
+                    <dtFecha>#{shipment_date.strftime('%Y/%m/%d')}</dtFecha>
+                    <strCodTipoServ>72</strCodTipoServ>
+                    <strCodCli>#{Deliveries.courier(:envialia).config(:username)}</strCodCli>
+                    <strNomOri>#{sender.name}</strNomOri>
+                    <strPobOri>#{sender.city}</strPobOri>
+                    <strDirOri>#{sender.street}</strDirOri>
+                    <strCPOri>#{format_postcode(sender.postcode, sender.country)}</strCPOri>
+                    <strTlfOri>#{sender.phone}</strTlfOri>
+                    <strNomDes>#{receiver.name}</strNomDes>
+                    <strPobDes>#{receiver.city}</strPobDes>
+                    <strDirDes>#{receiver.street}</strDirDes>
+                    <strCPDes>#{format_postcode(receiver.postcode, receiver.country)}</strCPDes>
+                    <strTlfDes>#{receiver.phone}</strTlfDes>
+                    <strCodPais>#{receiver.country}</strCodPais>
+                    <intDoc>0</intDoc>
+                    <intPaq>#{parcels}</intPaq>
+                    <dPesoOri>0</dPesoOri>
+                    <dAltoOri>0</dAltoOri>
+                    <dAnchoOri>0</dAnchoOri>
+                    <dLargoOri>0</dLargoOri>
+                    <dReembolso>0</dReembolso>
+                    <dValor>0</dValor>
+                    <dAnticipo>0</dAnticipo>
+                    <dCobCli>0</dCobCli>
+                    <strObs>#{remarks}</strObs>
+                    <boSabado>false</boSabado>
+                    <boRetorno>false</boRetorno>
+                    <boGestOri>false</boGestOri>
+                    <boGestDes>false</boGestDes>
+                    <boAnulado>false</boAnulado>
+                    <boAcuse>false</boAcuse>
+                    <strRef>#{reference_code}</strRef>
+                    <dBaseImp>0</dBaseImp>
+                    <dImpuesto>0</dImpuesto>
+                    <boPorteDebCli>false</boPorteDebCli>
+                    <strDesDirEmails>#{receiver.email}</strDesDirEmails>
+                    <boInsert>true</boInsert>
+                    <boCampo5>false</boCampo5>
+                    <boPagoDUAImp>false</boPagoDUAImp>
+                    <boPagoImpDes>false</boPagoImpDes>
+                  </WebServService___GrabaEnvio8>
+                </soap:Body>
+              </soap:Envelope>
+            XML
+          end
+
+          def headers
+            { 'Content-Type' => 'application/json;charset=UTF-8', 'Accept' => 'application/json' }
+          end
+
+          def api_endpoint
+            if Envialia.live?
+              Envialia::ENVIALIA_ENDPOINT_LIVE
+            else
+              Envialia::ENVIALIA_ENDPOINT_TEST
+            end
+          end
+
+          def format_postcode(postcode, country)
+            if country.to_sym.downcase == :pt
+              postcode&.split('-')&.first
+            else
+              postcode
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deliveries/couriers/envialia/shipments/trace/format_response.rb

@@ -0,0 +1,97 @@
+require 'active_support/time'
+require 'active_support/core_ext/time'
+require 'active_support/core_ext/hash/conversions'
+
+module Deliveries
+  module Couriers
+    module Envialia
+      module Shipments
+        class Trace
+          class FormatResponse
+            attr_accessor :response
+
+            def initialize(response:)
+              self.response = response
+            end
+
+            STATUS_CODES = {
+              '0' => 'Documentado',
+              '1' => 'En Tránsito',
+              '2' => 'En Reparto',
+              '3' => 'Incidencia',
+              '4' => 'Entregado',
+              '5' => 'Devuelto',
+              '6' => 'Recanalizado',
+              '8' => 'Destruido (P.O.Delegación)',
+              '9' => 'Falta definitiva de expedición',
+              '10' => 'Pendiente nuevo reparto',
+              '11' => 'En CS destino',
+              '12' => 'Recogeran en delegacion',
+              '14' => 'Entrega Parcial',
+              '15' => 'Tránsito 72H.',
+              '16' => 'Pendiente de emisión'
+            }.freeze
+
+            def execute
+              body = response.dig('Envelope', 'Body', 'WebServService___ConsEnvEstadosResponse', 'strEnvEstados')
+              parsed_response = Hash.from_xml(body).dig('CONSULTA', 'ENV_ESTADOS')
+
+              checkpoints = formatted_checkpoints(parsed_response)
+
+              tracking_info_params = {}
+              tracking_info_params[:courier_id] = 'envialia'
+              tracking_info_params[:tracking_code] = nil
+              tracking_info_params[:status] = checkpoints.last.try(:status)
+              tracking_info_params[:checkpoints] = formatted_checkpoints(parsed_response)
+
+              tracking_info_params
+            end
+
+            private
+
+            def formatted_checkpoints(shipment_statuses)
+              checkpoints = []
+              if shipment_statuses.is_a?(Array)
+                shipment_statuses.each do |shipment_status|
+                  checkpoints << formatted_checkpoint(shipment_status)
+                end
+              else
+                checkpoints << formatted_checkpoint(shipment_statuses)
+              end
+
+              checkpoints
+            end
+
+            def formatted_checkpoint(shipment_status)
+              status = STATUS_CODES[shipment_status['V_COD_TIPO_EST']]
+
+              date = shipment_status['D_FEC_HORA_ALTA']
+
+              Deliveries::Checkpoint.new(
+                status: status(status),
+                location: nil,
+                tracked_at: Time.zone.strptime(date, '%m/%d/%Y %H:%M:%S'),
+                description: status
+              )
+            end
+
+            def status(code)
+              case code
+              when 'Documentado'
+                :registered
+              when 'En Tránsito', 'En Reparto', 'En CS destino'
+                :in_transit
+              when 'Entregado'
+                :delivered
+              when 'Devuelto'
+                :cancelled
+              else
+                :unknown_status
+              end
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deliveries/couriers/envialia/shipments/trace.rb

@@ -0,0 +1,71 @@
+require 'httparty'
+
+module Deliveries
+  module Couriers
+    module Envialia
+      module Shipments
+        class Trace
+          include HTTParty
+          include Authentication
+
+          attr_accessor :tracking_code
+
+          def initialize(tracking_code:)
+            self.tracking_code = tracking_code
+          end
+
+          def execute
+            response = self.class.post(
+              api_endpoint,
+              body: body,
+              headers: headers,
+              debug_output: Deliveries.debug ? Deliveries.logger : nil
+            )
+
+            raise Deliveries::ClientError unless response.success?
+
+            if response.dig('Envelope', 'Body', 'WebServService___ConsEnvEstadosResponse', 'strEnvEstados').nil?
+              raise Deliveries::APIError.new(
+                'No se han encontrado datos para este envío',
+                '402'
+              )
+            else
+              response
+            end
+          end
+
+          def body
+            <<~XML
+              <soapenv:Envelope xmlns:soapenv="http://schemas.xmlsoap.org/soap/envelope/">
+                <soapenv:Header>
+                  <tns:ROClientIDHeader xmlns:tns="http://tempuri.org/">
+                    <tns:ID>#{session_id}</tns:ID>
+                  </tns:ROClientIDHeader>
+                </soapenv:Header>
+                <soapenv:Body>
+                  <tns:WebServService___ConsEnvEstados xmlns:tns="http://tempuri.org/">
+                    <tns:strCodAgeCargo>#{Deliveries.courier(:envialia).config(:agency_code)}</tns:strCodAgeCargo>
+                    <tns:strCodAgeOri>#{Deliveries.courier(:envialia).config(:agency_code)}</tns:strCodAgeOri>
+                    <tns:strAlbaran>#{tracking_code}</tns:strAlbaran>
+                  </tns:WebServService___ConsEnvEstados>
+                </soapenv:Body>
+              </soapenv:Envelope>
+            XML
+          end
+
+          def headers
+            { 'Content-Type' => 'application/json;charset=UTF-8', 'Accept' => 'application/json' }
+          end
+
+          def api_endpoint
+            if Envialia.live?
+              Envialia::ENVIALIA_ENDPOINT_LIVE
+            else
+              Envialia::ENVIALIA_ENDPOINT_TEST
+            end
+          end
+        end
+      end
+    end
+  end
+end

data/lib/deliveries/couriers/envialia.rb

@@ -0,0 +1,93 @@
+require_relative 'envialia/authentication'
+require_relative 'envialia/shipments/create'
+require_relative 'envialia/shipments/trace/format_response'
+require_relative 'envialia/shipments/trace'
+require_relative 'envialia/pickups/trace/format_response'
+require_relative 'envialia/pickups/trace'
+require_relative 'envialia/pickups/create'
+require_relative 'envialia/labels/generate'
+
+module Deliveries
+  module Couriers
+    module Envialia
+      extend Courier
+
+      Config = Struct.new(
+        :username,
+        :password,
+        :agency_code
+      )
+
+      ENVIALIA_LOGIN_ENDPOINT_LIVE = 'http://ws.envialia.com/SOAP?service=LoginService'.freeze
+      ENVIALIA_LOGIN_ENDPOINT_TEST = 'http://wstest.envialia.com:9085/SOAP?service=LoginService'.freeze
+      ENVIALIA_ENDPOINT_LIVE = 'http://ws.envialia.com/SOAP?service=WebServService'.freeze
+      ENVIALIA_ENDPOINT_TEST = 'http://wstest.envialia.com:9085/SOAP?service=WebServService'.freeze
+
+      module_function
+
+      def create_shipment(sender:, receiver:, parcels:, reference_code:, collection_point: nil, shipment_date: nil, remarks: nil, **)
+        Shipments::Create.new(
+          sender: sender,
+          receiver: receiver,
+          collection_point: collection_point,
+          shipment_date: shipment_date,
+          parcels: parcels,
+          reference_code: reference_code,
+          remarks: remarks
+        ).execute
+      end
+
+      def create_pickup(sender:, receiver:, parcels:, reference_code:, pickup_date: nil, remarks: nil, tracking_code: nil, **)
+        Pickups::Create.new(
+          sender: sender,
+          receiver: receiver,
+          parcels: parcels,
+          reference_code: reference_code,
+          pickup_date: pickup_date,
+          remarks: remarks,
+          tracking_code: tracking_code
+        ).execute
+      end
+
+      def shipment_info(tracking_code:, **)
+        response = Shipments::Trace.new(
+          tracking_code: tracking_code
+        ).execute
+
+        tracking_info_params = Shipments::Trace::FormatResponse.new(response: response).execute
+        tracking_info_params.merge!({ tracking_code: tracking_code })
+        Deliveries::TrackingInfo.new(**tracking_info_params)
+      end
+
+      def pickup_info(tracking_code:, **)
+        response = Pickups::Trace.new(
+          tracking_code: tracking_code
+        ).execute
+
+        tracking_info_params = Pickups::Trace::FormatResponse.new(response: response).execute
+        tracking_info_params.merge!({ tracking_code: tracking_code })
+        Deliveries::TrackingInfo.new(**tracking_info_params)
+      end
+
+      def get_label(tracking_code:, **)
+        pdf = Labels::Generate.new(
+          tracking_codes: tracking_code
+        ).execute.first
+
+        Deliveries::Label.new(raw: pdf)
+      end
+
+      def get_labels(tracking_codes:, **)
+        labels = Deliveries::Labels.new
+
+        Labels::Generate.new(
+          tracking_codes: tracking_codes
+        ).execute.each do |pdf|
+          labels << pdf
+        end
+
+        labels
+      end
+    end
+  end
+end

data/lib/deliveries/couriers/mondial_relay/collection_points/search/format_response.rb

@@ -71,7 +71,7 @@ module Deliveries
               week_hours = get_week_hours_from_result(result)
               week_hours.each do |i, times|
                 timetable[i] = []
-                if times[0] == '0000'
+                if times[0] == '0000' && times[1] == '0000'
                   timetable[i] << nil
                 else
                   timetable[i] << formatted_slot(open: times[0], close: times[1])

data/lib/deliveries/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module Deliveries
-  VERSION = '0.2.1'
+  VERSION = '0.3.1'
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: deliveries
 version: !ruby/object:Gem::Version
-  version: 0.2.1
+  version: 0.3.1
 platform: ruby
 authors:
 - Fran Vega
@@ -11,7 +11,7 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2021-11-04 00:00:00.000000000 Z
+date: 2023-01-13 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activesupport
@@ -171,6 +171,15 @@ files:
 - lib/deliveries/couriers/correos_express/shipments/trace.rb
 - lib/deliveries/couriers/correos_express/shipments/trace/format_response.rb
 - lib/deliveries/couriers/dummy.rb
+- lib/deliveries/couriers/envialia.rb
+- lib/deliveries/couriers/envialia/authentication.rb
+- lib/deliveries/couriers/envialia/labels/generate.rb
+- lib/deliveries/couriers/envialia/pickups/create.rb
+- lib/deliveries/couriers/envialia/pickups/trace.rb
+- lib/deliveries/couriers/envialia/pickups/trace/format_response.rb
+- lib/deliveries/couriers/envialia/shipments/create.rb
+- lib/deliveries/couriers/envialia/shipments/trace.rb
+- lib/deliveries/couriers/envialia/shipments/trace/format_response.rb
 - lib/deliveries/couriers/mondial_relay.rb
 - lib/deliveries/couriers/mondial_relay/address.rb
 - lib/deliveries/couriers/mondial_relay/collection_points/search/format_response.rb