Index: temp/trunk/html/admin/basis/payment_input.php
===================================================================
--- temp/trunk/html/admin/basis/payment_input.php (revision 8371)
+++ temp/trunk/html/admin/basis/payment_input.php (revision 8372)
@@ -89,6 +89,4 @@
$objPage->arrDelivList = sfGetIDValueList("dtb_deliv", "deliv_id", "service_name");
$objPage->arrForm = $objFormParam->getFormParamList();
-
-sfprintr($objPage->arrForm);
// FORMɽ¼¨ÍÑÇÛÎó¤òÅϤ¹¡£
Index: temp/trunk/data/downloads/module/mdl_epsilon/mdl_epsilon.php
===================================================================
--- temp/trunk/data/downloads/module/mdl_epsilon/mdl_epsilon.php (revision 8364)
+++ temp/trunk/data/downloads/module/mdl_epsilon/mdl_epsilon.php (revision 8372)
@@ -81,4 +81,7 @@
// ¥é¥ó¥¯¤ÎºÇÂçÃͤò¼èÆÀ¤¹¤ë
$max_rank = $objQuery->getone("SELECT max(rank) FROM dtb_payment");
+
+ // »ÙʧÊýË¡¥Ç¡¼¥¿¤ò¼èÆÀ
+ $arrPaymentData = lfGetPaymentDB("AND memo03 = ?", array($val));
// ¥¯¥ì¥¸¥Ã¥È¤Ë¥Á¥§¥Ã¥¯¤¬Æþ¤Ã¤Æ¤¤¤ì¤Ð¥¯¥ì¥¸¥Ã¥È¤òÅÐÏ¿¤¹¤ë
@@ -110,10 +113,13 @@
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,5 +129,5 @@
,"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,5 +145,4 @@
// ¥Ç¡¼¥¿¤¬Â¸ºß¤·¤Æ¤¤¤ì¤Ð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 ."'");