Fix: EET validation zakl_nepodl_dph

contributte · May 9, 2017 · 33afec9 · 33afec9
1 parent edb7378
commit 33afec9
Show file tree

Hide file tree

Showing 3 changed files with 6 additions and 20 deletions.
diff --git a/src/Api/Entity/PaymentFactory.php b/src/Api/Entity/PaymentFactory.php
@@ -178,20 +178,20 @@ public static function create($data, $validators = [])
 			], $data['eet']);
 
 			$eetSum = $eet->getSum();
-			$eetTotal = $eet->calcTotal();
-			$eetTaxSum = $eet->getTax()
+			$eetTotal = $eet->getTax()
+				+ $eet->getTaxBaseNoVat()
 				+ $eet->getTaxBase()
 				+ $eet->getTaxBaseReducedRateFirst()
 				+ $eet->getTaxReducedRateFirst()
 				+ $eet->getTaxBaseReducedRateSecond()
 				+ $eet->getTaxReducedRateSecond();
 
 			if ($validators[self::V_PRICES] === TRUE) {
-				if (number_format($eetSum, 8) !== number_format($eetTaxSum, 8)) {
-					throw new ValidationException(sprintf('EET sum (%s) and EET tax sum (%s) do not match', $eetSum, $eetTaxSum));
+				if (number_format($eetSum, 8) !== number_format($eetTotal, 8)) {
+					throw new ValidationException(sprintf('EET sum (%s) and EET tax sum (%s) do not match', $eetSum, $eetTotal));
 				}
 
-				if (number_format($eetTotal, 8) !== number_format($orderPrice, 8)) {
+				if (number_format($eetSum, 8) !== number_format($orderPrice, 8)) {
 					throw new ValidationException(sprintf('EET sum (%s) and order sum (%s) do not match', $eetSum, $orderPrice));
 				}
 			}

diff --git a/src/Api/Objects/Eet.php b/src/Api/Objects/Eet.php
@@ -247,20 +247,6 @@ public function setTaxBaseNoVat($taxBaseNoVat)
 	 * HELPERS *****************************************************************
 	 */
 
-	/**
-	 * @return float
-	 */
-	public function calcTotal()
-	{
-		$sum = $this->getSum();
-
-		if ($this->getTaxBaseNoVat()) {
-			$sum += $this->getTaxBaseNoVat();
-		}
-
-		return $sum;
-	}
-
 	/**
 	 * ABSTRACT ****************************************************************
 	 */

diff --git a/tests/cases/unit/Api/Entity/PaymentFactory.phpt b/tests/cases/unit/Api/Entity/PaymentFactory.phpt
@@ -270,7 +270,7 @@ test(function () {
 		'return_url' => 6,
 		'notify_url' => 7,
 		'eet' => [
-			'celk_trzba' => 174.0,
+			'celk_trzba' => 274.0,
 			'zakl_nepodl_dph' => 100.0,
 			'zakl_dan1' => 143.80165289256,
 			'dan1' => 30.198347107438,