Ignore:
Timestamp:
2012/01/17 16:03:47 (12 years ago)
Author:
Seasoft
Message:

2.12系へマイルストーン変更となったチケット分を差し戻し
r21388 #1593
r21387 #1592
r21386 #1591
r21384 #1589,#1588
r21383 #1580

Location:
branches/version-2_11-dev
Files:
8 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_11-dev/data/Smarty/templates/admin/contents/recommend.tpl

    r21388 r21400  
    141141        <!--{if $arrItems[$smarty.section.cnt.iteration].product_id}--> 
    142142        <tr><td colspan="4" class="no-border"> 
    143         <a class="btn-action" href="javascript:;" onclick="lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->); return false;"><span class="btn-next">この内容で登録する</span></a> 
     143        <a class="btn-action" href="javascript:;" onclick="return lfnCheckSubmit(document.form<!--{$smarty.section.cnt.iteration}-->);"><span class="btn-next">この内容で登録する</span></a> 
    144144        </td> 
    145145        </tr> 

  • branches/version-2_11-dev/data/Smarty/templates/sphone/cart/index.tpl

    r21383 r21400  
    123123                     </div> 
    124124                    <ul> 
    125                       <li class="quantity"><span class="mini">数量:</span><!--{$item.quantity|number_format}--></li> 
    126                       <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_plus.png" width="22" height="21" alt="＋" onclick="fnFormModeSubmit('form<!--{$key}-->', 'up','cart_no','<!--{$item.cart_no}-->'); return false" /></li> 
    127                       <li class="quantity_btn"><img src="<!--{$TPL_URLPATH}-->img/button/btn_minus.png" width="22" height="21" alt="-" onclick="fnFormModeSubmit('form<!--{$key}-->', 'down','cart_no','<!--{$item.cart_no}-->'); return false" /></a></li> 
     125                     <li><input type="number" name="quantity" class="cartin_quantity text data-role-none" value="<!--{$item.quantity}-->" max="9" style="" onchange="fnFormModeSubmit('form<!--{$key}-->', 'setQuantity','cart_no','<!--{$item.cart_no}-->');" /></li> 
    128126                      <li class="result"><span class="mini">小計：</span><!--{$item.total_inctax|number_format}-->円</li> 
    129127                    </ul> 

  • branches/version-2_11-dev/data/class/SC_Initial.php

    r21384 r21400  
    113113     */ 
    114114    function phpconfigInit() { 
     115        // E_DEPRECATED 定数 (for PHP < 5.3) 
     116        // TODO バージョン互換処理に統合したい。 
     117        $this->defineIfNotDefined('E_DEPRECATED', 8192); 
     118 
     119        // エラーレベル設定 
     120        // 開発時は E_ALL を推奨 
     121        error_reporting(E_ALL & ~E_NOTICE & ~E_DEPRECATED); 
     122 
    115123        ini_set('display_errors', '1'); 
    116124        ini_set('html_errors', '1'); 

  • branches/version-2_11-dev/data/class/SC_Product.php

    r21386 r21400  
    7474    function findProductIdsOrder(&$objQuery, $arrVal = array()) { 
    7575        $table = <<< __EOS__ 
    76             dtb_products AS alldtl 
    77             LEFT JOIN dtb_products_class 
    78                 ON alldtl.product_id = dtb_products_class.product_id 
    79             LEFT JOIN dtb_product_categories 
    80                 ON alldtl.product_id = dtb_product_categories.product_id 
     76                 dtb_products AS alldtl 
     77            JOIN dtb_products_class AS T1 
     78              ON alldtl.product_id = T1.product_id 
     79            JOIN dtb_product_categories AS T2 
     80              ON alldtl.product_id = T2.product_id 
     81            JOIN dtb_category 
     82              ON T2.category_id = dtb_category.category_id 
    8183__EOS__; 
    8284        $objQuery->setGroupBy('alldtl.product_id'); 
    … …  
    117119    function findProductCount(&$objQuery, $arrVal = array()) { 
    118120        $table = <<< __EOS__ 
    119             dtb_products AS alldtl 
    120             LEFT JOIN dtb_products_class 
    121                 ON alldtl.product_id = dtb_products_class.product_id 
    122             LEFT JOIN dtb_product_categories 
    123                 ON alldtl.product_id = dtb_product_categories.product_id 
     121                 dtb_products AS alldtl 
     122            JOIN dtb_product_categories AS T2 
     123              ON alldtl.product_id = T2.product_id 
     124            JOIN dtb_category 
     125              ON T2.category_id = dtb_category.category_id 
    124126__EOS__; 
    125127        $objQuery->setGroupBy('alldtl.product_id'); 

  • branches/version-2_11-dev/data/class/pages/products/LC_Page_Products_List.php

    r21386 r21400  
    425425 
    426426        if (strlen($searchCondition["where_category"]) >= 1) { 
    427             $searchCondition['where'] .= " AND dtb_product_categories.".$searchCondition["where_category"]; 
     427            $searchCondition['where'] .= " AND T2.".$searchCondition["where_category"]; 
    428428            $searchCondition['arrval'] = array_merge($searchCondition['arrval'], $searchCondition['arrvalCategory']); 
    429429        } 

  • branches/version-2_11-dev/html/handle_error.php

    r21384 r21400  
    2424ob_start('_fatal_error_handler'); 
    2525 
    26 // E_DEPRECATED 定数 (for PHP < 5.3) 
    27 // TODO バージョン互換処理に統合したい。 
    28 if (!defined('E_DEPRECATED')) { 
    29     define('E_DEPRECATED', 8192); 
    30 } 
    31  
    32 // エラーレベル設定 
    33 // 開発時は E_ALL を推奨 
    34 error_reporting(E_ALL & ~E_NOTICE & ~E_USER_NOTICE & ~E_DEPRECATED); 
    35  
    3626// E_USER_ERROR を捕捉した場合にエラー画面を表示させるためのエラーハンドラ 
    37 set_error_handler('handle_error', error_reporting()); 
     27set_error_handler('handle_error'); 
    3828 
    3929/** 
    … …  
    7363 * trigger_error にて E_USER_ERROR が生成されると, エラーログを出力した後, 
    7464 * エラー画面を表示させる. 
    75  * E_WARNING, E_USER_WARNING が発生した場合、ログを記録して、true を返す。 
    76  * (エラー画面・エラー文言は表示させない。) 
     65 * 
     66 * E_USER_ERROR 以外のエラーが生成された場合, この関数は true を返す. 
    7767 * 
    7868 * @param integer $errno エラーコード 
    … …  
    8171 * @param integer $errline エラーが発生した行番号 
    8272 * @return void|boolean E_USER_ERROR が発生した場合は, エラーページへリダイレクト; 
    83  *                      E_WARNING, E_USER_WARNING が発生した場合、true を返す 
     73 *                      E_USER_ERROR 以外の場合は true 
    8474 */ 
    8575function handle_error($errno, $errstr, $errfile, $errline) { 
    86  
    87     // error_reporting 設定に含まれていないエラーコードは処理しない 
    88     if (!(error_reporting() & $errno)) { 
    89         return; 
    90     } 
    91  
    9276    $now = date("Y/m/d H:i:s"); 
    9377    switch ($errno) { 
    94         case E_USER_ERROR: 
    95             error_log($now . " [$errfile] FATAL Error($errno) $errfile:$errline $errstr from ". $_SERVER['REMOTE_ADDR'] . "\n", 3, realpath(dirname(__FILE__) . "/" . HTML2DATA_DIR . "logs/site.log")); 
     78    case E_USER_ERROR: 
     79        error_log($now . " [$errfile] FATAL Error($errno) $errfile:$errline $errstr from ". $_SERVER['REMOTE_ADDR'] . "\n", 3, realpath(dirname(__FILE__) . "/" . HTML2DATA_DIR . "logs/site.log")); 
    9680 
    97             displaySystemError($errstr); 
    98             exit(1); 
    99             break; 
     81        displaySystemError($errstr); 
     82        exit(1); 
     83        break; 
    10084 
    101         case E_WARNING: 
    102         case E_USER_WARNING: 
    103             error_log($now . " [$errfile] WARNING($errno) $errfile:$errline $errstr from ". $_SERVER['REMOTE_ADDR'] . "\n", 3, realpath(dirname(__FILE__) . "/" . HTML2DATA_DIR . "logs/site.log")); 
    104             return true; 
    105             break; 
    106  
    107         default: 
     85    case E_USER_WARNING: 
     86    case E_USER_NOTICE: 
     87    default: 
    10888    } 
     89    return true; 
    10990} 
    11091 

  • branches/version-2_11-dev/html/install/sql/insert_data.sql

    r21387 r21400  
    246246INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (10, 1, '(SELECT name as maker_name FROM dtb_maker WHERE prdcls.maker_id = dtb_maker.maker_id) as maker_name', 'メーカー名', 10, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK'); 
    247247INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (11, 1, 'name', '商品名', 11, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK'); 
    248 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (12, 1, 'status', '表示ステータス(公開・非公開)', 12, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK'); 
     248INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (12, 1, 'status', '表示ステータス(公開・非公開)', 12, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK'); 
    249249INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (13, 1, 'comment1', 'メーカーURL(コメント1)', 13, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'URL_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,URL_CHECK'); 
    250250INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (14, 1, 'comment2', 'コメント2', 14, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LLTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK'); 
    … …  
    282282INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (45, 1, 'deliv_date_id', '発送日目安ID', 45, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK'); 
    283283INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (46, 1, 'del_flg', '削除フラグ', 46, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK'); 
    284 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (47, 1, 'product_type_id', '商品種別ID', 47, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK'); 
     284INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (47, 1, 'product_type_id', '商品種別ID', 47, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK'); 
    285285INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (48, 1, 'product_code', '商品コード', 48, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK'); 
    286286INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (49, 1, 'stock', '在庫数', 49, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'AMOUNT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK'); 
    287 INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (50, 1, 'stock_unlimited', '在庫無制限フラグ', 50, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK'); 
     287INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (50, 1, 'stock_unlimited', '在庫無制限フラグ', 50, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK'); 
    288288INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (51, 1, 'sale_limit', '販売制限数', 51, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'AMOUNT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK'); 
    289289INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option, size_const_type, error_check_types) VALUES (52, 1, 'price01', '通常価格', 52, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK'); 

  • branches/version-2_11-dev/html/user_data/packages/sphone/css/contents.css

    r21383 r21400  
    222222float:left; 
    223223} 
    224 .cartinContents ul li.quantity{ 
     224.cartinContents ul li.result{ 
    225225padding-left:0.5em; 
    226 padding-top:1em; 
    227 vertical-align:bottom; 
    228 } 
    229 .cartinContents ul li.quantity_btn{ 
    230 padding-left:0.5em; 
    231 padding-top:0.8em; 
    232 vertical-align:bottom; 
    233 } 
    234 .cartinContents ul li.result{ 
    235 padding-left:1.5em; 
    236226padding-top:1em; 
    237227vertical-align:bottom; 
Note: See TracChangeset for help on using the changeset viewer.