dhl_ecommerce_api 0.1.7 → 0.1.11

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1611a50fc49c9a322a7949f3080512e79d727d34d99ca75f4d6370f8bbdeef15
-  data.tar.gz: 7dcf5b35eac8835be58e2baa8a6f93ee8c901c7ca94e3427156442ca8db758f1
+  metadata.gz: eb0971157608740682c486964b16f74e7c7cb98884f2be276daee0de8e09def8
+  data.tar.gz: c28f96ead90411021e8ad1b5a70a5ad9d2365a1cc016bf652dfb773461045db4
 SHA512:
-  metadata.gz: 6119191eddd500affe3c2a7a5cc724082fa93e003f34c89649b26169f36380775cea1c270be92994a5709d24d42c3c00919e00f3f13c30c2cdd4f8cca1f8293c
-  data.tar.gz: da6911749451b9951d1c8b07aa0cd44f05a1a6dd2290fbe9904202c45d408ce502dff9a6756e7712838c2d68dce70344aa7e485cb8a10a83c91057e6f78450a9
+  metadata.gz: 7f0cabaaed64860f138759d4432ca14bd93090b88c89c70e32ad92edfd24da4b2be41340cb17f9d0d0442d809c68b66602d433e12c50a2eb20b8aa77032fccfd
+  data.tar.gz: 8d0c7c7701040ef9b28c51d25d2707f620b32b8e6072b0483ab7c7561e08aace47452a4e3dd2200c96e5098d65f0336f9b59851465aecf7bdf993cf438e765fc

data/.tool-versions

@@ -0,0 +1 @@
+ruby 2.5.8

data/Gemfile.lock

@@ -1,14 +1,14 @@
 PATH
   remote: .
   specs:
-    dhl_ecommerce_api (0.1.6)
+    dhl_ecommerce_api (0.1.9)
       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)
@@ -64,7 +64,7 @@ GEM
       nenv (~> 0.1)
       shellany (~> 0.0)
     parallel (1.21.0)
-    parser (3.1.0.0)
+    parser (3.1.1.0)
       ast (~> 2.4.1)
     pry (0.14.1)
       coderay (~> 1.1)
@@ -90,25 +90,21 @@ GEM
       diff-lcs (>= 1.2.0, < 2.0)
       rspec-support (~> 3.11.0)
     rspec-support (3.11.0)
-    rubocop (1.25.1)
+    rubocop (1.26.0)
       parallel (~> 1.10)
       parser (>= 3.1.0.0)
       rainbow (>= 2.2.2, < 4.0)
       regexp_parser (>= 1.8, < 3.0)
       rexml
-      rubocop-ast (>= 1.15.1, < 2.0)
+      rubocop-ast (>= 1.16.0, < 2.0)
       ruby-progressbar (~> 1.7)
       unicode-display_width (>= 1.4.0, < 3.0)
-    rubocop-ast (1.15.2)
-      parser (>= 3.0.1.1)
-    rubocop-performance (1.13.2)
-      rubocop (>= 1.7.0, < 2.0)
-      rubocop-ast (>= 0.4.0)
+    rubocop-ast (1.16.0)
+      parser (>= 3.1.1.0)
     ruby-progressbar (1.11.0)
     shellany (0.0.1)
-    standard (1.7.2)
-      rubocop (= 1.25.1)
-      rubocop-performance (= 1.13.2)
+    standard (0.0.36)
+      rubocop (>= 0.63)
     thor (1.2.1)
     tzinfo (2.0.4)
       concurrent-ruby (~> 1.0)
@@ -120,7 +116,7 @@ GEM
     zeitwerk (2.5.4)
 
 PLATFORMS
-  arm64-darwin-21
+  -darwin-21
 
 DEPENDENCIES
   dhl_ecommerce_api!

data/lib/dhl_ecommerce_api/resources/base.rb

@@ -5,18 +5,11 @@ 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)
@@ -43,7 +36,7 @@ module DHLEcommerceAPI
     # 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
+        .deep_transform_keys {|key| custom_key_format(key)}
     end
 
     # custom keys that arent following lowerCamel convention
@@ -75,5 +68,13 @@ module DHLEcommerceAPI
         key.to_s.camelize(:lower)
       end
     end
+
+    # catchall overwrite default to_json method for anything that inherits from Base.
+    # Not used by anything so far.
+    def to_json(options = {})
+      attributes.as_json
+        .deep_transform_keys { |k| custom_key_format(k) }
+        .to_json(include_root_in_json ? { root: self.class.element_name }.merge(options) : options)
+    end
   end
 end

data/lib/dhl_ecommerce_api/resources/event.rb

@@ -18,7 +18,6 @@ module DHLEcommerceAPI
     end
 
     def status_slug
-      binding.pry
       STATUS_CODES[status.to_sym]
     end
   end

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

@@ -1,6 +1,8 @@
 module DHLEcommerceAPI
   # Component item
   class Shipment::ShipmentItem < Base
+    self.element_name = ""
+
     # add some validations?
     DEFAULT_ATTRIBUTES = { 
       shipment_id: nil,
@@ -18,20 +20,7 @@ module DHLEcommerceAPI
       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 
-      }
+      consignee_address: {}
     }
 
     def initialize(attributes = {}, persisted = false)

data/lib/dhl_ecommerce_api/resources/shipment.rb

@@ -6,8 +6,6 @@ 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)
@@ -46,7 +44,7 @@ module DHLEcommerceAPI
       {
         manifest_request: {
           hdr: headers,
-          bd: attributes_with_account_ids.deep_transform_keys {|key| key.to_s.underscore.to_sym }
+          bd: attributes_with_account_ids
         }
       }
     end
@@ -62,9 +60,126 @@ module DHLEcommerceAPI
   end
 end
 
+=begin
 # Examples:
+shipment_with_pickup_params = {
+  "handoverMethod": 2,
+  "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"
+  },
+  "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": "MYPTC0085",
+      "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
+      }
+    },
+  ]
+}.deep_transform_keys {|key| key.to_s.underscore }
+
+shipment_with_dropoff_params = {
+  "handover_method" => 1,
+  "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" => "MYPTC000102",
+      "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
+
+
 # shipment_with_pickup_params = {
 #   "handoverMethod": 2,
+#   "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"
+#   },
 #   "pickupDateTime": DateTime.now.to_s,
 #   "pickupAddress": {
 #     "companyName": "Pickup From Company",
@@ -81,7 +196,7 @@ end
 #   },
 #   "shipmentItems": [
 #     {
-#       "shipmentID": "MYPTC0083",
+#       "shipmentID": "MYPTC0085",
 #       "packageDesc": "Laptop Sleeve",
 #       "totalWeight": 500,
 #       "totalWeightUOM": "G",
@@ -112,41 +227,4 @@ end
 #       }
 #     },
 #   ]
-# }
-
-# shipment_with_dropoff_params = {
-#   "handover_method" => 1,
-#   "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" => "MYPTC000102",
-#       "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" 
-#     }
-#   ],
-# }
+# }

data/lib/dhl_ecommerce_api/resources/shipment_test.rb

@@ -0,0 +1,157 @@
+module DHLEcommerceAPI
+  class ShipmentTest < ActiveResource::Base
+    self.include_format_in_path = false
+    self.site = "https://sandbox.dhlecommerce.asia"
+    self.prefix = "/rest/v3/Shipment"
+    self.element_name = ""
+
+    def to_json(options = {})
+      attributes.as_json
+        .deep_transform_keys { |k| custom_key_format(k) }
+        .to_json(include_root_in_json ? { root: self.class.element_name }.merge(options) : options)
+    end
+
+    def custom_key_format(key)
+      case key
+      when "shipment_id"
+        "shipmentID"
+      when "total_weight_uom"
+        "totalWeightUOM"
+      when "dimension_uom"
+        "dimensionUOM"
+      when "order_url"
+        "orderURL"
+      when "location_id"
+        "locationID"
+      when "piece_id"
+        "pieceID"
+      when "weight_uom"
+        "weightUOM"
+      when "marketplace_url"
+        "marketplaceURL"
+      when "handover_id"
+        "handoverID"
+      when "email_id"
+        "emailID"
+      when "e_pod_required"
+        "ePODRequired"
+      else
+        key.to_s.camelize(:lower)
+      end
+    end
+  end
+end
+
+=begin
+def format_data(data)
+  data.as_json.deep_transform_keys {|key| custom_key_format(key)}
+end
+
+def custom_key_format(key)
+  case key
+  when "shipment_id"
+    "shipmentID"
+  when "total_weight_uom"
+    "totalWeightUOM"
+  when "dimension_uom"
+    "dimensionUOM"
+  when "order_url"
+    "orderURL"
+  when "location_id"
+    "locationID"
+  when "piece_id"
+    "pieceID"
+  when "weight_uom"
+    "weightUOM"
+  when "marketplace_url"
+    "marketplaceURL"
+  when "handover_id"
+    "handoverID"
+  when "email_id"
+    "emailID"
+  when "e_pod_required"
+    "ePODRequired"
+  else
+    key.to_s.camelize(:lower)
+  end
+end
+
+params = {
+  "manifestRequest": {
+    "hdr": {
+      "message_type": "SHIPMENT",
+      "message_date_time": DateTime.now.to_s,
+      "access_token": DHLEcommerceAPI::Authentication.get_token,
+      "message_version": "1.0"
+    },
+    "bd": {
+      "pickup_account_id": DHLEcommerceAPI.config.pickup_account_id,
+      "sold_to_account_id": DHLEcommerceAPI.config.sold_to_account_id,
+      "handoverMethod": 2,
+      "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"
+      },
+      "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": "MYPTC0085",
+          "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
+          }
+        },
+      ]
+    }
+  }
+}.deep_transform_keys {|key| key.to_s.underscore }
+
+formatted_data = format_data(params)
+
+=end

data/lib/dhl_ecommerce_api/resources/shipment_with_dropoff.rb

@@ -0,0 +1,52 @@
+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

@@ -0,0 +1,93 @@
+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

data/lib/dhl_ecommerce_api/version.rb

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

data/lib/dhl_ecommerce_api.rb

@@ -12,11 +12,9 @@ module DHLEcommerceAPI
   require "dhl_ecommerce_api/resources/authentication"
 
   require "dhl_ecommerce_api/resources/shipment"
-  require "dhl_ecommerce_api/resources/shipment/pickup"
-  require "dhl_ecommerce_api/resources/shipment/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_test"
+
   require "dhl_ecommerce_api/resources/pickup"
 
   require "dhl_ecommerce_api/resources/tracking"

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhl_ecommerce_api
 version: !ruby/object:Gem::Version
-  version: 0.1.7
+  version: 0.1.11
 platform: ruby
 authors:
 - Er Whey
-autorequire:
+autorequire: 
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-16 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -123,6 +123,7 @@ extra_rdoc_files: []
 files:
 - ".rspec"
 - ".rubocop.yml"
+- ".tool-versions"
 - CHANGELOG.md
 - CODE_OF_CONDUCT.md
 - Gemfile
@@ -142,10 +143,10 @@ files:
 - 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/dropoff.rb
-- lib/dhl_ecommerce_api/resources/shipment/pickup.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_test.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
@@ -157,7 +158,7 @@ metadata:
   homepage_uri: https://github.com/PostCo/dhl_ecommerce_api
   source_code_uri: https://github.com/PostCo/dhl_ecommerce_api
   changelog_uri: https://github.com/PostCo/dhl_ecommerce_api/releases
-post_install_message:
+post_install_message: 
 rdoc_options: []
 require_paths:
 - lib
@@ -172,8 +173,9 @@ required_rubygems_version: !ruby/object:Gem::Requirement
     - !ruby/object:Gem::Version
       version: '0'
 requirements: []
-rubygems_version: 3.3.3
-signing_key:
+rubyforge_project: 
+rubygems_version: 2.7.6.2
+signing_key: 
 specification_version: 4
 summary: Unofficial Ruby object based DHL eCommerce API wrapper.
 test_files: []

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

@@ -1,50 +0,0 @@
-module DHLEcommerceAPI
-  class Shipment::Dropoff < 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
-
-# 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" 
-#     }
-#   ],
-# }

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

@@ -1,77 +0,0 @@
-module DHLEcommerceAPI
-  class Shipment::Pickup < 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
-
-# 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": "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",
-#       "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
-#       }
-#     },
-#   ]
-# }

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

@@ -1,5 +0,0 @@
-module DHLEcommerceAPI
-  # Component item
-  class Shipment::ShipmentItem::ConsigneeAddress < Base
-  end
-end