Merge pull request #64 from frankmullenger/price-class-override

MINOR replace new Price() with Price::create() to allow it to be overrid...

code/form/ProductForm.php

@@ -43,7 +43,7 @@ public function __construct($controller, $name, $quantity = null, $redirectURL =
 			if ($variation->isEnabled()) {
 				$variationPrice = $variation->Price();
 
-				$amount = new Price();
+				$amount = Price::create();
 				$amount->setAmount($productPrice->getAmount() + $variationPrice->getAmount());
 				$amount->setCurrency($productPrice->getCurrency());
 				$amount->setSymbol($productPrice->getSymbol());

code/order/Item.php

@@ -24,7 +24,7 @@ public function Amount() {
 
 		$order = $this->Order();
 
-		$amount = new Price();
+		$amount = Price::create();
 		$amount->setAmount($this->Price);
 		$amount->setCurrency($order->BaseCurrency);
 		$amount->setSymbol($order->BaseCurrencySymbol);

code/order/ItemOption.php

@@ -34,7 +34,7 @@ public function Amount() {
 
 		$order = $this->Order();
 
-		$amount = new Price();
+		$amount = Price::create();
 		$amount->setAmount($this->Price);
 		$amount->setCurrency($order->BaseCurrency);
 		$amount->setSymbol($order->BaseCurrencySymbol);

code/order/Modification.php

@@ -66,7 +66,7 @@ public function Amount() {
 		// TODO: Multi currency
 		$order = $this->Order();
 
-		$amount = new Price();
+		$amount = Price::create();
 		$amount->setAmount($this->Price);
 		$amount->setCurrency($order->BaseCurrency);
 		$amount->setSymbol($order->BaseCurrencySymbol);

code/order/Order.php

@@ -51,7 +51,7 @@ public function Total() {
 
 		// TODO: Multi currency
 
-		$amount = new Price();
+		$amount = Price::create();
 		$amount->setAmount($this->TotalPrice);
 		$amount->setCurrency($this->BaseCurrency);
 		$amount->setSymbol($this->BaseCurrencySymbol);
@@ -74,7 +74,7 @@ public function SubTotal() {
 
 		// TODO: Multi currency
 
-		$amount = new Price();
+		$amount = Price::create();
 		$amount->setAmount($this->SubTotalPrice);
 		$amount->setCurrency($this->BaseCurrency);
 		$amount->setSymbol($this->BaseCurrencySymbol);
@@ -475,7 +475,7 @@ public function TotalOutstanding() {
 
 		// TODO: Multi currency
 
-		$outstanding = new Price();
+		$outstanding = Price::create();
 		$outstanding->setAmount($total);
 		$outstanding->setCurrency($this->BaseCurrency);
 		$outstanding->setSymbol($this->BaseCurrencySymbol);
@@ -498,7 +498,7 @@ public function TotalPaid() {
 			}
 		}
 
-		$totalPaid = new Price();
+		$totalPaid = Price::create();
 		$totalPaid->setAmount($paid);
 		$totalPaid->setCurrency($this->BaseCurrency);
 		$totalPaid->setSymbol($this->BaseCurrencySymbol);

code/product/Product.php

@@ -35,7 +35,7 @@ public function Amount() {
 		// TODO: Multi currency
 		$shopConfig = ShopConfig::current_shop_config();
 
-		$amount = new Price();
+		$amount = Price::create();
 		$amount->setAmount($this->Price);
 		$amount->setCurrency($shopConfig->BaseCurrency);
 		$amount->setSymbol($shopConfig->BaseCurrencySymbol);

code/product/Variation.php

@@ -26,7 +26,7 @@ class Variation extends DataObject implements PermissionProvider {
 
 	public function Amount() {
 
-		$amount = new Price();
+		$amount = Price::create();
 		$amount->setCurrency($this->Currency);
 		$amount->setAmount($this->Price);
 		$amount->setSymbol(ShopConfig::current_shop_config()->BaseCurrencySymbol);

tests/CartTest.php

@@ -314,7 +314,7 @@ public function testAddProductToCartChangePrice() {
 		$this->assertEquals(1, $order->Items()->Count());
 		$this->assertEquals($productA->Price, $firstItem->Price);
 
-		$newAmount = new Price();
+		$newAmount = Price::create();
 		$newAmount->setAmount(72.34);
 		$newAmount->setCurrency('NZD');