From c76004b59c63373749fb8ce66e65cda9945bd886 Mon Sep 17 00:00:00 2001
From: Jan Tomka <jan@shopix.com.au>
Date: Wed, 7 May 2014 15:44:39 +1000
Subject: [PATCH 1/2] Remove internal isAddedToParcel field from output to
 prevent breaking of the consignment file format.

---
 src/lib/Doghouse/Australia/Eparcel/Record.php | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/lib/Doghouse/Australia/Eparcel/Record.php b/src/lib/Doghouse/Australia/Eparcel/Record.php
index 68daf0d..4382609 100755
--- a/src/lib/Doghouse/Australia/Eparcel/Record.php
+++ b/src/lib/Doghouse/Australia/Eparcel/Record.php
@@ -19,7 +19,7 @@ public function isAddedToEparcel($isAddedToEparcel=null)
 	public function getValues()
 	{
 		$values = array_values(
-			get_object_vars($this)
+			array_diff_key(get_object_vars($this), array('isAddedToEparcel' => ''))
 		);
 		
 		foreach( $values as &$value )

From 46f5cc2a398a018a47e5f5394dc9e9abf10a6f6a Mon Sep 17 00:00:00 2001
From: Jan Tomka <jan@shopix.com.au>
Date: Wed, 7 May 2014 15:49:31 +1000
Subject: [PATCH 2/2] Add complete list of fields for consignment record so
 that any one of them can be set without randomly being added to the end of
 record, breaking the file format.

---
 .../Australia/Eparcel/Record/Consignement.php | 22 +++++++++++++++++++
 1 file changed, 22 insertions(+)

diff --git a/src/lib/Doghouse/Australia/Eparcel/Record/Consignement.php b/src/lib/Doghouse/Australia/Eparcel/Record/Consignement.php
index 17d8f28..76f75af 100755
--- a/src/lib/Doghouse/Australia/Eparcel/Record/Consignement.php
+++ b/src/lib/Doghouse/Australia/Eparcel/Record/Consignement.php
@@ -33,4 +33,26 @@ class Doghouse_Australia_Eparcel_Record_Consignement extends Doghouse_Australia_
 	public $isRef2PrintRequired = false;
 	public $chargebackAccount;
 	public $isRecurringConsignement = false;
+	public $returnName;
+	public $returnAddressLine1;
+	public $returnAddressLine2;
+	public $returnAddressLine3;
+	public $returnAddressLine4;
+	public $returnSuburb;
+	public $returnStateCode;
+	public $returnPostcode;
+	public $returnCountryCode;
+	public $redirectionCompanyName;
+	public $redirectionName;
+	public $redirectionAddressLine1;
+	public $redirectionAddressLine2;
+	public $redirectionAddressLine3;
+	public $redirectionAddressLine4;
+	public $redirectionSuburb;
+	public $redirectionStateCode;
+	public $redirectionPostcode;
+	public $redirectionCountryCode;
+	public $manifestId = '';
+	public $consigneeEmail;
+	public $consigneeEmailNotification;
 }
\ No newline at end of file