Changeset 8372 for temp/trunk

Timestamp:

2006/11/16 14:03:43 (20 years ago)

Author:

kakinaka

Message:

blank

Location:

temp/trunk

Files:

• data/downloads/module/mdl_epsilon/mdl_epsilon.php (modified) (4 diffs)
• html/admin/basis/payment_input.php (modified) (1 diff)

temp/trunk/data/downloads/module/mdl_epsilon/mdl_epsilon.php

@@ -81 +81 @@
             // ¥é¥ó¥¯¤ÎºÇÂçÃͤò¼èÆÀ¤¹¤ë
             $max_rank = $objQuery->getone("SELECT max(rank) FROM dtb_payment");
+
+            // »ÙʧÊýË¡¥Ç¡¼¥¿¤ò¼èÆÀ         
+            $arrPaymentData = lfGetPaymentDB("AND memo03 = ?", array($val));
             
             // ¥¯¥ì¥¸¥Ã¥È¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ì¤Ð¥¯¥ì¥¸¥Ã¥È¤òÅÐÏ¿¤¹¤ë
@@ -110 +113 @@
             if($val == 2){
                 
-                // ¥»¥Ö¥ó¥¤¥ì¥Ö¥ó¤Î¤ß¤Î¾ì¹ç¤Ë¤ÏÍøÍѾå¸Â¤ò30Ëü¤Ë¤¹¤ë¡£
-                (count($_POST["convenience"]) == 1 and $_POST["convenience"][0] == 11) ? $upper_rule_max = "300000" : $upper_rule_max = "500000";
+                // ¥»¥Ö¥ó¥¤¥ì¥Ö¥ó¤Î¤ßÁªÂò¤·¤¿¾ì¹ç¤Ë¤ÏÍøÍѾå¸Â¤ò30Ëü¤Ë¤¹¤ë¡£
+                if(count($_POST["convenience"]) == 1 and $_POST["convenience"][0] == 11) {
+                    $upper_rule_max = "300000";
+                    
+                    ($arrPaymentData["upper_rule"] > $upper_rule_max) ? $upper_rule = $upper_rule_max : $upper_rule = $arrPaymentData["upper_rule"];
+                }else{
+                    $upper_rule_max = "500000";
+                }
                 
-                sfprintr(count($_POST["convenience"]));
-                sfprintr($_POST["convenience"]);
-                sfprintr($upper_rule_max);
                 
                 $arrData = array(
@@ -123 +129 @@
                     ,"create_date" => "now()"
                     ,"update_date" => "now()"
-                    ,"upper_rule" => 500000
+                    ,"upper_rule" => $upper_rule
                     ,"module_id" => MDL_EPSILON_ID
                     ,"module_path" => MODULE_PATH . "mdl_epsilon/convenience.php"
@@ -139 +145 @@
             
             // ¥Ç¡¼¥¿¤¬Â¸ºß¤·¤Æ¤¤¤ì¤ÐUPDATE¡¢Ìµ¤±¤ì¤ÐINSERT
-            $arrPaymentData = lfGetPaymentDB("AND memo03 = ?", array($val));
             if(count($arrPaymentData) > 0){
                 $objQuery->update("dtb_payment", $arrData, " module_id = '" . MDL_EPSILON_ID . "' AND memo03 = '" . $val ."'");

temp/trunk/html/admin/basis/payment_input.php

@@ -89 +89 @@
 $objPage->arrDelivList = sfGetIDValueList("dtb_deliv", "deliv_id", "service_name");
 $objPage->arrForm = $objFormParam->getFormParamList();
-
-sfprintr($objPage->arrForm);
 
 // FORMɽ¼¨ÍÑÇÛÎó¤òÅϤ¹¡£