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

[*] BO : added a new Validate method "isPercentage"

Browse Source 
git-svn-id: http://dev.prestashop.com/svn/v1/branches/1.5.x@16285 b9a71923-0436-4b27-9f14-aed3839534dd
This commit is contained in:
dMetzger
2012-07-09 13:05:31 +00:00
parent acc15c9e55
commit c51c83edc0
4 changed files with 16 additions and 5 deletions
Download Patch File Download Diff File Expand all files Collapse all files
classes/CartRule.php
+1 -1
View File
@@ -97,7 +97,7 @@ class CartRuleCore extends ObjectModel
'product_restriction' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), 'product_restriction' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
'shop_restriction' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), 'shop_restriction' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
'free_shipping' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), 'free_shipping' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
'reduction_percent' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'), 'reduction_percent' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPercentage'),
'reduction_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'), 'reduction_amount' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
'reduction_tax' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'), 'reduction_tax' => array('type' => self::TYPE_BOOL, 'validate' => 'isBool'),
'reduction_currency' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'), 'reduction_currency' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedId'),
classes/Referrer.php
+1 -1
View File
@@ -64,7 +64,7 @@ class ReferrerCore extends ObjectModel
'http_referer_like_not' => array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml'), 'http_referer_like_not' => array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml'),
'request_uri_like_not' => array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml'), 'request_uri_like_not' => array('type' => self::TYPE_STRING, 'validate' => 'isCleanHtml'),
'base_fee' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'), 'base_fee' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
'percent_fee' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'), 'percent_fee' => array('type' => self::TYPE_FLOAT, 'validate' => 'isPercentage'),
'click_fee' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'), 'click_fee' => array('type' => self::TYPE_FLOAT, 'validate' => 'isFloat'),
'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'), 'date_add' => array('type' => self::TYPE_DATE, 'validate' => 'isDate'),
), ),
classes/Risk.php
+1 -1
View File
@@ -42,7 +42,7 @@ class RiskCore extends ObjectModel
'fields' => array( 'fields' => array(
'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isString', 'required' => true, 'size' => 20), 'name' => array('type' => self::TYPE_STRING, 'lang' => true, 'validate' => 'isString', 'required' => true, 'size' => 20),
'color' => array('type' => self::TYPE_STRING, 'validate' => 'isColor', 'size' => 32), 'color' => array('type' => self::TYPE_STRING, 'validate' => 'isColor', 'size' => 32),
'percent' => array('type' => self::TYPE_INT, 'validate' => 'isUnsignedInt') 'percent' => array('type' => self::TYPE_INT, 'validate' => 'isPercentage')
), ),
); );
classes/Validate.php
+13 -2
View File
@@ -622,7 +622,7 @@ class ValidateCore
/** /**
* Check for an integer validity * Check for an integer validity
* *
* @param integer $id Integer to validate * @param integer $value Integer to validate
* @return boolean Validity is ok or not * @return boolean Validity is ok or not
*/ */
public static function isInt($value) public static function isInt($value)
@@ -633,13 +633,24 @@ class ValidateCore
/** /**
* Check for an integer validity (unsigned) * Check for an integer validity (unsigned)
* *
* @param integer $id Integer to validate * @param integer $value Integer to validate
* @return boolean Validity is ok or not * @return boolean Validity is ok or not
*/ */
public static function isUnsignedInt($value) public static function isUnsignedInt($value)
{ {
return (preg_match('#^[0-9]+$#', (string)$value) && $value < 4294967296 && $value >= 0); return (preg_match('#^[0-9]+$#', (string)$value) && $value < 4294967296 && $value >= 0);
} }
/**
* Check for an percentage validity (between 0 and 100)
*
* @param float $value Float to validate
* @return boolean Validity is ok or not
*/
public static function isPercentage($value)
{
return (Validate::isFloat($value) && $value >= 0 && $value <= 100);
}
/** /**
* Check for an integer validity (unsigned) * Check for an integer validity (unsigned)