From 2c90b77c5ab779a7ed19a7dc61d73074d1eb32b7 Mon Sep 17 00:00:00 2001 From: Jay Patel Date: Thu, 19 Mar 2015 14:13:52 -0500 Subject: [PATCH] Fixes to Model Object Property Type --- lib/PayPal/Api/InvoiceItem.php | 8 ++++++-- lib/PayPal/Api/Tax.php | 8 ++++++-- tests/PayPal/Test/Common/FormatConverterTest.php | 4 ++++ 3 files changed, 16 insertions(+), 4 deletions(-) diff --git a/lib/PayPal/Api/InvoiceItem.php b/lib/PayPal/Api/InvoiceItem.php index 14cfe9b..3375762 100644 --- a/lib/PayPal/Api/InvoiceItem.php +++ b/lib/PayPal/Api/InvoiceItem.php @@ -3,6 +3,8 @@ namespace PayPal\Api; use PayPal\Common\PayPalModel; +use PayPal\Converter\FormatConverter; +use PayPal\Validation\NumericValidator; /** * Class InvoiceItem @@ -70,12 +72,14 @@ class InvoiceItem extends PayPalModel /** * Quantity of the item. Range of 0 to 9999.999. * - * @param \PayPal\Api\number $quantity + * @param string|double $quantity * * @return $this */ public function setQuantity($quantity) { + NumericValidator::validate($quantity, "Percent"); + $quantity = FormatConverter::formatToPrice($quantity); $this->quantity = $quantity; return $this; } @@ -83,7 +87,7 @@ class InvoiceItem extends PayPalModel /** * Quantity of the item. Range of 0 to 9999.999. * - * @return \PayPal\Api\number + * @return string */ public function getQuantity() { diff --git a/lib/PayPal/Api/Tax.php b/lib/PayPal/Api/Tax.php index d5b99ab..ce6b9f2 100644 --- a/lib/PayPal/Api/Tax.php +++ b/lib/PayPal/Api/Tax.php @@ -3,6 +3,8 @@ namespace PayPal\Api; use PayPal\Common\PayPalModel; +use PayPal\Converter\FormatConverter; +use PayPal\Validation\NumericValidator; /** * Class Tax @@ -67,12 +69,14 @@ class Tax extends PayPalModel /** * Rate of the specified tax. Range of 0.001 to 99.999. * - * @param \PayPal\Api\number $percent + * @param string|double $percent * * @return $this */ public function setPercent($percent) { + NumericValidator::validate($percent, "Percent"); + $percent = FormatConverter::formatToPrice($percent); $this->percent = $percent; return $this; } @@ -80,7 +84,7 @@ class Tax extends PayPalModel /** * Rate of the specified tax. Range of 0.001 to 99.999. * - * @return \PayPal\Api\number + * @return string */ public function getPercent() { diff --git a/tests/PayPal/Test/Common/FormatConverterTest.php b/tests/PayPal/Test/Common/FormatConverterTest.php index 6317eb8..d5e2c51 100644 --- a/tests/PayPal/Test/Common/FormatConverterTest.php +++ b/tests/PayPal/Test/Common/FormatConverterTest.php @@ -4,7 +4,9 @@ namespace PayPal\Test\Common; use PayPal\Api\Amount; use PayPal\Api\Currency; use PayPal\Api\Details; +use PayPal\Api\InvoiceItem; use PayPal\Api\Item; +use PayPal\Api\Tax; use PayPal\Converter\FormatConverter; use PayPal\Common\PayPalModel; use PayPal\Test\Validation\NumericValidatorTest; @@ -27,6 +29,8 @@ class FormatConverterTest extends \PHPUnit_Framework_TestCase array(new Details(), 'Insurance'), array(new Details(), 'HandlingFee'), array(new Details(), 'GiftWrap'), + array(new InvoiceItem(), 'Quantity'), + array(new Tax(), 'Percent') ); }