Changeset 9893 for temp

Timestamp:

2006/11/30 17:17:30 (20 years ago)

Author:

kakinaka

Message:

blank

File:

• temp/trunk/data/lib/slib.php (modified) (3 diffs)

temp/trunk/data/lib/slib.php

@@ -1064 +1064 @@
     // »Í¼Î¸ÞÆþ
     case 1:
-        $ret = sfRound($ret);
-        break;
-    // ÀÚ¤ê¼Î¤Æ
-    case 2:
-        $ret = sfFloor($ret);
-        break;
-    // ÀÚ¤ê¾å¤²
-    case 3:
-        $ret = sfCeil($ret);
-        break;
-    // ¥Ç¥Õ¥©¥ë¥È:ÀÚ¤ê¾å¤²
-    default:
-        $ret = sfCeil($ret);
-        break;
-    }
-    return $ret;
-}
-
-/* ÀǶâÉÕÍ¿ */
-function sfPreTax($price, $tax, $tax_rule, $digit = 1) {
-    $real_tax = $tax / 100;
-    $ret = $price * (1 + $real_tax);
-    
-    switch($tax_rule) {
-    // »Í¼Î¸ÞÆþ
-    case 1:
-        $ret = sfRound($ret);
+        $ret = round($ret);
         break;
     // ÀÚ¤ê¼Î¤Æ
@@ -1108 +1082 @@
 }
 
+/* ÀǶâÉÕÍ¿ */
+function sfPreTax($price, $tax, $tax_rule, $digit = 1) {
+    $real_tax = $tax / 100;
+    $ret = $price * (1 + $real_tax);
+    
+    switch($tax_rule) {
+    // »Í¼Î¸ÞÆþ
+    case 1:
+        $ret = round($ret);
+        break;
+    // ÀÚ¤ê¼Î¤Æ
+    case 2:
+        $ret = floor($ret);
+        break;
+    // ÀÚ¤ê¾å¤²
+    case 3:
+        $ret = ceil($ret);
+        break;
+    // ¥Ç¥Õ¥©¥ë¥È:ÀÚ¤ê¾å¤²
+    default:
+        $ret = ceil($ret);
+        break;
+    }
+    return $ret;
+}
+
 // ·å¿ô¤ò»ØÄꤷ¤Æ»Í¼Î¸ÞÆþ
 function sfRound($value, $pow = 0){
     $adjust = pow(10 ,$pow-1);
-    
-    sfprintr($value);
 
     // À°¿ô³î¤Ä0½Ð¤Ê¤±¤ì¤Ð·å¿ô»ØÄê¤ò¹Ô¤¦
@@ -1120 +1118 @@
     
     $ret = round($ret);
-    //  $ret = floor($ret/$adjust);
 
     return $ret;