dhl_ecommerce_api 0.1.7 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: 1611a50fc49c9a322a7949f3080512e79d727d34d99ca75f4d6370f8bbdeef15
-  data.tar.gz: 7dcf5b35eac8835be58e2baa8a6f93ee8c901c7ca94e3427156442ca8db758f1
+  metadata.gz: 2c631b27d8fbe5337fb63e73caf9a577ab9be717d56f72b0d726d004439e954a
+  data.tar.gz: 5fd628b9b8339e5f0baeb0e36f2f59f97ee72b110e7dc7a94100b7fac18c3287
 SHA512:
-  metadata.gz: 6119191eddd500affe3c2a7a5cc724082fa93e003f34c89649b26169f36380775cea1c270be92994a5709d24d42c3c00919e00f3f13c30c2cdd4f8cca1f8293c
-  data.tar.gz: da6911749451b9951d1c8b07aa0cd44f05a1a6dd2290fbe9904202c45d408ce502dff9a6756e7712838c2d68dce70344aa7e485cb8a10a83c91057e6f78450a9
+  metadata.gz: 22ab3ba491f789331432b8466a74679188537236682fb16c864712539a4f5e046f149ae52974751b76919859f49e6cbfb8c720a3a060b825026b00ef23ad6c3a
+  data.tar.gz: df9c0a8d9d63bb8570f30d296ca24e0602f6500c18bfe68dd6a888ee0dc3c04accdf7b3a209411c1bff3a490deca73432804aab98506e73069659129e5e81cf8

data/Gemfile.lock

@@ -1,7 +1,7 @@
 PATH
   remote: .
   specs:
-    dhl_ecommerce_api (0.1.6)
+    dhl_ecommerce_api (0.1.7)
       activeresource (>= 4.1.0, < 6.0.0)
 
 GEM

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/consignee_address.rb

@@ -1,5 +1,6 @@
 module DHLEcommerceAPI
   # Component item
   class Shipment::ShipmentItem::ConsigneeAddress < Base
+    self.element_name = ""
   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,

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.8"
 end

data/lib/dhl_ecommerce_api.rb

@@ -12,8 +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_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"
   

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.8
 platform: ruby
 authors:
 - Er Whey
 autorequire:
 bindir: exe
 cert_chain: []
-date: 2022-03-14 00:00:00.000000000 Z
+date: 2022-03-15 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: activeresource
@@ -142,10 +142,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_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/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
-#       }
-#     },
-#   ]
-# }