Skip to content

Adds support for a second reference number #70

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.

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

Merged
merged 4 commits into from
Nov 23, 2015
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
4 changes: 4 additions & 0 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
@@ -1,5 +1,9 @@
# CHANGELOG

## 0.7.1 (released 23-11-2015)

- Adds support for a second reference number

## 0.7.0 (released 16-11-2015)

- **[!]** Default ShipFrom on Shipment class not set anymore in constructor (ShipFrom is optional)
Expand Down
25 changes: 25 additions & 0 deletions src/Entity/Shipment.php
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,11 @@ class Shipment
* @var ReferenceNumber
*/
private $referenceNumber;

/**
* @var ReferenceNumber
*/
private $referenceNumber2;

/**
* @var ShipmentServiceOptions
Expand Down Expand Up @@ -185,6 +190,18 @@ public function setReferenceNumber(ReferenceNumber $referenceNumber)

return $this;
}

/**
* @param ReferenceNumber $referenceNumber
*
* @return Shipment
*/
public function setReferenceNumber2(ReferenceNumber $referenceNumber)
{
$this->referenceNumber2 = $referenceNumber;

return $this;
}

/**
* @return ReferenceNumber
Expand All @@ -193,6 +210,14 @@ public function getReferenceNumber()
{
return $this->referenceNumber;
}

/**
* @return ReferenceNumber
*/
public function getReferenceNumber2()
{
return $this->referenceNumber2;
}

/**
* @return bool
Expand Down
7 changes: 6 additions & 1 deletion src/Shipping.php
Original file line number Diff line number Diff line change
Expand Up @@ -355,6 +355,11 @@ private function createConfirmRequest(
if (isset($referenceNumber)) {
$shipmentNode->appendChild($referenceNumber->toNode($xml));
}

$referenceNumber2 = $shipment->getReferenceNumber2();
if (isset($referenceNumber2)) {
$shipmentNode->appendChild($referenceNumber2->toNode($xml));
}

if ($labelSpec) {
$container->appendChild($xml->importNode($this->compileLabelSpecificationNode($labelSpec), true));
Expand Down Expand Up @@ -721,4 +726,4 @@ private function compileLabelSpecificationNode(ShipmentRequestLabelSpecification

return $labelSpecNode->cloneNode(true);
}
}
}