ups 0.0.5 → 0.0.6

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 35bf9beb313035a44c0368e0e6e56a4b0092b8db9b7c174352a753afada6e86b
-  data.tar.gz: 9bc83318963bdb23e80ff441ded0b570b86e1ffe842e0d0d301e13aceaef842d
+  metadata.gz: e626b90734e734625637fba39fbab3bdea5049cce4ff12018d58674432eda7c4
+  data.tar.gz: b79d317b84991d35e1f2f585f9185e47bcb1c99c871ba7d6a565e785960f8e68
 SHA512:
-  metadata.gz: b7b24ffd26fc3c9a04d86dc20c82c6000d114459917c8ceaf6cd30283fd6c1b07402ab6e6421648077365f4154127ffc64419dd8c7b7d006125a2e6d848a2101
-  data.tar.gz: 70fe24d8d6b75f2eaca7cc73a2c5d29d438a69c531adf5f3b68dbfda1ace11af8f9ef060bc502e31e172edc416b301bb13bba1852b1dad90c087129e4db4fcfd
+  metadata.gz: de2ec5f3cfc70541b6576f688e970de88707b2039bc174d9e8f38fc40100172557d4d1e84ea5ec30ab0b6f707de38e6e3949de859d0a90f8549ed8dafd86ddcd
+  data.tar.gz: 10d7b84f11f208787a1ae941ea4fbee0ec2e3447af4ad4901036da009e8b07ada9da3fcfdf272f37349bff43b323e9a15400bca231003a63e2e9162ba410def8

data/lib/ups/configuration.rb

@@ -1,9 +1,10 @@
 module Ups
   class Configuration
-    attr_accessor :client_id, :client_secret, :account_number, :sandbox
+    attr_accessor :client_id, :client_secret, :account_number, :negotiated_rates, :sandbox
 
     def initialize(params = {})
       @sandbox = true
+      @negotiated_rates = false
       params.map{|k, v| send("#{k}=", v) if respond_to?("#{k}=") }
     end
 

data/lib/ups/rating.rb

@@ -1,15 +1,17 @@
 module Ups
   class Rating
-    attr_reader :client, :account_number
+    attr_reader :client, :account_number, :negotiated_rates
 
     def initialize(client, account_number: nil)
       @client = client
       @account_number = account_number || client.config.account_number
+      @negotiated_rates = client.config&.negotiated_rates || false
     end
 
     def get_rates(rate_request)
       endpoint = "/api/rating/v2409/Shop"
       payload = build_rate_payload(rate_request)
+      payload.deep_merge!(negotiated_rates_json) if negotiated_rates
       response = client.post(endpoint, body: payload)
       parse_rate_response(response)
     end
@@ -93,11 +95,11 @@ module Ups
           }
         }
       }
-      base.deep_merge!(signature_required(package.delivery_confirmation)) if [2,3].include?(package&.delivery_confirmation.to_i)
+      base.deep_merge!(signature_required_json(package.delivery_confirmation)) if [2,3].include?(package&.delivery_confirmation.to_i)
       base
     end
 
-    def signature_required(type)
+    def signature_required_json(type)
       # https://github.com/UPS-API/api-documentation/blob/main/Rating.yaml
       # DCISType fails if the value is nil, 0, or 1...
       # but 2 and 3 work as expected. So we need to omit
@@ -116,19 +118,31 @@ module Ups
       }
     end
 
+    def negotiated_rates_json
+      {
+        RateRequest: {
+          Shipment: {
+            ShipmentRatingOptions: {
+              NegotiatedRatesIndicator: "1",
+              TPFCNegotiatedRatesIndicator: "1"
+            }
+          }
+        }
+      }
+    end
+
     def parse_rate_response(response)
       rates = []
 
       if response['RateResponse'] && response['RateResponse']['RatedShipment']
         rated_shipments = response['RateResponse']['RatedShipment']
         rated_shipments = [rated_shipments] unless rated_shipments.is_a?(Array)
-
         rated_shipments.each do |shipment|
           rates << {
             service_code: shipment['Service']['Code'],
             service_name: get_service_name(shipment['Service']['Code']),
-            total: shipment['TotalCharges']['MonetaryValue'].to_f,
-            currency: shipment['TotalCharges']['CurrencyCode'],
+            total: get_rate_value(shipment),
+            currency: shipment.dig('TotalCharges', 'CurrencyCode'),
             transit_time: shipment['GuaranteedDelivery'] ? shipment['GuaranteedDelivery']['BusinessDaysInTransit'] : nil
           }
         end
@@ -137,6 +151,12 @@ module Ups
       rates
     end
 
+    def get_rate_value(data)
+      return data.dig('NegotiatedRateCharges', 'TotalCharge', 'MonetaryValue').to_f if negotiated_rates
+
+      data.dig('TotalCharges', 'MonetaryValue').to_f
+    end
+
     def get_service_name(code)
       service_names[code] || "Unknown Service (#{code})"
     end

data/lib/ups/shipping.rb

@@ -1,15 +1,17 @@
 module Ups
   class Shipping
-    attr_reader :client, :account_number
+    attr_reader :client, :account_number, :negotiated_rates
 
     def initialize(client, account_number: nil)
       @client = client
       @account_number = account_number || client.config.account_number
+      @negotiated_rates = client.config&.negotiated_rates || false
     end
 
     def create_shipment(ship_request)
       endpoint = "/api/shipments/v2409/ship"
       payload = build_ship_payload(ship_request)
+      payload.deep_merge!(negotiated_rates_json) if negotiated_rates
       response = client.post(endpoint, body: payload)
       parse_ship_response(response)
     end
@@ -78,6 +80,18 @@ module Ups
       }
     end
 
+    def negotiated_rates_json
+      {
+        ShipmentRequest: {
+          Shipment: {
+            ShipmentRatingOptions: {
+              NegotiatedRatesIndicator: "X"
+            }
+          }
+        }
+      }
+    end
+
     def address_hash(address)
       {
         AddressLine: [address.address_line_1, address.address_line_2].compact,
@@ -140,7 +154,7 @@ module Ups
           tracking_number: results['ShipmentIdentificationNumber'],
           label: results['PackageResults'][0]['ShippingLabel']['GraphicImage'],
           extension: results['PackageResults'][0]['ShippingLabel']['ImageFormat']['Code'],
-          total: results['ShipmentCharges']['TotalCharges']['MonetaryValue'].to_f,
+          total: get_rate_value(results['ShipmentCharges']),
           currency: results['ShipmentCharges']['TotalCharges']['CurrencyCode'],
           data: response.as_json(except: ["GraphicImage", "HTMLImage"]),
           alerts: response['ShipmentResponse']['Response']['Alert']&.map{|s| s['Description'] }
@@ -149,5 +163,12 @@ module Ups
         raise APIError, "Invalid shipment response: #{response}"
       end
     end
+
+    def get_rate_value(data)
+      return data.dig('NegotiatedRateCharges', 'TotalCharge', 'MonetaryValue').to_f if negotiated_rates
+
+      data.dig('TotalCharges', 'MonetaryValue').to_f
+    end
+
   end
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: ups
 version: !ruby/object:Gem::Version
-  version: 0.0.5
+  version: 0.0.6
 platform: ruby
 authors:
 - JD Warren
 autorequire:
 bindir: bin
 cert_chain: []
-date: 2025-06-16 00:00:00.000000000 Z
+date: 2025-06-24 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: httparty