friendly_shipping 0.4.3 → 0.4.4

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: 4d761859165aa830263e2c0a32ffb65f48b8a139
-  data.tar.gz: '010484c2f0bce6443d15eecdf86b82d9ffb68ca5'
+  metadata.gz: 26ef19bf95bf17a1e4d817c37b57bc5e2b2b0916
+  data.tar.gz: 945c1eeb560ddb6e457d7fd82c696c1496122749
 SHA512:
-  metadata.gz: acc250eb47504239555f0507a6e7aa063c9b6ad1b1cd32eb6b1f0da4b0997f0aa4b1519a6ffc058f8fdeec8e4eefbeb5753ef6779c7aad4032bfa7f003597c26
-  data.tar.gz: 839c5d701cb9f12bca12036a8ca0834a96f2ce91f523f8269c17c5b2e0f16172dc7cb322d7a7a28de3e4ad0127859887e27ea86ff08954ac6cec971193687ec2
+  metadata.gz: aca264652de28e83178c63c5fec09b9dbba40c8ad9c6f59540c94dab1dc0009d31e760ec48b4eb162de11018948f52522540e10e79384de2f068806b6e3d1685
+  data.tar.gz: a0def3163d4e5c8856e0c4c92b48020eac8f93183949302c1d99ad401ad8595659fece76cd55e77008a80c71e256f28e97b9664ab0ed5de242f5c4a5a4caf733

data/CHANGELOG.md

@@ -4,6 +4,12 @@ All notable changes to this project will be documented in this file.
 The format is based on [Keep a Changelog](https://keepachangelog.com/en/1.0.0/),
 and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0.html).
 
+## [0.4.4] - 2019-11-27
+
+### Changed
+- UPS Labels: Allow passing ShipperReleaseIndicator
+- UPS Labels: Fix bug that did not allow reference numbers
+
 ## [0.4.3] - 2019-11-27
 
 ### Changed

data/lib/friendly_shipping/services/ups/label_package_options.rb

@@ -11,6 +11,8 @@ module FriendlyShipping
       #   values are _reference number values_. Example: `{ reference_numbers: { xn: 'my_reference_1 }`
       # @option delivery_confirmation [Symbol] Can be set to any key from PACKAGE_DELIVERY_CONFIRMATION_CODES.
       #   Only possible for domestic shipments or shipments between the US and Puerto Rico.
+      # @option shipper_release [Boolean] Indicates that the package may be released by driver without a signature from the
+      #   consignee. Default: false
       class LabelPackageOptions < FriendlyShipping::PackageOptions
         PACKAGE_DELIVERY_CONFIRMATION_CODES = {
           delivery_confirmation: 1,
@@ -18,15 +20,17 @@ module FriendlyShipping
           delivery_confirmation_adult_signature_required: 3
         }.freeze
 
-        attr_reader :reference_numbers
+        attr_reader :reference_numbers, :shipper_release
 
         def initialize(
           reference_numbers: {},
           delivery_confirmation: nil,
+          shipper_release: false,
           **kwargs
         )
           @reference_numbers = reference_numbers
           @delivery_confirmation = delivery_confirmation
+          @shipper_release = shipper_release
           super kwargs.merge(item_options_class: LabelItemOptions)
         end
 

data/lib/friendly_shipping/services/ups/serialize_shipment_confirm_request.rb

@@ -158,7 +158,8 @@ module FriendlyShipping
                       xml: xml,
                       package: package,
                       reference_numbers: reference_numbers,
-                      delivery_confirmation_code: delivery_confirmation_code
+                      delivery_confirmation_code: delivery_confirmation_code,
+                      shipper_release: package_options.shipper_release
                     )
                   end
                 end
@@ -191,7 +192,7 @@ module FriendlyShipping
           # if the package is US -> US or PR -> PR the only type of reference numbers that are allowed are package-level
           # Otherwise the only type of reference numbers that are allowed are shipment-level
           def allow_package_level_reference_numbers(shipment)
-            origin, destination = shipment.origin.country, shipment.destination.country
+            origin, destination = shipment.origin.country.code, shipment.destination.country.code
             [['US', 'US'], ['PR', 'PR']].include?([origin, destination])
           end
 
@@ -200,7 +201,7 @@ module FriendlyShipping
           # otherwise the delivery_confirmation option must be specified on the entire shipment.
           # See Appendix P of UPS Shipping Package XML Developers Guide for the rules on which the logic below is based.
           def package_level_delivery_confirmation?(shipment)
-            origin, destination = shipment.origin.country, shipment.destination.country
+            origin, destination = shipment.origin.country.code, shipment.destination.country.code
             origin == destination || [['US', 'PR'], ['PR', 'US']].include?([origin, destination])
           end
 

data/lib/friendly_shipping/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module FriendlyShipping
-  VERSION = "0.4.3"
+  VERSION = "0.4.4"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: friendly_shipping
 version: !ruby/object:Gem::Version
-  version: 0.4.3
+  version: 0.4.4
 platform: ruby
 authors:
 - Martin Meyerhoff
 autorequire: 
 bindir: exe
 cert_chain: []
-date: 2019-11-27 00:00:00.000000000 Z
+date: 2019-11-28 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: data_uri