Changeset 8376 for temp/trunk


Ignore:
Timestamp:
2006/11/16 14:11:07 (20 years ago)
Author:
kakinaka
Message:

blank

Location:
temp/trunk
Files:
3 edited

Legend:

Unmodified
Added
Removed

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

    r8375 r8376  
    116116                if(count($_POST["convenience"]) == 1 and $_POST["convenience"][0] == 11) { 
    117117                    $upper_rule_max = "300000"; 
    118                     ($arrPaymentData["upper_rule"] > $upper_rule_max) ? $upper_rule = $upper_rule_max : $upper_rule = $arrPaymentData["upper_rule"]; 
     118                    ($arrPaymentData["upper_rule"] > $upper_rule_max or $arrPaymentData["upper_rule"] == "") ? $upper_rule = $upper_rule_max : $upper_rule = $arrPaymentData["upper_rule"]; 
    119119                }else{ 
    120120                    $upper_rule_max = "500000"; 
    121121                    $upper_rule = $upper_rule_max; 
    122122                } 
    123                  
    124                 sfprintr($arrPaymentData["upper_rule"]); 
    125123                 
    126124                $arrData = array( 

  • temp/trunk/html/admin/basis/payment.php

    r7302 r8376  
    5555    $objQuery = new SC_Query(); 
    5656    // ÇÛÁ÷¶È¼Ô°ìÍ÷¤Î¼èÆÀ 
    57     $col = "payment_id, payment_method, charge, rule, upper_rule, note, deliv_id, fix"; 
     57    $col = "payment_id, payment_method, charge, rule, upper_rule, note, deliv_id, fix, charge_flg"; 
    5858    $where = "del_flg = 0"; 
    5959//  $where .= " AND fix = ?"; 
Note: See TracChangeset for help on using the changeset viewer.