dinislage/PrestaShop
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

[-] WS : Fixed PSFV-383

Browse Source
This commit is contained in:
aKorczak
2012-02-21 15:55:38 +00:00
parent b88a546f19
commit 64cf5b1623
2 changed files with 12 additions and 1 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/Combination.php
+1 -1
View File
@@ -65,7 +65,7 @@ class CombinationCore extends ObjectModel
'ean13' => array('type' => self::TYPE_STRING, 'validate' => 'isEan13', 'size' => 13), 'ean13' => array('type' => self::TYPE_STRING, 'validate' => 'isEan13', 'size' => 13),
'upc' => array('type' => self::TYPE_STRING, 'validate' => 'isUpc', 'size' => 12), 'upc' => array('type' => self::TYPE_STRING, 'validate' => 'isUpc', 'size' => 12),
'wholesale_price' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'size' => 27), 'wholesale_price' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'size' => 27),
'price' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'size' => 20), 'price' => array('type' => self::TYPE_FLOAT, 'validate' => 'isNegativePrice', 'size' => 20),
'ecotax' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'size' => 20), 'ecotax' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPrice', 'size' => 20),
'quantity' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'size' => 10), 'quantity' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt', 'size' => 10),
'weight' => array('type' => self::TYPE_INT, 'validate' => 'isFloat'), 'weight' => array('type' => self::TYPE_INT, 'validate' => 'isFloat'),
classes/Validate.php
+11
View File
@@ -233,6 +233,17 @@ class ValidateCore
return preg_match('/^[0-9]{1,10}(\.[0-9]{1,9})?$/', $price); return preg_match('/^[0-9]{1,10}(\.[0-9]{1,9})?$/', $price);
} }
/**
* Check for price validity (including negative price)
*
* @param string $price Price to validate
* @return boolean Validity is ok or not
*/
public static function isNegativePrice($price)
{
return preg_match('/^[-]?[0-9]{1,10}(\.[0-9]{1,9})?$/', $price);
}
/** /**
* Check for language code (ISO) validity * Check for language code (ISO) validity
* *