Skip to content
Permalink

Comparing changes

Choose two branches to see what’s changed or to start a new pull request. If you need to, you can also or learn more about diff comparisons.

Open a pull request

Create a new pull request by comparing changes across two branches. If you need to, you can also . Learn more about diff comparisons here.
base repository: ecommerce-ventures/deliveries
Failed to load repositories. Confirm that selected base ref is valid, then try again.
Loading
base: v0.3.2
Choose a base ref
...
head repository: ecommerce-ventures/deliveries
Failed to load repositories. Confirm that selected head ref is valid, then try again.
Loading
compare: master
Choose a head ref
  • 4 commits
  • 6 files changed
  • 4 contributors

Commits on Mar 22, 2024

  1. Prefix delivery location with country code in Mondial Relay Dual (#7)

    circunspecter authored Mar 22, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    1445c2a View commit details
  2. Version bump to 0.3.3

    circunspecter committed Mar 22, 2024
    Copy the full SHA
    0ce212f View commit details

Commits on Nov 29, 2024

  1. Set default weight to one for Envialia shipping labels (#8)

    * Set default weight to one for Envialia shipping labels
    
    * Set default weight to one for Envialia shipping labels
    drodriguezgood authored Nov 29, 2024

    Verified

    This commit was created on GitHub.com and signed with GitHub’s verified signature.
    Copy the full SHA
    e711e8e View commit details

Commits on Dec 5, 2024

  1. Version bump to 0.3.4

    franvegar committed Dec 5, 2024
    Copy the full SHA
    2267aa4 View commit details
12 changes: 11 additions & 1 deletion CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -6,6 +6,14 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0

## [Unreleased]

## [0.3.4] - 2024-12-05
### Fixed
- Set default weight to one for Envialia shipping labels.

## [0.3.3] - 2024-03-22
### Fixed
- Prefix delivery location with country code in Mondial Relay Dual.

## [0.3.2] - 2023-09-14
### Fixed
- Add follow_redirect to MondialRelay module API call
@@ -33,7 +41,9 @@ 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.3.2...HEAD
[Unreleased]: https://github.com/ecommerce-ventures/deliveries/compare/v0.3.4...HEAD
[0.3.4]: https://github.com/ecommerce-ventures/deliveries/compare/v0.3.3...v0.3.4
[0.3.3]: https://github.com/ecommerce-ventures/deliveries/compare/v0.3.2...v0.3.3
[0.3.2]: https://github.com/ecommerce-ventures/deliveries/compare/v0.3.1...v0.3.2
[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
31 changes: 17 additions & 14 deletions Gemfile.lock
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
PATH
remote: .
specs:
deliveries (0.3.2)
deliveries (0.3.4)
activesupport (>= 5.2.0)
hexapdf
httparty
@@ -12,7 +12,7 @@ PATH
GEM
remote: https://rubygems.org/
specs:
activesupport (6.1.7.6)
activesupport (6.1.7.7)
concurrent-ruby (~> 1.0, >= 1.0.2)
i18n (>= 1.6, < 2)
minitest (>= 5.1)
@@ -27,17 +27,17 @@ GEM
builder (3.2.4)
byebug (11.1.3)
cmdparse (3.0.7)
concurrent-ruby (1.2.2)
concurrent-ruby (1.2.3)
crack (0.4.5)
rexml
date (3.3.3)
date (3.3.4)
diff-lcs (1.4.4)
geom2d (0.4.1)
gyoku (1.4.0)
builder (>= 2.1.2)
rexml (~> 3.0)
hashdiff (1.0.1)
hexapdf (0.33.0)
hexapdf (0.36.0)
cmdparse (~> 3.0, >= 3.0.3)
geom2d (~> 0.4, >= 0.4.1)
openssl (>= 2.2.1)
@@ -46,7 +46,7 @@ GEM
multi_xml (>= 0.5.2)
httpi (3.0.1)
rack
i18n (1.14.1)
i18n (1.14.4)
concurrent-ruby (~> 1.0)
mail (2.8.1)
mini_mime (>= 0.1.1)
@@ -55,27 +55,29 @@ GEM
net-smtp
mini_magick (4.12.0)
mini_mime (1.1.5)
minitest (5.20.0)
mini_portile2 (2.8.8)
minitest (5.22.3)
multi_xml (0.6.0)
net-imap (0.3.7)
date
net-protocol
net-pop (0.1.2)
net-protocol
net-protocol (0.2.1)
net-protocol (0.2.2)
timeout
net-smtp (0.3.3)
net-smtp (0.4.0.1)
net-protocol
nokogiri (1.13.10-x86_64-linux)
nokogiri (1.13.10)
mini_portile2 (~> 2.8.0)
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.7.1)
rack (3.0.8)
racc (1.7.3)
rack (3.0.10)
rainbow (3.0.0)
rake (13.0.6)
regexp_parser (2.1.1)
@@ -114,7 +116,7 @@ GEM
nokogiri (>= 1.8.1)
nori (~> 2.4)
wasabi (~> 3.4)
timeout (0.4.0)
timeout (0.4.1)
tzinfo (2.0.6)
concurrent-ruby (~> 1.0)
unicode-display_width (1.8.0)
@@ -126,9 +128,10 @@ GEM
addressable (>= 2.8.0)
crack (>= 0.3.2)
hashdiff (>= 0.4.0, < 2.0.0)
zeitwerk (2.6.11)
zeitwerk (2.6.13)

PLATFORMS
ruby
x86_64-linux

DEPENDENCIES
2 changes: 1 addition & 1 deletion lib/deliveries/couriers/envialia/shipments/create.rb
Original file line number Diff line number Diff line change
@@ -92,7 +92,7 @@ def body
<strCodPais>#{receiver.country}</strCodPais>
<intDoc>0</intDoc>
<intPaq>#{parcels}</intPaq>
<dPesoOri>0</dPesoOri>
<dPesoOri>1</dPesoOri>
<dAltoOri>0</dAltoOri>
<dAnchoOri>0</dAnchoOri>
<dLargoOri>0</dLargoOri>
Original file line number Diff line number Diff line change
@@ -61,7 +61,7 @@ def delivery_mode
if collection_point
{
mode: '24R',
location: collection_point.point_id
location: "#{receiver.country.upcase}-#{collection_point.point_id}"
}
else
home_delivery_mode = MondialRelayDual.config("countries.#{receiver.country.downcase}.home_delivery_mode") || 'HOM'
2 changes: 1 addition & 1 deletion lib/deliveries/version.rb
Original file line number Diff line number Diff line change
@@ -1,5 +1,5 @@
# frozen_string_literal: true

module Deliveries
VERSION = '0.3.2'
VERSION = '0.3.4'
end
4 changes: 2 additions & 2 deletions spec/deliveries/support/envialia_stubs.rb
Original file line number Diff line number Diff line change
@@ -58,7 +58,7 @@ def register_envialia_create_shipment_stubs

stub_request(:post, "http://wstest.envialia.com:9085/SOAP?service=WebServService").
with(
body: "<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\">\n <soap:Header>\n <ROClientIDHeader xmlns=\"http://tempuri.org/\">\n <ID>{4ADFBA16-05FC-47AF-BB70-95D7DC61C161}</ID>\n </ROClientIDHeader>\n </soap:Header>\n <soap:Body>\n <WebServService___GrabaEnvio8 xmlns=\"http://tempuri.org/\">\n <strCodAgeCargo>test</strCodAgeCargo>\n <strCodAgeOri>test</strCodAgeOri>\n <dtFecha>#{Date.tomorrow.strftime('%Y/%m/%d')}</dtFecha>\n <strCodTipoServ>72</strCodTipoServ>\n <strCodCli>test</strCodCli>\n <strNomOri>Sender name</strNomOri>\n <strPobOri>Erandio</strPobOri>\n <strDirOri>Sender street</strDirOri>\n <strCPOri>48950</strCPOri>\n <strTlfOri>666666666</strTlfOri>\n <strNomDes>Receiver name</strNomDes>\n <strPobDes>Erandio</strPobDes>\n <strDirDes>Receiver street</strDirDes>\n <strCPDes>48950</strCPDes>\n <strTlfDes>666666666</strTlfDes>\n <strCodPais>ES</strCodPais>\n <intDoc>0</intDoc>\n <intPaq>1</intPaq>\n <dPesoOri>0</dPesoOri>\n <dAltoOri>0</dAltoOri>\n <dAnchoOri>0</dAnchoOri>\n <dLargoOri>0</dLargoOri>\n <dReembolso>0</dReembolso>\n <dValor>0</dValor>\n <dAnticipo>0</dAnticipo>\n <dCobCli>0</dCobCli>\n <strObs></strObs>\n <boSabado>false</boSabado>\n <boRetorno>false</boRetorno>\n <boGestOri>false</boGestOri>\n <boGestDes>false</boGestDes>\n <boAnulado>false</boAnulado>\n <boAcuse>false</boAcuse>\n <strRef>shipmentX</strRef>\n <dBaseImp>0</dBaseImp>\n <dImpuesto>0</dImpuesto>\n <boPorteDebCli>false</boPorteDebCli>\n <strDesDirEmails>receiver@example.com</strDesDirEmails>\n <boInsert>true</boInsert>\n <boCampo5>false</boCampo5>\n <boPagoDUAImp>false</boPagoDUAImp>\n <boPagoImpDes>false</boPagoImpDes>\n </WebServService___GrabaEnvio8>\n </soap:Body>\n</soap:Envelope>\n",
body: "<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\">\n <soap:Header>\n <ROClientIDHeader xmlns=\"http://tempuri.org/\">\n <ID>{4ADFBA16-05FC-47AF-BB70-95D7DC61C161}</ID>\n </ROClientIDHeader>\n </soap:Header>\n <soap:Body>\n <WebServService___GrabaEnvio8 xmlns=\"http://tempuri.org/\">\n <strCodAgeCargo>test</strCodAgeCargo>\n <strCodAgeOri>test</strCodAgeOri>\n <dtFecha>#{Date.tomorrow.strftime('%Y/%m/%d')}</dtFecha>\n <strCodTipoServ>72</strCodTipoServ>\n <strCodCli>test</strCodCli>\n <strNomOri>Sender name</strNomOri>\n <strPobOri>Erandio</strPobOri>\n <strDirOri>Sender street</strDirOri>\n <strCPOri>48950</strCPOri>\n <strTlfOri>666666666</strTlfOri>\n <strNomDes>Receiver name</strNomDes>\n <strPobDes>Erandio</strPobDes>\n <strDirDes>Receiver street</strDirDes>\n <strCPDes>48950</strCPDes>\n <strTlfDes>666666666</strTlfDes>\n <strCodPais>ES</strCodPais>\n <intDoc>0</intDoc>\n <intPaq>1</intPaq>\n <dPesoOri>1</dPesoOri>\n <dAltoOri>0</dAltoOri>\n <dAnchoOri>0</dAnchoOri>\n <dLargoOri>0</dLargoOri>\n <dReembolso>0</dReembolso>\n <dValor>0</dValor>\n <dAnticipo>0</dAnticipo>\n <dCobCli>0</dCobCli>\n <strObs></strObs>\n <boSabado>false</boSabado>\n <boRetorno>false</boRetorno>\n <boGestOri>false</boGestOri>\n <boGestDes>false</boGestDes>\n <boAnulado>false</boAnulado>\n <boAcuse>false</boAcuse>\n <strRef>shipmentX</strRef>\n <dBaseImp>0</dBaseImp>\n <dImpuesto>0</dImpuesto>\n <boPorteDebCli>false</boPorteDebCli>\n <strDesDirEmails>receiver@example.com</strDesDirEmails>\n <boInsert>true</boInsert>\n <boCampo5>false</boCampo5>\n <boPagoDUAImp>false</boPagoDUAImp>\n <boPagoImpDes>false</boPagoImpDes>\n </WebServService___GrabaEnvio8>\n </soap:Body>\n</soap:Envelope>\n",
headers: {
'Accept'=>'application/json',
'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',
@@ -117,7 +117,7 @@ def register_envialia_create_shipment_stubs

stub_request(:post, "http://wstest.envialia.com:9085/SOAP?service=WebServService").
with(
body: "<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\">\n <soap:Header>\n <ROClientIDHeader xmlns=\"http://tempuri.org/\">\n <ID>{4ADFBA16-05FC-47AF-BB70-95D7DC61C161}</ID>\n </ROClientIDHeader>\n </soap:Header>\n <soap:Body>\n <WebServService___GrabaEnvio8 xmlns=\"http://tempuri.org/\">\n <strCodAgeCargo>test</strCodAgeCargo>\n <strCodAgeOri>test</strCodAgeOri>\n <dtFecha>#{Date.tomorrow.strftime('%Y/%m/%d')}</dtFecha>\n <strCodTipoServ>72</strCodTipoServ>\n <strCodCli>test</strCodCli>\n <strNomOri>Sender name</strNomOri>\n <strPobOri>Erandio</strPobOri>\n <strDirOri>Sender street</strDirOri>\n <strCPOri></strCPOri>\n <strTlfOri>666666666</strTlfOri>\n <strNomDes>Receiver name</strNomDes>\n <strPobDes>Erandio</strPobDes>\n <strDirDes>Receiver street</strDirDes>\n <strCPDes>48950</strCPDes>\n <strTlfDes>666666666</strTlfDes>\n <strCodPais>ES</strCodPais>\n <intDoc>0</intDoc>\n <intPaq>1</intPaq>\n <dPesoOri>0</dPesoOri>\n <dAltoOri>0</dAltoOri>\n <dAnchoOri>0</dAnchoOri>\n <dLargoOri>0</dLargoOri>\n <dReembolso>0</dReembolso>\n <dValor>0</dValor>\n <dAnticipo>0</dAnticipo>\n <dCobCli>0</dCobCli>\n <strObs></strObs>\n <boSabado>false</boSabado>\n <boRetorno>false</boRetorno>\n <boGestOri>false</boGestOri>\n <boGestDes>false</boGestDes>\n <boAnulado>false</boAnulado>\n <boAcuse>false</boAcuse>\n <strRef>shipmentX</strRef>\n <dBaseImp>0</dBaseImp>\n <dImpuesto>0</dImpuesto>\n <boPorteDebCli>false</boPorteDebCli>\n <strDesDirEmails>receiver@example.com</strDesDirEmails>\n <boInsert>true</boInsert>\n <boCampo5>false</boCampo5>\n <boPagoDUAImp>false</boPagoDUAImp>\n <boPagoImpDes>false</boPagoImpDes>\n </WebServService___GrabaEnvio8>\n </soap:Body>\n</soap:Envelope>\n",
body: "<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\">\n <soap:Header>\n <ROClientIDHeader xmlns=\"http://tempuri.org/\">\n <ID>{4ADFBA16-05FC-47AF-BB70-95D7DC61C161}</ID>\n </ROClientIDHeader>\n </soap:Header>\n <soap:Body>\n <WebServService___GrabaEnvio8 xmlns=\"http://tempuri.org/\">\n <strCodAgeCargo>test</strCodAgeCargo>\n <strCodAgeOri>test</strCodAgeOri>\n <dtFecha>#{Date.tomorrow.strftime('%Y/%m/%d')}</dtFecha>\n <strCodTipoServ>72</strCodTipoServ>\n <strCodCli>test</strCodCli>\n <strNomOri>Sender name</strNomOri>\n <strPobOri>Erandio</strPobOri>\n <strDirOri>Sender street</strDirOri>\n <strCPOri></strCPOri>\n <strTlfOri>666666666</strTlfOri>\n <strNomDes>Receiver name</strNomDes>\n <strPobDes>Erandio</strPobDes>\n <strDirDes>Receiver street</strDirDes>\n <strCPDes>48950</strCPDes>\n <strTlfDes>666666666</strTlfDes>\n <strCodPais>ES</strCodPais>\n <intDoc>0</intDoc>\n <intPaq>1</intPaq>\n <dPesoOri>1</dPesoOri>\n <dAltoOri>0</dAltoOri>\n <dAnchoOri>0</dAnchoOri>\n <dLargoOri>0</dLargoOri>\n <dReembolso>0</dReembolso>\n <dValor>0</dValor>\n <dAnticipo>0</dAnticipo>\n <dCobCli>0</dCobCli>\n <strObs></strObs>\n <boSabado>false</boSabado>\n <boRetorno>false</boRetorno>\n <boGestOri>false</boGestOri>\n <boGestDes>false</boGestDes>\n <boAnulado>false</boAnulado>\n <boAcuse>false</boAcuse>\n <strRef>shipmentX</strRef>\n <dBaseImp>0</dBaseImp>\n <dImpuesto>0</dImpuesto>\n <boPorteDebCli>false</boPorteDebCli>\n <strDesDirEmails>receiver@example.com</strDesDirEmails>\n <boInsert>true</boInsert>\n <boCampo5>false</boCampo5>\n <boPagoDUAImp>false</boPagoDUAImp>\n <boPagoImpDes>false</boPagoImpDes>\n </WebServService___GrabaEnvio8>\n </soap:Body>\n</soap:Envelope>\n",
headers: {
'Accept'=>'application/json',
'Accept-Encoding'=>'gzip;q=1.0,deflate;q=0.6,identity;q=0.3',