From 82c2b8cb21ac302ad460ade094b54371663fdbd8 Mon Sep 17 00:00:00 2001
From: Henning <leutz@pcsg.de>
Date: Tue, 25 Mar 2025 13:04:26 +0100
Subject: [PATCH] fix: correct Price.php merge conflict
Resolved an issue in src/QUI/ERP/Money/Price.php file where there was a merge conflict happening
between different versions. Now, the file is ready for further contributions.
---
src/QUI/ERP/Money/Price.php | 6 ++++--
1 file changed, 4 insertions(+), 2 deletions(-)
diff --git a/src/QUI/ERP/Money/Price.php b/src/QUI/ERP/Money/Price.php
index 05079e4..a329638 100644
--- a/src/QUI/ERP/Money/Price.php
+++ b/src/QUI/ERP/Money/Price.php
@@ -198,8 +198,10 @@ public function getCurrency(): QUI\ERP\Currency\Currency
* @param QUI\Locale|null $Locale - based locale, in which the price is
* @return float|int|null
*/
- public static function validatePrice(mixed $value, null | QUI\Locale $Locale = null): float | int | null
- {
+ public static function validatePrice(
+ mixed $value,
+ null | QUI\Locale $Locale = null
+ ): float | int | null {
if (is_float($value) || is_int($value)) {
return round($value, QUI\ERP\Defaults::getPrecision());
}
--
GitLab