dhl_ecommerce_api 0.1.5 → 0.1.8

checksums.yaml

@@ -1,7 +1,7 @@
 ---
 SHA256:
-  metadata.gz: e03ab10a63b305e1b945187a967a676fb6723ecaf11dc2ed3b913f39d6aec46e
-  data.tar.gz: 892480ae678747fff07c1bcf18855ba8ec96a01b9c6e5dbe31ca10975eedd7a7
+  metadata.gz: 2c631b27d8fbe5337fb63e73caf9a577ab9be717d56f72b0d726d004439e954a
+  data.tar.gz: 5fd628b9b8339e5f0baeb0e36f2f59f97ee72b110e7dc7a94100b7fac18c3287
 SHA512:
-  metadata.gz: 25393870b5b0ab687d847cac0581537949988e9e71e296ae7686bf23edaa324482787939b9e2f22e155abc3a58b8ab212d1940de7fd78e7515b099461430ca5d
-  data.tar.gz: 7616a892d236831382ef549c8b1d713dc4c5ac8b03f2f3b119386e09510bd36b7502349ed14c00d37b828ea2651c2c266bb88bdad3bec0981bbe5884736f5044
+  metadata.gz: 22ab3ba491f789331432b8466a74679188537236682fb16c864712539a4f5e046f149ae52974751b76919859f49e6cbfb8c720a3a060b825026b00ef23ad6c3a
+  data.tar.gz: df9c0a8d9d63bb8570f30d296ca24e0602f6500c18bfe68dd6a888ee0dc3c04accdf7b3a209411c1bff3a490deca73432804aab98506e73069659129e5e81cf8

data/Gemfile.lock

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

data/lib/dhl_ecommerce_api/resources/base.rb

@@ -24,7 +24,6 @@ module DHLEcommerceAPI
       super
     end
 
-
     def attributes_with_account_ids
       account_ids.merge(attributes)
     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/consignee_address.rb

@@ -0,0 +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,52 +1,48 @@
-# module DHLEcommerceAPI
-#   # Component item
-#   class Shipment::ShipmentItem < Base
-#     # 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 
-#       }
-#     }
+module DHLEcommerceAPI
+  # Component item
+  class Shipment::ShipmentItem < Base
+    self.element_name = ""
 
-#     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
+    # 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 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
-#   end
-# end
+    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.rb

@@ -6,8 +6,6 @@ module DHLEcommerceAPI
     self.prefix = "/rest/v3/Shipment"
     self.element_name = ""
     
-    has_many :shipment_items, class_name: "DHLEcommerceAPI::Shipment::ShipmentItem"
-    
     validates_presence_of :handover_method
 
     def create

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/pickup.rb → shipment_with_pickup.rb}

@@ -1,5 +1,5 @@
 module DHLEcommerceAPI
-  class Shipment::Pickup < Shipment
+  class ShipmentWithPickup < Shipment
     # This is a coupled shipment + pickup request.
 
     self.element_name = ""
@@ -25,7 +25,8 @@ module DHLEcommerceAPI
   end
 end
 
-shipment_with_pickup_params = {
+=begin
+params = {
   "handoverMethod": 2,
   "pickupDateTime": DateTime.now.to_s,
   "pickupAddress": {
@@ -58,6 +59,20 @@ shipment_with_pickup_params = {
       "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",
@@ -74,4 +89,5 @@ shipment_with_pickup_params = {
       }
     },
   ]
-}
+}.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.5"
+  VERSION = "0.1.8"
 end

data/lib/dhl_ecommerce_api.rb

@@ -12,9 +12,11 @@ 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_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/pickup"
 

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: dhl_ecommerce_api
 version: !ruby/object:Gem::Version
-  version: 0.1.5
+  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,9 +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" 
-#     }
-#   ],
-# }