Skip to content

Commercial Invoice related fields added and changed some parameters which are giving error in DHL api reponse. #46

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
Mutahhar wants to merge 22 commits into
base: master
Choose a base branch
from
Open

Commercial Invoice related fields added and changed some parameters which are giving error in DHL api reponse. #46

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
22 commits
Select commit Hold shift + click to select a range
c1989a8
update composer.json
Mutahhar May 9, 2020
6c0b6e0
revert name back incomposer.json
Mutahhar May 10, 2020
29c444a
changed Email > subobject to falseContact datatype
Mutahhar May 13, 2020
c881c99
changed - Email > subobject to false in AM Contact datatype
Mutahhar May 13, 2020
519bd2c
Merge branch 'master' of https://github.com/Mutahhar/DHL-API
Mutahhar May 14, 2020
b658b74
added commercial invoice fields in shipment validation request for AM…
Mutahhar May 14, 2020
784d57b
added schema version to DHL\Entity\AM\ShipmentValidateRequest
Mutahhar May 18, 2020
434fb85
added metadata fields in request header for AM Shipment Validation Re…
Mutahhar May 18, 2020
09ea390
fix - added 'disableParentNode' parameter to ExportLineItem element.
Mutahhar May 19, 2020
7001dbd
fix - formatting: removing spaces.
Mutahhar May 19, 2020
b7f7eba
add - RegionCode parameter to AM\ShipmentValidateRequest.
Mutahhar May 19, 2020
80209da
add - added schema version related properties to AM\GetQuote
Mutahhar May 19, 2020
9d2d4c2
add - added Weight and GrossWeight elements to AM\ExportLineItem
Mutahhar May 19, 2020
494748e
fix - rearranged attributes.
Mutahhar May 19, 2020
cd494de
fix - renamed ShipmentValidateRequest to ShipmentRequest cause DHL ap…
Mutahhar May 19, 2020
42c0746
fix - added GrossWeight and Weight classes for shipment request.
Mutahhar May 19, 2020
60fef72
fix - change schema version of get quote request to 1.0, because maki…
Mutahhar May 19, 2020
11244ee
set AddressLine for Consignee and Shipper to 45.
Mutahhar Jul 6, 2020
7c8b429
change AddressLine type to "string" from "AddressLine" in AM/Shipper …
Mutahhar Jul 8, 2020
a9660c8
check if "maxLength" attribute is set on an array loop over array ele…
Mutahhar Jul 8, 2020
a104d4f
added pickup requet related classes in AM
Mutahhar Aug 12, 2020
f07b07e
new - added AccountType, AccountNumber, and BillToAccountNumber field…
Mutahhar Oct 8, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
29 changes: 15 additions & 14 deletions DHL/Datatype/AM/Consignee.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @version 0.1
*/

namespace DHL\Datatype\AM;
namespace DHL\Datatype\AM;
use DHL\Datatype\Base;

/**
Expand All @@ -47,67 +47,68 @@ class Consignee extends Base
'subobject' => false,
'comment' => 'Name of company / business',
'maxLength' => '35',
),
),
'AddressLine' => array(
'type' => 'AddressLine',
'type' => 'string',
'required' => false,
'subobject' => false,
'comment' => 'Address Line',
'maxLength' => '35',
),
'maxLength' => '45',
'multivalues' => true,
),
'City' => array(
'type' => 'City',
'required' => false,
'subobject' => false,
'comment' => 'City name',
'maxLength' => '35',
),
),
'Division' => array(
'type' => 'Division',
'required' => false,
'subobject' => false,
'comment' => 'Division (e.g. state, prefecture, etc.) name',
'maxLength' => '35',
),
),
'DivisionCode' => array(
'type' => '',
'required' => false,
'subobject' => false,
),
),
'PostalCode' => array(
'type' => 'PostalCode',
'required' => false,
'subobject' => false,
'comment' => 'Full postal/zip code for address',
),
),
'CountryCode' => array(
'type' => 'CountryCode',
'required' => false,
'subobject' => false,
'comment' => 'ISO country codes',
'length' => '2',
),
),
'CountryName' => array(
'type' => 'CountryName',
'required' => false,
'subobject' => false,
'comment' => 'ISO country name',
'maxLength' => '35',
),
),
'FederalTaxId' => array(
'type' => '',
'required' => false,
'subobject' => false,
),
),
'StateTaxId' => array(
'type' => '',
'required' => false,
'subobject' => false,
),
),
'Contact' => array(
'type' => 'Contact',
'required' => false,
'subobject' => true,
),
),
);
}
16 changes: 8 additions & 8 deletions DHL/Datatype/AM/Contact.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @version 0.1
*/

namespace DHL\Datatype\AM;
namespace DHL\Datatype\AM;
use DHL\Datatype\Base;

/**
Expand All @@ -47,37 +47,37 @@ class Contact extends Base
'subobject' => false,
'comment' => 'Name',
'maxLength' => '35',
),
),
'PhoneNumber' => array(
'type' => 'PhoneNumber',
'required' => false,
'subobject' => false,
'comment' => 'Phone Number',
),
),
'PhoneExtension' => array(
'type' => 'PhoneExtension',
'required' => false,
'subobject' => false,
'comment' => '',
'maxLength' => '5',
),
),
'FaxNumber' => array(
'type' => 'PhoneNumber',
'required' => false,
'subobject' => false,
'comment' => 'Phone Number',
),
),
'Telex' => array(
'type' => 'Telex',
'required' => false,
'subobject' => false,
'comment' => 'Telex number and answer back code',
'maxLength' => '25',
),
),
'Email' => array(
'type' => 'Email',
'required' => false,
'subobject' => true,
),
'subobject' => false,
),
);
}
51 changes: 39 additions & 12 deletions DHL/Datatype/AM/ExportDeclaration.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @version 0.1
*/

namespace DHL\Datatype\AM;
namespace DHL\Datatype\AM;
use DHL\Datatype\Base;

/**
Expand All @@ -45,73 +45,100 @@ class ExportDeclaration extends Base
'type' => '',
'required' => false,
'subobject' => false,
),
),
'IsPartiesRelation' => array(
'type' => 'YesNo',
'required' => false,
'subobject' => false,
'comment' => 'Boolean flag',
'length' => '1',
'enumeration' => 'Y,N',
),
),
'ECCN' => array(
'type' => '',
'required' => false,
'subobject' => false,
),
),
'SignatureName' => array(
'type' => 'SignatureName',
'required' => false,
'subobject' => false,
'comment' => 'Signature name',
'maxLength' => '35',
),
),
'SignatureTitle' => array(
'type' => 'SignatureTitle',
'required' => false,
'subobject' => false,
'comment' => 'Signature title',
'maxLength' => '35',
),
),
'ExportReason' => array(
'type' => 'ExportReason',
'required' => false,
'subobject' => false,
'comment' => 'Export reason',
'length' => '1',
),
),
'ExportReasonCode' => array(
'type' => 'ExportReasonCode',
'required' => false,
'subobject' => false,
'comment' => 'Export reason code (P:Permanent, T:Temporary, R:Re-Export)',
'length' => '1',
'enumeration' => 'P,T,R',
),
),
'SedNumber' => array(
'type' => 'SEDNumber',
'required' => false,
'subobject' => false,
'comment' => '',
'enumeration' => 'FTSR,XTN,SAS',
),
),
'SedNumberType' => array(
'type' => 'SEDNumberType',
'required' => false,
'subobject' => false,
'comment' => '',
'length' => '1',
'enumeration' => 'F,X,S',
),
),
'MxStateCode' => array(
'type' => '',
'required' => false,
'subobject' => false,
),
),
'InvoiceNumber' => array(
'type' => 'string',
'required' => false,
'subobject' => false,
),
'InvoiceDate' => array(
'type' => 'date',
'required' => false,
'subobject' => false,
),
'OtherCharges1' => array(
'type' => 'number',
'required' => false,
'subobject' => false,
),
'OtherCharges2' => array(
'type' => 'number',
'required' => false,
'subobject' => false,
),
'OtherCharges3' => array(
'type' => 'number',
'required' => false,
'subobject' => false,
),
'ExportLineItem' => array(
'type' => 'ExportLineItem',
'required' => false,
'subobject' => true,
),
'multivalues' => true,
'disableParentNode' => true,
),
);
}
45 changes: 30 additions & 15 deletions DHL/Datatype/AM/ExportLineItem.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@
* @version 0.1
*/

namespace DHL\Datatype\AM;
namespace DHL\Datatype\AM;
use DHL\Datatype\Base;

/**
Expand All @@ -48,78 +48,93 @@ class ExportLineItem extends Base
'comment' => '',
'minInclusive' => '1',
'maxInclusive' => '200',
),
),
'Quantity' => array(
'type' => 'Quantity',
'required' => false,
'subobject' => false,
'comment' => 'Quantity',
'maxInclusive' => '32000',
),
),
'QuantityUnit' => array(
'type' => 'QuantityUnit',
'required' => false,
'subobject' => false,
'comment' => 'Quantity unit of measure (tens, hundreds, thousands, etc.)',
'maxLength' => '8',
),
),
'Description' => array(
'type' => 'string',
'required' => false,
'subobject' => false,
),
),
'Value' => array(
'type' => 'Money',
'required' => false,
'subobject' => false,
'comment' => 'Monetary amount (with 2 decimal precision)',
'minInclusive' => '0.00',
'maxInclusive' => '9999999999.99',
),
),
'IsDomestic' => array(
'type' => 'YesNo',
'required' => false,
'subobject' => false,
'comment' => 'Boolean flag',
'length' => '1',
'enumeration' => 'Y,N',
),
),
'CommodityCode' => array(
'type' => 'CommodityCode',
'required' => false,
'subobject' => false,
'comment' => 'Commodity codes for shipment type',
'minLength' => '1',
'maxLength' => '20',
),
),
'ScheduleB' => array(
'type' => 'ScheduleB',
'required' => false,
'subobject' => false,
'comment' => 'Schedule B numner',
'maxLength' => '15',
),
),
'ECCN' => array(
'type' => 'string',
'required' => false,
'subobject' => false,
),
),
'Weight' => array(
'type' => '',
'type' => 'Weight',
'required' => false,
'subobject' => false,
),
'subobject' => true,
),
'GrossWeight' => array(
'type' => 'GrossWeight',
'required' => false,
'subobject' => true,
),
'License' => array(
'type' => '',
'required' => false,
'subobject' => false,
),
),
'LicenseSymbol' => array(
'type' => 'LicenseNumber',
'required' => false,
'subobject' => false,
'comment' => 'Export license number',
'maxLength' => '16',
),
),
'ManufactureCountryCode' => array(
'type' => 'CountryCode',
'required' => false,
'subobject' => false,
),
'ManufactureCountryName' => array(
'type' => 'CountryName',
'required' => false,
'subobject' => false,
),
);
}
Loading