Changeset 18075


Ignore:
Timestamp:
2009/06/09 19:43:22 (15 years ago)
Author:
Seasoft
Message:

merge r17951
・取得元: version-2_4
【取得元のログメッセージ】

  • #292 order用に別途、商品検索、登録機能を追加。
Location:
branches/comu-ver2/data
Files:
3 edited

Legend:

Unmodified
Added
Removed
  • branches/comu-ver2/data/Smarty/templates/default/admin/order/edit.tpl

    r18068 r18075  
    289289        <a name="order_products">受注商品情報</a> 
    290290        <input type="button" name="cheek" value="計算結果の確認" onclick="fnModeSubmit('cheek','anchor_key','order_products');" /> 
    291         <input type="button" name="add_product" value="商品の追加" onclick="win03('./product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " /> 
     291        <input type="button" name="add_product" value="商品の追加" onclick="win03('<!--{$smarty.const.SITE_URL}-->admin/order/product_select.php<!--{if $tpl_order_id}-->?order_id=<!--{$tpl_order_id}--><!--{/if}-->', 'search', '500', '500'); " /> 
    292292    </h2> 
    293293    <!--{if $arrErr.product_id || $arrErr.quantity || $arrErr.price}--> 
  • branches/comu-ver2/data/Smarty/templates/default/admin/order/product_select.tpl

    r17967 r18075  
    2828self.moveTo(20,20);self.focus(); 
    2929 
    30 function func_submit(product_id, class_name1, class_name2){ 
     30function func_submit(product_id, class_name1, class_name2) { 
    3131  var err_text = ''; 
    3232  var fm = window.opener.document.form1; 
     
    7272  fm.submit(); 
    7373  window.close(); 
     74 
    7475  return true; 
    7576} 
     
    106107//]]> 
    107108</script> 
     109 
    108110 
    109111<script type="text/javascript">//<![CDATA[ 
     
    175177    <td> 
    176178      <!--{$arrProducts[cnt].name|escape}--> 
     179 
    177180      <!--{assign var=class1 value=classcategory_id`$id`_1}--> 
    178181      <!--{assign var=class2 value=classcategory_id`$id`_2}--> 
     
    205208      <!--{/if}--> 
    206209    </td> 
    207     <td class="center"><a href="" onClick="return func_submit('<!--{$arrProducts[cnt].product_id}-->', '<!--{$tpl_class_name1[$id]}-->', '<!--{$tpl_class_name2[$id]}-->')">決定</a></td> 
     210    <td class="center"><a href="" onclick="return func_submit('<!--{$arrProducts[cnt].product_id}-->', '<!--{$tpl_class_name1[$id]}-->', '<!--{$tpl_class_name2[$id]}-->')">決定</a></td> 
    208211  </tr> 
    209212  <!--▲商品<!--{$smarty.section.cnt.iteration}-->--> 
  • branches/comu-ver2/data/class/pages/admin/order/LC_Page_Admin_Order_ProductSelect.php

    r17293 r18075  
    4545        parent::init(); 
    4646        $this->tpl_mainpage = 'order/product_select.tpl'; 
    47         $this->tpl_mainno = 'products'; 
     47        $this->tpl_mainno = 'order'; 
    4848        $this->tpl_subnavi = ''; 
    4949        $this->tpl_subno = ""; 
     
    6767 
    6868        if (!isset($_POST['mode'])) $_POST['mode'] = ""; 
     69 
    6970        if ($_GET['no'] != '') { 
    7071            $this->tpl_no = strval($_GET['no']); 
     
    9091                switch ($key) { 
    9192                case 'search_name': 
    92                     $where .= " AND name LIKE ?"; 
     93                    $where .= " AND name ILIKE ?"; 
    9394                    $arrval[] = "%$val%"; 
    9495                    break; 
     
    109110            } 
    110111 
    111  
    112 /************ 
    113             if (!empty($_GET['order_id'])) { 
    114                 $arrOrderDetails = $objQuery->select('product_id', 'dtb_order_detail', 'order_id = ?', array($_GET['order_id'])); 
    115                 $tmp_where = ''; 
    116                 foreach ($arrOrderDetails AS $key=>$val) { 
    117                     if($tmp_where == "") { 
    118                         $tmp_where.= " product_id NOT IN ( ?"; 
    119                     } else { 
    120                         $tmp_where.= ",? "; 
    121                     } 
    122                     $arrval[] = $val['product_id']; 
    123                 } 
    124                 $tmp_where.= " ) "; 
    125                 $where .= " AND " .$tmp_where; 
    126             } 
    127 ************/ 
    128  
    129112            // 読み込む列とテーブルの指定 
    130             #$col = "product_id, name, category_id, main_list_image, status, product_code, price01, price02, stock, stock_unlimited, point_rate, classcategory_id1, classcategory_id2, (SELECT name FROM dtb_classcategory WHERE classcategory_id = classcategory_id1) AS classcategory_name1, (SELECT name FROM dtb_classcategory WHERE classcategory_id = classcategory_id2) AS classcategory_name2"; 
    131             #$from = "vw_products_nonclass AS noncls "; 
    132             #$order = "update_date DESC, product_id DESC "; 
    133  
    134113            $col = "DISTINCT T1.product_id, product_code_min, product_code_max," 
    135114                . " price01_min, price01_max, price02_min, price02_max," 
     
    183162            // 規格名一覧 
    184163            $arrClassName = $objDb->sfGetIDValueList("dtb_class", "class_id", "name"); 
     164 
    185165            // 規格分類名一覧 
    186166            $arrClassCatName = $objDb->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name"); 
     167 
    187168            // 規格セレクトボックス設定 
    188169            for($i = 0; $i < count($this->arrProducts); $i++) { 
     
    387368        } 
    388369    } 
    389  
    390  
    391370} 
    392371?> 
Note: See TracChangeset for help on using the changeset viewer.