dhl_ecommerce_api 0.1.12 → 0.1.15

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 313e4f0218fc7c15423ff488ebd28927d61f253235e8baf70ea95dacf19dfe0c
-  data.tar.gz: 4f9ccb99bad33a08025c15d6d442e86dbbf433e2cd9d19362ab9fd1ee825b362
+  metadata.gz: ddc6328d0bd244a84d7aee00a96890d1d7003d227fc46357312f7f7bba3da896
+  data.tar.gz: 3d0359ea889a9e13099995118cb3a8b16f5d5f169ca4133e09c4a1690d0f70e2
 SHA512:
-  metadata.gz: f6db6ce2275c4fbf285a9845ac69cd653bc9e1a642872612adb1c74b1d69dcb7c9ab6e63a1305b28516bacd7f272bcda45cdbfd270f7fff2a77286a7aecce998
-  data.tar.gz: 93ed8643180a3d55b0cc7573c834ecc6d6c3b73d38418c56a88a8aa2e3bbe9d32debda883e59711df33d136c5be307560a0809dd8231fcbab88890247af6f8ef
+  metadata.gz: 19111a620dab055825fec90fad626d3ec902712b2a8b58b494cd1130501b6fb315f252c724200bd20402139605f011353909984bdfe2a9dbdf20c57358667b6d
+  data.tar.gz: e8399ea8631e95c336c9c86abf7c608be5013b5ea1d51219e7561c47a05bc4af409c4b013512500522b2b4418fe935a63e1e231785bd6dc0458747d8ee485fab

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    dhl_ecommerce_api (0.1.7)
+    dhl_ecommerce_api (0.1.14)
       activeresource (>= 4.1.0, < 6.0.0)
 
 GEM
   remote: https://rubygems.org/
   specs:
-    activemodel (6.1.4.6)
-      activesupport (= 6.1.4.6)
+    activemodel (6.1.5)
+      activesupport (= 6.1.5)
     activemodel-serializers-xml (1.0.2)
       activemodel (> 5.x)
       activesupport (> 5.x)
@@ -17,7 +17,7 @@ GEM
       activemodel (>= 5.0, < 7)
       activemodel-serializers-xml (~> 1.0)
       activesupport (>= 5.0, < 7)
-    activesupport (6.1.4.6)
+    activesupport (6.1.5)
       concurrent-ruby (~> 1.0, >= 1.0.2)
       i18n (>= 1.6, < 2)
       minitest (>= 5.1)

data/lib/dhl_ecommerce_api/connection.rb

@@ -5,7 +5,6 @@ module DHLEcommerceAPI
         payload[:method] = method
         payload[:request_uri] = "#{site.scheme}://#{site.host}:#{site.port}#{path}"
         payload[:result] = http.send(method, path, *arguments)
-        # debug outgoing request here if needed
       end
 
       handle_response(result)

data/lib/dhl_ecommerce_api/resources/base.rb

@@ -5,50 +5,24 @@ module DHLEcommerceAPI
     self.include_format_in_path = false
     self.connection_class = Connection
 
-    # by default convert to lowerCamelcase before sending request
-    def to_json(options = {})
-      attributes.as_json
-        .deep_transform_keys { |k| k.to_s.camelize(:lower) }
-        .to_json(include_root_in_json ? { root: self.class.element_name }.merge(options) : options)
-    end
-
-    # by default convert to snake_case when initializing
-    def load(attributes, remove_root = false, persisted = false)
-      # convert loaded attributes to underscore, then symbolize
-      attributes.deep_transform_keys! { |k| k.to_s.underscore.to_sym }
-
-      # merge default_attrs(symbols) with incoming attributes
-      if defined?(self.class::DEFAULT_ATTRIBUTES)
-        attributes = self.class::DEFAULT_ATTRIBUTES.merge(attributes)
-      end
-      super
-    end
-
     def attributes_with_account_ids
       account_ids.merge(attributes)
     end
 
     def account_ids
       {
-        pickup_account_id: DHLEcommerceAPI.config.pickup_account_id,
-        sold_to_account_id: DHLEcommerceAPI.config.sold_to_account_id,
+        "pickupAccountId": DHLEcommerceAPI.config.pickup_account_id,
+        "soldToAccountId": DHLEcommerceAPI.config.sold_to_account_id,
       }
     end
 
     def handle_errors(code, error_messages)
       errors.add(:base, "#{code} - #{error_messages.join(", ")}")
     end
-    
-    # Since request_data isnt the same as object attributes. 
-    # We have to write our own method to format the request data
-    def formatted_request_data(request_data)
-      request_data.as_json
-        .deep_transform_keys {|key| custom_key_format(key)}.to_json
-    end
 
     # custom keys that arent following lowerCamel convention
     def custom_key_format(key)
-      case key
+      case key.to_s
       when "shipment_id"
         "shipmentID"
       when "total_weight_uom"

data/lib/dhl_ecommerce_api/resources/pickup.rb

@@ -9,7 +9,8 @@ module DHLEcommerceAPI
     
     def create
       run_callbacks :create do
-        connection.post(collection_path, formatted_request_data(pickup_request), self.class.headers).tap do |response|
+        connection.post(collection_path, pickup_request.to_json, self.class.headers).tap do |response|
+          self.id = id_from_response(response)
           load_attributes_from_response(response)
         end
       end
@@ -35,56 +36,58 @@ module DHLEcommerceAPI
           @persisted = false
         end
 
-        new_attributes = attributes.merge(bd)
+        new_attributes = attributes.merge({response: JSON.parse(response.body)})
+  
         load(new_attributes, true, @persisted)
       end
     end
 
     def pickup_request
       {
-        pickup_request: {
-          hdr: headers,
-          bd: attributes_with_account_ids.deep_transform_keys {|key| key.to_s.underscore.to_sym }
+        "pickupRequest": {
+          "hdr": headers,
+          "bd": attributes_with_account_ids
         }
       }
     end
     
     def headers
       {
-        message_type: "PICKUP",
-        message_date_time: DateTime.now.to_s,
-        access_token: DHLEcommerceAPI::Authentication.get_token,
-        message_version: "1.2"
+        "messageType": "PICKUP",
+        "messageDateTime": DateTime.now.to_s,
+        "accessToken": DHLEcommerceAPI::Authentication.get_token,
+        "messageVersion": "1.2"
       }
     end
   end
 end
-
-# example_pickup_params = {
-#   "handover_items": [
-#     {
-#       "pickup_date": "2022-03-09",
-#       "pickup_start_time": "09:00",
-#       "pickup_end_time": "18:00",
-#       "shipment_type": "1",
-#       "notification_email": nil,
-#       "shipper_details": {
-#         "company": "PostCo",
-#         "name": "PostCo",
-#         "email_id": nil,
-#         "phone_number": "0169822645",
-#         "address_line_1": "no 26 jalan 31/123, petaling jaya",
-#         "address_line_2": nil,
-#         "address_line_3": nil,
-#         "city": "Kuala Lumpur",
-#         "state": "Kuala Lumpur",
-#         "postal_code": "57000",
-#         "country": "MY",
-#       },
-#       "shipments": {
-#         "quantity": 1,
-#         "totalWeight": 100
-#       }
-#     }
-#   ]
-# }
+=begin
+pickup_params = {
+  "handoverItems": [
+    {
+      "pickupDate": "2022-03-17",
+      "pickupStartTime": "09:00",
+      "pickupEndTime": "18:00",
+      "shipmentType": "1",
+      "notificationEmail": nil,
+      "shipperDetails": {
+        "company": "PostCo",
+        "name": "PostCo",
+        "emailID": nil,
+        "phoneNumber": "0169822645",
+        "addressLine1": "no 26 jalan 31/123, petaling jaya",
+        "addressLine2": nil,
+        "addressLine3": nil,
+        "city": "Kuala Lumpur",
+        "state": "Kuala Lumpur",
+        "postalCode": "57000",
+        "country": "MY",
+      },
+      "shipments": {
+        "quantity": 1,
+        "totalWeight": 100
+      }
+    }
+  ]
+}
+=end

data/lib/dhl_ecommerce_api/resources/shipment/shipment_item.rb

@@ -3,39 +3,6 @@ module DHLEcommerceAPI
   class Shipment::ShipmentItem < Base
     self.element_name = ""
 
-    # add some validations?
-    DEFAULT_ATTRIBUTES = { 
-      shipment_id: nil,
-      package_desc: "",
-      total_weight: nil,
-      total_weight_uom: "G",
-      dimension_uom: "CM",
-      height: nil,
-      length: nil,
-      width: nil,
-      product_code: "PDO",
-      cod_value: nil,
-      insurance_value: nil,
-      total_value: 300,
-      currency: "MYR",
-      remarks: nil,
-      is_routing_info_required: "Y",
-      consignee_address: { 
-        company_name: "",
-        name: "",
-        address1: "",
-        address2: nil,
-        address3: nil,
-        city: "",
-        state: "",
-        district: nil,
-        country: "MY",
-        post_code: "",
-        phone: "",
-        email: nil 
-      }
-    }
-
     def initialize(attributes = {}, persisted = false)
       status = attributes["response_status"]
       if status.present? && status["code"] != "200"

data/lib/dhl_ecommerce_api/resources/shipment.rb

@@ -5,13 +5,11 @@ module DHLEcommerceAPI
 
     self.prefix = "/rest/v3/Shipment"
     self.element_name = ""
-    
-    validates_presence_of :handover_method
 
     def create
       run_callbacks :create do
-        data = formatted_request_data(manifest_request)
-        connection.post(collection_path, data, self.class.headers).tap do |response|
+        connection.post(collection_path, manifest_request.to_json, self.class.headers).tap do |response|
+          self.id = id_from_response(response)
           load_attributes_from_response(response)
         end
       end
@@ -29,90 +27,169 @@ module DHLEcommerceAPI
         if code == "200"
           @persisted = true
         elsif code == "204"
-          # handle partial success
           @persisted = false
         else
           error_messages = response_status["messageDetails"].map{|err| err["messageDetail"]}
           handle_errors(code, error_messages)
           @persisted = false
         end
+        
+        # service level
+        new_attributes = attributes.merge({response: JSON.parse(response.body)})
+
+        # object level
+        new_attributes["shipmentItems"] = new_attributes["shipmentItems"].map do |item|
+          item.attributes.merge(bd["shipmentItems"].find{|i| i["shipmentID"] == item.shipmentID})
+        end
 
-        new_attributes = attributes.merge(bd)
         load(new_attributes, true, @persisted)
       end
     end
 
     def manifest_request
       {
-        manifest_request: {
-          hdr: headers,
-          bd: attributes_with_account_ids.deep_transform_keys {|key| key.to_s.underscore.to_sym }
+        "manifestRequest": {
+          "hdr": headers,
+          "bd": attributes_with_account_ids
         }
       }
     end
     
     def headers
       {
-        message_type: "SHIPMENT",
-        message_date_time: DateTime.now.to_s,
-        access_token: DHLEcommerceAPI::Authentication.get_token,
-        message_version: "1.0"
+        "messageType": "SHIPMENT",
+        "messageDateTime": DateTime.now.to_s,
+        "accessToken": DHLEcommerceAPI::Authentication.get_token,
+        "messageVersion": "1.0"
       }
     end
   end
 end
 
 # Examples:
-# shipment_with_pickup_params = {
-#   "handoverMethod": 2,
-#   "pickupDateTime": DateTime.now.to_s,
-#   "pickupAddress": {
-#     "companyName": "Pickup From Company",
-#     "name": "Pickup From Name",
-#     "address1": "Holistic Pharmacy PostCo, 55, Jalan Landak",
-#     "address2": "",
-#     "address3": "",
-#     "city": " Kuala Lumpur",
-#     "state": " Kuala Lumpur",
-#     "postCode": "55100",
-#     "country": "MY",
-#     "phone": "0123456789",
-#     "email": "hello@example.com"
-#   },
-#   "shipmentItems": [
-#     {
-#       "shipmentID": "MYPTC0083",
-#       "packageDesc": "Laptop Sleeve",
-#       "totalWeight": 500,
-#       "totalWeightUOM": "G",
-#       "dimensionUOM": "CM",
-#       "height": nil,
-#       "length": nil,
-#       "width": nil,
-#       "productCode": "PDO",
-#       "codValue": nil,
-#       "insuranceValue": nil,
-#       "totalValue": 300,
-#       "currency": "MYR",
-#       "remarks": nil,
-#       "isRoutingInfoRequired": "Y",
-#       "consigneeAddress": {
-#         "companyName": "Sleeve Company",
-#         "name": "Sleeve Sdn Bhd",
-#         "address1": "No. 3, Jalan Bangsar, Kampung Haji Abdullah Hukum",
-#         "address2": nil,
-#         "address3": nil,
-#         "city": "Kuala Lumpur",
-#         "state": "Kuala Lumpur",
-#         "district": nil,
-#         "country": "MY",
-#         "postCode": "59200",
-#         "phone": "0169822645",
-#         "email": nil
-#       }
-#     },
-#   ]
-# }
+=begin 
+shipment_with_pickup_params = {
+  "handoverMethod": 2,
+  "pickupDateTime": DateTime.now.to_s,
+  "pickupAddress": {
+    "companyName": "Pickup From Company",
+    "name": "Pickup From Name",
+    "address1": "Holistic Pharmacy PostCo, 55, Jalan Landak",
+    "address2": "",
+    "address3": "",
+    "city": " Kuala Lumpur",
+    "state": " Kuala Lumpur",
+    "postCode": "55100",
+    "country": "MY",
+    "phone": "0123456789",
+    "email": "hello@example.com"
+  },
+  "shipperAddress": {
+    "companyName": "Pickup From Company",
+    "name": "Pickup From Name",
+    "address1": "Holistic Pharmacy PostCo, 55, Jalan Landak",
+    "address2": "",
+    "address3": "",
+    "city": " Kuala Lumpur",
+    "state": " Kuala Lumpur",
+    "postCode": "55100",
+    "country": "MY",
+    "phone": "0123456789",
+    "email": "hello@example.com"
+  },
+  "shipmentItems": [
+    {
+      "shipmentID": "MYPTC0090",
+      "packageDesc": "Laptop Sleeve",
+      "totalWeight": 500,
+      "totalWeightUOM": "G",
+      "dimensionUOM": "CM",
+      "height": nil,
+      "length": nil,
+      "width": nil,
+      "productCode": "PDO",
+      "codValue": nil,
+      "insuranceValue": nil,
+      "totalValue": 300,
+      "currency": "MYR",
+      "remarks": nil,
+      "isRoutingInfoRequired": "Y",
+      "consigneeAddress": {
+        "companyName": "Sleeve Company",
+        "name": "Sleeve Sdn Bhd",
+        "address1": "No. 3, Jalan Bangsar, Kampung Haji Abdullah Hukum",
+        "address2": nil,
+        "address3": nil,
+        "city": "Kuala Lumpur",
+        "state": "Kuala Lumpur",
+        "district": nil,
+        "country": "MY",
+        "postCode": "59200",
+        "phone": "0169822645",
+        "email": nil
+      },
+      "returnMode": "03",
+      "returnAddress": {
+        "companyName": "Pickup From Company",
+        "name": "Pickup From Name",
+        "address1": "Holistic Pharmacy PostCo, 55, Jalan Landak",
+        "address2": "",
+        "address3": "",
+        "city": " Kuala Lumpur",
+        "state": " Kuala Lumpur",
+        "postCode": "55100",
+        "country": "MY",
+        "phone": "0123456789",
+        "email": "hello@example.com"
+      }
+    },
+    {
+      "shipmentID": "MYPTC0089",
+      "totalWeight": 500,
+      "totalWeightUOM": "G",
+      "dimensionUOM": "CM",
+      "height": nil,
+      "length": nil,
+      "width": nil,
+      "productCode": "PDO",
+      "codValue": nil,
+      "insuranceValue": nil,
+      "totalValue": 300,
+      "currency": "MYR",
+      "remarks": nil,
+      "isRoutingInfoRequired": "Y",
+      "consigneeAddress": {
+        "companyName": "Sleeve Company",
+        "name": "Sleeve Sdn Bhd",
+        "address1": "No. 3, Jalan Bangsar, Kampung Haji Abdullah Hukum",
+        "address2": nil,
+        "address3": nil,
+        "city": "Kuala Lumpur",
+        "state": "Kuala Lumpur",
+        "district": nil,
+        "country": "MY",
+        "postCode": "59200",
+        "phone": "0169822645",
+        "email": nil
+      },
+      "returnMode": "03",
+      "returnAddress": {
+        "companyName": "Pickup From Company",
+        "name": "Pickup From Name",
+        "address1": "Holistic Pharmacy PostCo, 55, Jalan Landak",
+        "address2": "",
+        "address3": "",
+        "city": " Kuala Lumpur",
+        "state": " Kuala Lumpur",
+        "postCode": "55100",
+        "country": "MY",
+        "phone": "0123456789",
+        "email": "hello@example.com"
+      }
+    },
+  ]
+}
+=end
 
 # shipment_with_dropoff_params = {
 #   "handover_method" => 1,

data/lib/dhl_ecommerce_api/resources/tracking.rb

@@ -1,12 +1,5 @@
 module DHLEcommerceAPI
   class Tracking < Base
-    # example_tracking_params = {
-    #   "e_pod_required": "Y", 
-    #   "trackingReferenceNumber": [
-    #       "MYPTC00012", "MYPTC00013"
-    #   ]
-    # }
-
     self.prefix = "/rest/v3/Tracking"
     self.element_name = ""
     
@@ -17,16 +10,17 @@ module DHLEcommerceAPI
 
     def self.find(arguments)
       tracking = self.new({
-        e_pod_required: "Y",
-        tracking_reference_number: arguments.is_a?(Array) ? arguments : [arguments]
+        "ePODRequired": "Y",
+        "trackingReferenceNumber": arguments.is_a?(Array) ? arguments : [arguments]
       })
       tracking.save
+        
       return tracking.shipment_items.presence || []
     end
 
     def create
       run_callbacks :create do
-        connection.post(collection_path, formatted_request_data(request_data), self.class.headers).tap do |response|
+        connection.post(collection_path, request_data.to_json, self.class.headers).tap do |response|
           load_attributes_from_response(response)
         end
       end
@@ -52,37 +46,38 @@ module DHLEcommerceAPI
           @persisted = false
         end
         
-        new_attributes = attributes.merge(bd)
+        new_attributes = attributes.merge({response: JSON.parse(response.body)})
+        new_attributes = new_attributes.merge({shipment_items: bd["shipmentItems"]})
+        
         load(new_attributes, true, @persisted)
       end
     end
     
     def request_data
       {
-        track_item_request: {
-          hdr: headers,
-          bd: attributes.except("response_status") # dont send responseStatus
+        "trackItemRequest": {
+          "hdr": headers,
+          "bd": attributes.except("response_status") # dont send responseStatus
         }
       }
     end
     
     def headers
       {
-        message_type: "TRACKITEM",
-        message_date_time: DateTime.now.to_s,
-        access_token: DHLEcommerceAPI::Authentication.get_token,
-        message_version: "1.0"
+        "messageType": "TRACKITEM",
+        "messageDateTime": DateTime.now.to_s,
+        "accessToken": DHLEcommerceAPI::Authentication.get_token,
+        "messageVersion": "1.0"
       }
     end
-
-
-    # Since request_data isnt the same as object attributes. 
-    # We have to write our own method to format the request data
-    def formatted_request_data(request_data)
-      request_data.as_json
-        .deep_transform_keys do |key| 
-          custom_key_format(key) # method from Base
-        end.to_json
-    end
   end
-end
+end
+
+=begin
+example_tracking_params = {
+  "ePODRequired": "Y", 
+  "trackingReferenceNumber": [
+      "MYPTC00012", "MYPTC00013"
+  ]
+}
+=end

data/lib/dhl_ecommerce_api/version.rb

@@ -1,5 +1,5 @@
 # frozen_string_literal: true
 
 module DHLEcommerceAPI
-  VERSION = "0.1.12"
+  VERSION = "0.1.15"
 end

data/lib/dhl_ecommerce_api.rb

@@ -9,16 +9,10 @@ module DHLEcommerceAPI
   require "dhl_ecommerce_api/connection"
   
   require "dhl_ecommerce_api/resources/base"
+  
   require "dhl_ecommerce_api/resources/authentication"
 
-  require "dhl_ecommerce_api/resources/shipment"
-  require "dhl_ecommerce_api/resources/shipment_with_pickup"
-  require "dhl_ecommerce_api/resources/shipment_with_dropoff"
-  
-  require "dhl_ecommerce_api/resources/shipment/shipment_item"
-  require "dhl_ecommerce_api/resources/shipment/shipment_item/consignee_address"
-  
+  require "dhl_ecommerce_api/resources/shipment"  
   require "dhl_ecommerce_api/resources/pickup"
-
   require "dhl_ecommerce_api/resources/tracking"
 end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhl_ecommerce_api
 version: !ruby/object:Gem::Version
-  version: 0.1.12
+  version: 0.1.15
 platform: ruby
 authors:
 - Er Whey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-16 00:00:00.000000000 Z
+date: 2022-03-17 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -140,12 +140,8 @@ files:
 - lib/dhl_ecommerce_api/resources/base.rb
 - lib/dhl_ecommerce_api/resources/event.rb
 - lib/dhl_ecommerce_api/resources/pickup.rb
-- lib/dhl_ecommerce_api/resources/pickup/handover_item.rb
 - lib/dhl_ecommerce_api/resources/shipment.rb
 - lib/dhl_ecommerce_api/resources/shipment/shipment_item.rb
-- lib/dhl_ecommerce_api/resources/shipment/shipment_item/consignee_address.rb
-- lib/dhl_ecommerce_api/resources/shipment_with_dropoff.rb
-- lib/dhl_ecommerce_api/resources/shipment_with_pickup.rb
 - lib/dhl_ecommerce_api/resources/tracking.rb
 - lib/dhl_ecommerce_api/version.rb
 - sig/dhl_ecommerce_api.rbs

data/lib/dhl_ecommerce_api/resources/pickup/handover_item.rb

@@ -1,12 +0,0 @@
-module DHLEcommerceAPI
-  class Pickup::HandoverItem < Base
-    def initialize(attributes = {}, persisted = false)
-      status = attributes["response_status"]
-      if status.present? && status["code"] != "200"
-          error_messages = status["message_details"].map{|err| err["message_detail"]}
-          handle_errors(status["code"], error_messages) 
-      end
-      super
-    end
-  end
-end

data/lib/dhl_ecommerce_api/resources/shipment/shipment_item/consignee_address.rb

@@ -1,6 +0,0 @@
-module DHLEcommerceAPI
-  # Component item
-  class Shipment::ShipmentItem::ConsigneeAddress < Base
-    self.element_name = ""
-  end
-end

data/lib/dhl_ecommerce_api/resources/shipment_with_dropoff.rb

@@ -1,52 +0,0 @@
-module DHLEcommerceAPI
-  class ShipmentWithDropoff < Shipment
-    # This creates a Shipment ONLY. 
-    # DHL will expect the item to be dropped off at one of their locations.
-    # Used in conjunction with the Pickup class.
-
-    self.element_name = ""
-
-    DEFAULT_ATTRIBUTES = {
-      handover_method: 1,
-      shipment_items: []
-    }
-  end
-end
-
-=begin
-shipment_with_dropoff_params = {
-  "shipment_items" => [
-    { 
-      "consignee_address" => { 
-        "company_name" => "Test",
-        "name" => "Test1",
-        "address1" => "NO 3 JALAN PPU 1",
-        "address2" => "TAMAN PERINDUSTRIAN PUCHONG UTAMA",
-        "address3" => nil,
-        "city" => "PUCHONG",
-        "state" => "SELANGOR",
-        "district" => nil,
-        "country" => "MY",
-        "post_code" => "57000",
-        "phone" => "0123456798",
-        "email" => nil 
-      },
-      "shipment_id" => "MYPTC000103",
-      "package_desc" => "Bread Materials",
-      "total_weight" => 2000,
-      "total_weight_uom" => "G",
-      "dimension_uom" => "CM",
-      "height" => nil,
-      "length" => nil,
-      "width" => nil,
-      "product_code" => "PDO",
-      "cod_value" => nil,
-      "insurance_value" => nil,
-      "total_value" => 300,
-      "currency" => "MYR",
-      "remarks" => nil,
-      "is_routing_info_required" => "Y" 
-    }
-  ],
-}
-=end

data/lib/dhl_ecommerce_api/resources/shipment_with_pickup.rb

@@ -1,93 +0,0 @@
-module DHLEcommerceAPI
-  class ShipmentWithPickup < Shipment
-    # This is a coupled shipment + pickup request.
-
-    self.element_name = ""
-
-    DEFAULT_ATTRIBUTES = {
-      handover_method: 2,
-      pickup_date_time: nil,
-      pickup_address: {
-        company_name: "",
-        name: "",
-        address1: "",
-        address2: nil,
-        address3: nil,
-        city: "",
-        state: "",
-        post_code: "",
-        country: "MY",
-        phone: "",
-        email: nil
-      },
-      shipment_items: []
-    }
-  end
-end
-
-=begin
-params = {
-  "handoverMethod": 2,
-  "pickupDateTime": DateTime.now.to_s,
-  "pickupAddress": {
-    "companyName": "Pickup From Company",
-    "name": "Pickup From Name",
-    "address1": "Holistic Pharmacy PostCo, 55, Jalan Landak",
-    "address2": "",
-    "address3": "",
-    "city": " Kuala Lumpur",
-    "state": " Kuala Lumpur",
-    "postCode": "55100",
-    "country": "MY",
-    "phone": "0169822645",
-    "email": "erwhey@postco.co"
-  },
-  "shipmentItems": [
-    {
-      "shipmentID": "MYPTC0087",
-      "packageDesc": "Laptop Sleeve",
-      "totalWeight": 500,
-      "totalWeightUOM": "G",
-      "dimensionUOM": "CM",
-      "height": nil,
-      "length": nil,
-      "width": nil,
-      "productCode": "PDO",
-      "codValue": nil,
-      "insuranceValue": nil,
-      "totalValue": 300,
-      "currency": "MYR",
-      "remarks": nil,
-      "isRoutingInfoRequired": "Y",
-      "returnMode": 3,
-      "returnAddress": {
-        "companyName": "Pickup From Company",
-        "name": "Pickup From Name",
-        "address1": "Holistic Pharmacy PostCo, 55, Jalan Landak",
-        "address2": "",
-        "address3": "",
-        "city": " Kuala Lumpur",
-        "state": " Kuala Lumpur",
-        "postCode": "55100",
-        "country": "MY",
-        "phone": "0169822645",
-        "email": "erwhey@postco.co"
-      },
-      "consigneeAddress": {
-        "companyName": "Sleeve Company",
-        "name": "Sleeve Sdn Bhd",
-        "address1": "No. 3, Jalan Bangsar, Kampung Haji Abdullah Hukum",
-        "address2": nil,
-        "address3": nil,
-        "city": "Kuala Lumpur",
-        "state": "Kuala Lumpur",
-        "district": nil,
-        "country": "MY",
-        "postCode": "59200",
-        "phone": "0169822645",
-        "email": nil
-      }
-    },
-  ]
-}.deep_transform_keys!{ |key| key.to_s.underscore }
-=end