Skip to content
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

ANA-12 allow multiple QtdShpExChrg in QtdShpType #49

Closed
wants to merge 15 commits into from
Closed

ANA-12 allow multiple QtdShpExChrg in QtdShpType #49

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
15 commits
Select commit Hold shift + click to select a range
b916f8e
Add missing DataTypes (Weight/GrossWeight)
Nov 6, 2019
bddef04
Merge pull request #1 from JamesAndJamesFulfilment/f-update-dhl-lib
Nocture Nov 6, 2019
cec051b
Update datatypes to use 6.2 version
Nov 11, 2019
7467c38
Merge pull request #2 from JamesAndJamesFulfilment/f-jc-add-missing-d…
Nocture Nov 11, 2019
bdd08e0
Fix bad syntax error
Nov 11, 2019
35aca9a
Merge pull request #3 from JamesAndJamesFulfilment/f-jc-add-missing-d…
Nocture Nov 11, 2019
7bde0b0
Do not use MetaData for tracking request
Nov 11, 2019
3911e6c
Merge pull request #4 from JamesAndJamesFulfilment/f-jc-track-metadata
Nocture Nov 11, 2019
8379c67
Add GenReq to AM GetCapability/GetQuote
Nov 12, 2019
12ad8fa
Merge pull request #5 from JamesAndJamesFulfilment/f-jc-genreq
Nocture Nov 12, 2019
438e820
Add country of origin to exportline item. update export reason lenght…
Nov 13, 2019
2bf8437
Merge pull request #6 from JamesAndJamesFulfilment/release
Nocture Nov 14, 2019
6ba2571
updated composer.json
akhumphrey Dec 16, 2019
76a849e
removed syntax error
akhumphrey Jun 9, 2021
803c26b
ANA-12 QtdShpExChrg node should allow multiple values
Jun 9, 2021
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
84 changes: 84 additions & 0 deletions DHL/Datatype/AM/GenReq.php
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,84 @@
<?php
/**
* Note : Code is released under the GNU LGPL
*
* Please do not change the header of this file
*
* This library is free software; you can redistribute it and/or modify it under the terms of the GNU
* Lesser General Public License as published by the Free Software Foundation; either version 2 of
* the License, or (at your option) any later version.
*
* This library is distributed in the hope that it will be useful, but WITHOUT ANY WARRANTY;
* without even the implied warranty of MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.
*
* See the GNU Lesser General Public License for more details.
*/

/**
* File: GenReq.php
* Project: DHL API
*
* @author Al-Fallouji Bashar
* @version 0.1
*/

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

/**
* GenReq Request model for DHL API
*/
class GenReq extends Base
{
/**
* Is this object a subobject
* @var boolean
*/
protected $_isSubobject = true;

/**
* Parameters of the datatype
* @var array
*/
protected $_params = array(
'OSINFO' => array(
'type' => 'string',
'required' => false,
'subobject' => false,
'comment' => 'It finds all valid product and service combinations.',
'length' => '1',
'enumeration' => 'Y,N',
),
'NXTPU' => array(
'type' => 'string',
'required' => false,
'subobject' => false,
'comment' => 'If pickup isn’t possible on requested pickup day. It finds next possible pickup.',
'length' => '1',
'enumeration' => 'Y,N',
),
'FCNTWTYCD' => array(
'type' => 'string',
'required' => false,
'subobject' => false,
'comment' => 'It specifies the facility network code.',
'enumeration' => 'DD,TD,AL',
),
'CUSTAGRIND' => array(
'type' => 'string',
'required' => false,
'subobject' => false,
'comment' => 'Specifies customer agreement indicator for product and services.',
'length' => '1',
'enumeration' => 'Y,N',
),
'VLDTRT_DD' => array(
'type' => 'string',
'required' => false,
'subobject' => false,
'comment' => 'Specifies whether the validation is required on ready time against the pickup window start time on DDI product.',
'length' => '1',
'enumeration' => 'Y,N',
),
);
}
2 changes: 2 additions & 0 deletions DHL/Datatype/AM/QtdShpType.php
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -61,6 +61,8 @@ class QtdShpType extends Base
'type' => 'QtdShpExChrgType',
'required' => false,
'subobject' => true,
'multivalues' => true,
'disableParentNode' => true,
),
);
}
229 changes: 215 additions & 14 deletions DHL/Datatype/GB/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\GB;
namespace DHL\Datatype\GB;
use DHL\Datatype\Base;

/**
Expand All @@ -42,78 +42,279 @@ class ExportDeclaration extends Base
*/
protected $_params = array(
'InterConsignee' => array(
'type' => '',
'type' => 'string',
'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',
),
'maxLength' => '30',
),
'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,ITN',
),
),
'SedNumberType' => array(
'type' => 'SEDNumberType',
'required' => false,
'subobject' => false,
'comment' => '',
'length' => '1',
'enumeration' => 'F,X,S,I',
),
),
'MxStateCode' => array(
'type' => '',
'required' => false,
'subobject' => false,
),
),
'InvoiceNumber' => array(
'type' => 'InvoiceNumber',
'required' => false,
'subobject' => false,
),
'InvoiceDate' => array(
'type' => 'InvoiceDate',
'required' => false,
'subobject' => false,
),
'BillToCompanyName' => array(
'type' => 'BillToCompanyName',
'required' => false,
'subobject' => false,
),
'BillToContanctName' => array(
'type' => 'BillToContanctName',
'required' => false,
'subobject' => false,
),
'BillToAddressLine' => array(
'type' => 'BillToAddressLine',
'required' => false,
'subobject' => false,
),
'BillToCity' => array(
'type' => 'BillToCity',
'required' => false,
'subobject' => false,
),
'BillToPostcode' => array(
'type' => 'BillToPostcode',
'required' => false,
'subobject' => false,
),
'BillToSuburb' => array(
'type' => 'BillToSuburb',
'required' => false,
'subobject' => false,
),
'BillToState' => array(
'type' => 'BillToState',
'required' => false,
'subobject' => false,
),
'BillToCountryName' => array(
'type' => 'BillToCountryName',
'required' => false,
'subobject' => false,
),
'BillToPhoneNumber' => array(
'type' => 'BillToPhoneNumber',
'required' => false,
'subobject' => false,
),
'BillToPhoneNumberExtn' => array(
'type' => 'BillToPhoneNumberExtn',
'required' => false,
'subobject' => false,
),
'BillToFaxNumber' => array(
'type' => 'BillToFaxNumber',
'required' => false,
'subobject' => false,
),
'BillToFederalTaxID' => array(
'type' => 'BillToFederalTaxID',
'required' => false,
'subobject' => false,
),
'Remarks' => array(
'type' => 'Remarks',
'required' => false,
'subobject' => false,
),
'OtherCharges1' => array(
'type' => 'OtherCharges1',
'required' => false,
'subobject' => false,
),
'OtherCharges2' => array(
'type' => 'OtherCharges2',
'required' => false,
'subobject' => false,
),
'OtherCharges3' => array(
'type' => 'OtherCharges3',
'required' => false,
'subobject' => false,
),
'DestinationPort' => array(
'type' => 'DestinationPort',
'required' => false,
'subobject' => false,
),
'TermsOfPayment' => array(
'type' => 'TermsOfPayment',
'required' => false,
'subobject' => false,
),
'PayerGSTVAT' => array(
'type' => 'PayerGSTVAT',
'required' => false,
'subobject' => false,
),
'ReceiverReference' => array(
'type' => 'ReceiverReference',
'required' => false,
'subobject' => false,
),
'ExporterCode' => array(
'type' => 'ExporterCode',
'required' => false,
'subobject' => false,
),
'PackageMarks' => array(
'type' => 'PackageMarks',
'type' => 'PayerGSTVAT',
'required' => false,
'subobject' => false,
),
'ReceiverReference' => array(
'type' => 'ReceiverReference',
'required' => false,
'subobject' => false,
),
'ExporterCode' => array(
'type' => 'ExporterCode',
'required' => false,
'subobject' => false,
),
'PackageMarks' => array(
'type' => 'PackageMarks',
'required' => false,
'subobject' => false,
),
'OtherRemarks2' => array(
'type' => 'OtherRemarks2',
'required' => false,
'subobject' => false,
),
'OtherRemarks3' => array(
'type' => 'OtherRemarks3',
'required' => false,
'subobject' => false,
),
'RUBankINN' => array(
'type' => 'RUBankINN',
'required' => false,
'subobject' => false,
),
'RUBankKPP' => array(
'type' => 'RUBankKPP',
'required' => false,
'subobject' => false,
),
'RUBankOKPO' => array(
'type' => 'RUBankOKPO',
'required' => false,
'subobject' => false,
),
'RUBankOGRN' => array(
'type' => 'RUBankOGRN',
'required' => false,
'subobject' => false,
),
'RUBankSettlementAcctNumUSDEUR' => array(
'type' => 'RUBankSettlementAcctNumUSDEUR',
'required' => false,
'subobject' => false,
),
'RUBankSettlementAcctNumRUR' => array(
'type' => 'RUBankSettlementAcctNumRUR',
'required' => false,
'subobject' => false,
),
'RUBankName' => array(
'type' => 'RUBankName',
'required' => false,
'subobject' => false,
),
'AddDeclText1' => array(
'type' => 'AddDeclText1',
'required' => false,
'subobject' => false,
),
'AddDeclText2' => array(
'type' => 'AddDeclText2',
'required' => false,
'subobject' => false,
),
'AddDeclText3' => array(
'type' => 'AddDeclText3',
'required' => false,
'subobject' => false,
),
'ExportLineItems' => array(
'type' => 'ExportLineItem',
'required' => false,
'subobject' => true,
'multivalues' => true,
'disableParentNode' => true,
),
),
'ShipmentDocument' => array(
'type' => 'ShipmentDocument',
'required' => false,
'subobject' => false,
),
);
}
Loading