lxbfYeaa/PayPal-PHP-SDK
Archived
Template
1
0
Fork 0
forked from LiveCarta/PayPal-PHP-SDK
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Updated FormatConverter to Format Price based on Currency (if provided)

Browse Source 
- Fixes #176 Issue
- Renamed formatToTwoDecimalPlaces to formatToNumber
This commit is contained in:
japatel
2014-12-08 17:11:33 -06:00
parent 8bb80cb843
commit 7c4a16ca3d
8 changed files with 106 additions and 15 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
lib/PayPal/Api/Amount.php
View File

@@ -55,7 +55,7 @@ class Amount extends PPModel
public function setTotal($total)
{
NumericValidator::validate($total, "Total");
$total = FormatConverter::formatToTwoDecimalPlaces($total);
$total = FormatConverter::formatToPrice($total, $this->getCurrency());
$this->total = $total;
return $this;
}

2
lib/PayPal/Api/Cost.php
View File

@@ -28,7 +28,7 @@ class Cost extends PPModel
public function setPercent($percent)
{
NumericValidator::validate($percent, "Percent");
$percent = FormatConverter::formatToTwoDecimalPlaces($percent);
$percent = FormatConverter::formatToNumber($percent);
$this->percent = $percent;
return $this;
}

2
lib/PayPal/Api/Currency.php
View File

@@ -51,7 +51,7 @@ class Currency extends PPModel
public function setValue($value)
{
NumericValidator::validate($value, "Value");
$value = FormatConverter::formatToTwoDecimalPlaces($value);
$value = FormatConverter::formatToPrice($value, $this->getCurrency());
$this->value = $value;
return $this;
}

16
lib/PayPal/Api/Details.php
View File

@@ -36,7 +36,7 @@ class Details extends PPModel
public function setShipping($shipping)
{
NumericValidator::validate($shipping, "Shipping");
$shipping = FormatConverter::formatToTwoDecimalPlaces($shipping);
$shipping = FormatConverter::formatToPrice($shipping);
$this->shipping = $shipping;
return $this;
}
@@ -62,7 +62,7 @@ class Details extends PPModel
public function setSubtotal($subtotal)
{
NumericValidator::validate($subtotal, "SubTotal");
$subtotal = FormatConverter::formatToTwoDecimalPlaces($subtotal);
$subtotal = FormatConverter::formatToPrice($subtotal);
$this->subtotal = $subtotal;
return $this;
}
@@ -89,7 +89,7 @@ class Details extends PPModel
public function setTax($tax)
{
NumericValidator::validate($tax, "Tax");
$tax = FormatConverter::formatToTwoDecimalPlaces($tax);
$tax = FormatConverter::formatToPrice($tax);
$this->tax = $tax;
return $this;
}
@@ -115,7 +115,7 @@ class Details extends PPModel
public function setFee($fee)
{
NumericValidator::validate($fee, "Fee");
$fee = FormatConverter::formatToTwoDecimalPlaces($fee);
$fee = FormatConverter::formatToPrice($fee);
$this->fee = $fee;
return $this;
}
@@ -141,7 +141,7 @@ class Details extends PPModel
public function setShippingDiscount($shipping_discount)
{
NumericValidator::validate($shipping_discount, "Shipping Discount");
$shipping_discount = FormatConverter::formatToTwoDecimalPlaces($shipping_discount);
$shipping_discount = FormatConverter::formatToPrice($shipping_discount);
$this->shipping_discount = $shipping_discount;
return $this;
}
@@ -192,7 +192,7 @@ class Details extends PPModel
public function setInsurance($insurance)
{
NumericValidator::validate($insurance, "Insurance");
$insurance = FormatConverter::formatToTwoDecimalPlaces($insurance);
$insurance = FormatConverter::formatToPrice($insurance);
$this->insurance = $insurance;
return $this;
}
@@ -218,7 +218,7 @@ class Details extends PPModel
public function setHandlingFee($handling_fee)
{
NumericValidator::validate($handling_fee, "Handling Fee");
$handling_fee = FormatConverter::formatToTwoDecimalPlaces($handling_fee);
$handling_fee = FormatConverter::formatToPrice($handling_fee);
$this->handling_fee = $handling_fee;
return $this;
}
@@ -268,7 +268,7 @@ class Details extends PPModel
public function setGiftWrap($gift_wrap)
{
NumericValidator::validate($gift_wrap, "Gift Wrap");
$gift_wrap = FormatConverter::formatToTwoDecimalPlaces($gift_wrap);
$gift_wrap = FormatConverter::formatToPrice($gift_wrap);
$this->gift_wrap = $gift_wrap;
return $this;
}

4
lib/PayPal/Api/Item.php
View File

@@ -113,7 +113,7 @@ class Item extends PPModel
{
NumericValidator::validate($price, "Price");
$price = FormatConverter::formatToTwoDecimalPlaces($price);
$price = FormatConverter::formatToPrice($price, $this->getCurrency());
$this->price = $price;
return $this;
}
@@ -139,7 +139,7 @@ class Item extends PPModel
public function setTax($tax)
{
NumericValidator::validate($tax, "Tax");
$tax = FormatConverter::formatToTwoDecimalPlaces($tax);
$tax = FormatConverter::formatToPrice($tax, $this->getCurrency());
$this->tax = $tax;
return $this;
}