From cf2251fc17fa39feb2c6d242017b31554ecd7a7b Mon Sep 17 00:00:00 2001 From: Michael Calcinai Date: Sat, 9 Jan 2016 09:34:38 +1300 Subject: [PATCH] Updated models --- .../Models/Accounting/BankTransaction.php | 34 +++++++++++++++++++ src/XeroPHP/Models/Accounting/CreditNote.php | 4 +-- .../Models/Accounting/LinkedTransaction.php | 29 +++++++++++++++- .../Models/Accounting/PurchaseOrder.php | 14 ++++++++ .../Models/PayrollAU/PayItem/EarningsRate.php | 1 + .../PayrollUS/Employee/SalaryAndWage.php | 31 ++++++++++++++++- 6 files changed, 109 insertions(+), 4 deletions(-) create mode 100644 src/XeroPHP/Models/Accounting/PurchaseOrder.php diff --git a/src/XeroPHP/Models/Accounting/BankTransaction.php b/src/XeroPHP/Models/Accounting/BankTransaction.php index 50e7ba70..bc0d8ff0 100644 --- a/src/XeroPHP/Models/Accounting/BankTransaction.php +++ b/src/XeroPHP/Models/Accounting/BankTransaction.php @@ -112,6 +112,20 @@ class BankTransaction extends Remote\Object * @property string BankTransactionID */ + /** + * Xero generated unique identifier for a Prepayment. This will be returned on BankTransactions with a + * Type of SPEND-PREPAYMENT or RECEIVE-PREPAYMENT + * + * @property string PrepaymentID + */ + + /** + * Xero generated unique identifier for an Overpayment. This will be returned on BankTransactions with + * a Type of SPEND-OVERPAYMENT or RECEIVE-OVERPAYMENT + * + * @property string OverpaymentID + */ + /** * Last modified date UTC format * @@ -224,6 +238,8 @@ public static function getProperties() 'TotalTax' => array (false, self::PROPERTY_TYPE_FLOAT, null, false, false), 'Total' => array (false, self::PROPERTY_TYPE_FLOAT, null, false, false), 'BankTransactionID' => array (false, self::PROPERTY_TYPE_STRING, null, false, false), + 'PrepaymentID' => array (false, self::PROPERTY_TYPE_STRING, null, false, false), + 'OverpaymentID' => array (false, self::PROPERTY_TYPE_STRING, null, false, false), 'UpdatedDateUTC' => array (false, self::PROPERTY_TYPE_TIMESTAMP, '\\DateTime', false, false), 'HasAttachments' => array (false, self::PROPERTY_TYPE_BOOLEAN, null, false, false) ); @@ -542,6 +558,24 @@ public function setBankTransactionID($value) return $this; } + /** + * @return string + */ + public function getPrepaymentID() + { + return $this->_data['PrepaymentID']; + } + + + /** + * @return string + */ + public function getOverpaymentID() + { + return $this->_data['OverpaymentID']; + } + + /** * @return \DateTime */ diff --git a/src/XeroPHP/Models/Accounting/CreditNote.php b/src/XeroPHP/Models/Accounting/CreditNote.php index abad40a2..a5ea8f33 100644 --- a/src/XeroPHP/Models/Accounting/CreditNote.php +++ b/src/XeroPHP/Models/Accounting/CreditNote.php @@ -38,7 +38,7 @@ class CreditNote extends Remote\Object */ /** - * See Invoice Status Codes + * See Credit Note Status Codes * * @property string Status */ @@ -218,7 +218,7 @@ public static function getProperties() 'Type' => array (false, self::PROPERTY_TYPE_ENUM, null, false, false), 'Contact' => array (false, self::PROPERTY_TYPE_OBJECT, 'Accounting\\Contact', false, false), 'Date' => array (false, self::PROPERTY_TYPE_DATE, '\\DateTime', false, false), - 'Status' => array (false, self::PROPERTY_TYPE_ENUM, null, false, false), + 'Status' => array (false, self::PROPERTY_TYPE_STRING, null, false, false), 'LineAmountTypes' => array (false, self::PROPERTY_TYPE_ENUM, null, false, false), 'LineItems' => array (false, self::PROPERTY_TYPE_OBJECT, 'Accounting\\Invoice\\LineItem', true, false), 'SubTotal' => array (false, self::PROPERTY_TYPE_FLOAT, null, false, false), diff --git a/src/XeroPHP/Models/Accounting/LinkedTransaction.php b/src/XeroPHP/Models/Accounting/LinkedTransaction.php index 934e93c9..5f0e8181 100644 --- a/src/XeroPHP/Models/Accounting/LinkedTransaction.php +++ b/src/XeroPHP/Models/Accounting/LinkedTransaction.php @@ -68,6 +68,13 @@ class LinkedTransaction extends Remote\Object * @property \DateTime UpdatedDateUTC */ + /** + * The Type of the source tranasction. This will be ACCPAY if the linked transaction was created from + * an invoice and SPEND if it was created from a bank transaction. + * + * @property string SourceTransactionTypeCode + */ + const LINKED_TRANSACTION_STATUS_DRAFT = 'DRAFT'; const LINKED_TRANSACTION_STATUS_APPROVED = 'APPROVED'; @@ -155,7 +162,8 @@ public static function getProperties() 'LinkedTransactionID' => array (false, self::PROPERTY_TYPE_STRING, null, false, false), 'Status' => array (false, self::PROPERTY_TYPE_STRING, null, false, false), 'Type' => array (false, self::PROPERTY_TYPE_ENUM, null, false, false), - 'UpdatedDateUTC' => array (false, self::PROPERTY_TYPE_TIMESTAMP, '\\DateTime', false, false) + 'UpdatedDateUTC' => array (false, self::PROPERTY_TYPE_TIMESTAMP, '\\DateTime', false, false), + 'SourceTransactionTypeCode' => array (false, self::PROPERTY_TYPE_STRING, null, false, false) ); } @@ -335,5 +343,24 @@ public function setUpdatedDateUTC(\DateTime $value) return $this; } + /** + * @return string + */ + public function getSourceTransactionTypeCode() + { + return $this->_data['SourceTransactionTypeCode']; + } + + /** + * @param string $value + * @return LinkedTransaction + */ + public function setSourceTransactionTypeCode($value) + { + $this->propertyUpdated('SourceTransactionTypeCode', $value); + $this->_data['SourceTransactionTypeCode'] = $value; + return $this; + } + } diff --git a/src/XeroPHP/Models/Accounting/PurchaseOrder.php b/src/XeroPHP/Models/Accounting/PurchaseOrder.php new file mode 100644 index 00000000..e82a1bfd --- /dev/null +++ b/src/XeroPHP/Models/Accounting/PurchaseOrder.php @@ -0,0 +1,14 @@ + array (false, self::PROPERTY_TYPE_STRING, null, false, false), + 'SalaryAndWagesID' => array (false, self::PROPERTY_TYPE_STRING, null, false, false), 'EarningsTypeID' => array (false, self::PROPERTY_TYPE_STRING, null, false, false), 'SalaryWagesType' => array (false, self::PROPERTY_TYPE_ENUM, null, false, false), 'HourlyRate' => array (false, self::PROPERTY_TYPE_FLOAT, null, false, false), @@ -134,6 +142,7 @@ public static function isPageable() /** * @return string + * @deprecated */ public function getSalaryAndWageID() { @@ -143,6 +152,7 @@ public function getSalaryAndWageID() /** * @param string $value * @return SalaryAndWage + * @deprecated */ public function setSalaryAndWageID($value) { @@ -151,6 +161,25 @@ public function setSalaryAndWageID($value) return $this; } + /** + * @return string + */ + public function getSalaryAndWagesID() + { + return $this->_data['SalaryAndWagesID']; + } + + /** + * @param string $value + * @return SalaryAndWage + */ + public function setSalaryAndWagesID($value) + { + $this->propertyUpdated('SalaryAndWagesID', $value); + $this->_data['SalaryAndWagesID'] = $value; + return $this; + } + /** * @return string */