friendly_shipping 0.4.2 → 0.4.3

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA1:
-  metadata.gz: ea451610e13a57cf5515da031454c29350f88fe5
-  data.tar.gz: 448c153d99953e67528b94ad8bc7807c5a3b26f7
+  metadata.gz: 4d761859165aa830263e2c0a32ffb65f48b8a139
+  data.tar.gz: '010484c2f0bce6443d15eecdf86b82d9ffb68ca5'
 SHA512:
-  metadata.gz: 509d6772349fdaac8ba0c35251466bd7d2e08f029ae92ac19acf47987518138ed0f97637d9c45f2caf99fea6ff8e9615798e35c063350673ada20f436a0ec784
-  data.tar.gz: f020a36ab7693c073b5f4949bd02bff7ab9ab450347a8eda729cac3d8e974e05f6520936d705ef71a282fcf0783715b8c61df37e255e31971a8dded64a29a4c6
+  metadata.gz: acc250eb47504239555f0507a6e7aa063c9b6ad1b1cd32eb6b1f0da4b0997f0aa4b1519a6ffc058f8fdeec8e4eefbeb5753ef6779c7aad4032bfa7f003597c26
+  data.tar.gz: 839c5d701cb9f12bca12036a8ca0834a96f2ce91f523f8269c17c5b2e0f16172dc7cb322d7a7a28de3e4ad0127859887e27ea86ff08954ac6cec971193687ec2

data/CHANGELOG.md

@@ -4,6 +4,11 @@ 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.3] - 2019-11-27
+
+### Changed
+- UPS Freight: Allow passing PickupRequest element with Pickup date
+
 ## [0.4.2] - 2019-11-19
 
 ### Changed

data/lib/friendly_shipping/services/ups_freight/generate_freight_rate_request_hash.rb

@@ -19,13 +19,23 @@ module FriendlyShipping
                   Code: options.shipping_method.service_code
                 },
                 Commodity: options.commodity_information_generator.call(shipment: shipment, options: options),
-                TimeInTransitIndicator: 'true'
+                TimeInTransitIndicator: 'true',
+                PickupRequest: pickup_request(options)
               }.compact.merge(handling_units(shipment, options).reduce(&:merge).to_h)
             }
           end
 
           private
 
+          def pickup_request(options)
+            return unless options.pickup_date
+
+            {
+              PickupDate: options.pickup_date.strftime('%Y%m%d'),
+              AdditionalComments: options.pickup_comments
+            }
+          end
+
           def handling_units(shipment, options)
             all_package_options = shipment.packages.map { |package| options.options_for_package(package) }
             all_package_options.group_by(&:handling_unit_code).map do |_handling_unit_code, options_group|

data/lib/friendly_shipping/services/ups_freight/rates_options.rb

@@ -16,6 +16,8 @@ module FriendlyShipping
       #     and an options object to create an Array of commodity fields as per the UPS docs.
       # @attribute [Symbol] billing One of the keys in the `BILLING_CODES` constant. How the shipment
       #     would be billed.
+      # @attribute [Date] pickup_date Date of the Pickup
+      # @attribute [String] pickup_comments Additional pickup instructions
       # @attribute [RatesPackageOptions] package_options Options for each of the packages/pallets in this shipment
       class RatesOptions < FriendlyShipping::ShipmentOptions
         BILLING_CODES = {
@@ -29,6 +31,8 @@ module FriendlyShipping
                     :billing_code,
                     :customer_context,
                     :shipping_method,
+                    :pickup_date,
+                    :pickup_comments,
                     :commodity_information_generator
 
         def initialize(
@@ -37,6 +41,8 @@ module FriendlyShipping
           shipping_method:,
           billing: :prepaid,
           customer_context: nil,
+          pickup_date: nil,
+          pickup_comments: nil,
           commodity_information_generator: GenerateCommodityInformation,
           **kwargs
         )
@@ -45,6 +51,8 @@ module FriendlyShipping
           @shipping_method = shipping_method
           @billing_code = BILLING_CODES.fetch(billing)
           @customer_context = customer_context
+          @pickup_date = pickup_date
+          @pickup_comments = pickup_comments
           @commodity_information_generator = commodity_information_generator
           super kwargs.merge(package_options_class: RatesPackageOptions)
         end

data/lib/friendly_shipping/version.rb

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

metadata

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