diff --git a/locale.xml b/locale.xml index e235f9d6785e76658bd8df842c95518185865918..800a309917b85cdef4e8d2cd3b07fc3cda915d9e 100644 --- a/locale.xml +++ b/locale.xml @@ -438,6 +438,10 @@ <de><![CDATA[Nutzung definieren]]></de> <en><![CDATA[Defining unit]]></en> </locale> + <locale name="shipping.edit.template.usage"> + <de><![CDATA[Nutzung]]></de> + <en><![CDATA[Usage]]></en> + </locale> <locale name="shipping.edit.template.usage.from"> <de><![CDATA[Nutzbar von]]></de> <en><![CDATA[Usage from]]></en> diff --git a/src/QUI/ERP/Shipping/Rules/ShippingRule.php b/src/QUI/ERP/Shipping/Rules/ShippingRule.php index b585be12e5f590a4b339f520975c780aca9e07aa..5d48e8559c8e38149ce0387079dd6e506e0b0725 100644 --- a/src/QUI/ERP/Shipping/Rules/ShippingRule.php +++ b/src/QUI/ERP/Shipping/Rules/ShippingRule.php @@ -570,7 +570,7 @@ public function canUsedInOrder($Order) } if (!empty($purchaseFrom)) { - $purchaseFrom = \floatval($purchaseFrom); + $purchaseFrom = QUI\ERP\Money\Price::validatePrice($purchaseFrom); if ($purchaseFrom < $sum) { QUI\ERP\Shipping\Debug::addLog( @@ -582,7 +582,7 @@ public function canUsedInOrder($Order) } if (!empty($purchaseUntil)) { - $purchaseUntil = \floatval($purchaseUntil); + $purchaseUntil = QUI\ERP\Money\Price::validatePrice($purchaseUntil); if ($purchaseUntil > $sum) { QUI\ERP\Shipping\Debug::addLog(