Changeset 19694


Ignore:
Timestamp:
2010/11/30 14:24:27 (13 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19693
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

data/Smarty/templates/admin/basis/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fpayment.tpl
data/Smarty/templates/admin/basis/payment_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fbasis%2Fpayment_input.tpl
data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php 15298@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Payment.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php 15304@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Payment_Input.php
bzr:mapping-version:
v4
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20101130052421-f23n6phk9nuifexo
bzr:revno:
2424
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:timestamp:
2010-11-30 14:24:21.989000082 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2010-11-30T05:24:21.989000Z
Message:

#823 商品種別によってカートを分ける

  • 支払方法設定画面から配送業者の設定を削除
Location:
branches/version-2_5-dev/data
Files:
4 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment.tpl

    r18873 r19694  
    3232      <th>手数料（円）</th> 
    3333      <th>利用条件</th> 
    34       <th>配送サービス</th> 
    3534      <th>編集</th> 
    3635      <th>削除</th> 
    … …  
    4847      <td align="center"> 
    4948        <!--{if $arrPaymentListFree[cnt].rule > 0}--><!--{$arrPaymentListFree[cnt].rule|escape|number_format}--><!--{else}-->0<!--{/if}-->円 
    50         <!--{if $arrPaymentListFree[cnt].upper_rule > 0}-->～<!--{$arrPaymentListFree[cnt].upper_rule|escape|number_format}-->円<!--{elseif $arrPaymentListFree[cnt].upper_rule == "0"}--><!--{else}-->～無制限<!--{/if}--> 
    51       <td><!--{assign var=key value="`$arrPaymentListFree[cnt].deliv_id`"}--><!--{$arrDelivList[$key]|default:"未登録"}--></td> 
     49        <!--{if $arrPaymentListFree[cnt].upper_rule > 0}-->～<!--{$arrPaymentListFree[cnt].upper_rule|escape|number_format}-->円<!--{elseif $arrPaymentListFree[cnt].upper_rule == "0"}--><!--{else}-->～無制限<!--{/if}--></td> 
    5250      <td align="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="win03('./payment_input.php?mode=pre_edit&amp;payment_id=<!--{$arrPaymentListFree[cnt].payment_id}-->','payment_input','530','400'); return false;">編集</a><!--{else}-->-<!--{/if}--></td> 
    5351      <td align="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="fnModeSubmit('delete', 'payment_id', <!--{$arrPaymentListFree[cnt].payment_id}-->); return false;">削除</a><!--{else}-->-<!--{/if}--></td> 

  • branches/version-2_5-dev/data/Smarty/templates/admin/basis/payment_input.tpl

    r18873 r19694  
    7878      </tr> 
    7979      <tr> 
    80         <th>配送サービス<span class="attention"> *</span></th> 
    81         <td> 
    82           <!--{assign var=key value="deliv_id"}--> 
    83           <span class="attention"><!--{$arrErr[$key]}--></span> 
    84           <select name="deliv_id" style="<!--{$arrErr[$key]|sfGetErrorColor}-->"> 
    85           <option value="" />指定しない</option> 
    86           <!--{html_options options=$arrDelivList selected=$arrForm[$key].value}--> 
    87           </select> 
    88         </td> 
    89       </tr> 
    90       <tr> 
    9180        <th>ロゴ画像</th> 
    9281        <td> 

  • branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment.php

    r19670 r19694  
    107107    } 
    108108 
    109     // 配送業者一覧の取得 
     109    /** 
     110     * 支払方法一覧の取得. 
     111     */ 
    110112    function lfGetPaymentList() { 
    111113        $objQuery = new SC_Query(); 
    112         // 配送業者一覧の取得 
    113         $col = "payment_id, payment_method, charge, rule, upper_rule, note, deliv_id, fix, charge_flg"; 
     114        $col = "payment_id, payment_method, charge, rule, upper_rule, note, fix, charge_flg"; 
    114115        $where = "del_flg = 0"; 
    115116        $table = "dtb_payment"; 

  • branches/version-2_5-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Payment_Input.php

    r19670 r19694  
    143143        } 
    144144 
    145         $this->arrDelivList = $objDb->sfGetIDValueList("dtb_deliv", "deliv_id", "service_name"); 
    146145        $this->arrForm = $this->objFormParam->getFormParamList(); 
    147146 
    … …  
    173172        $this->objFormParam->addParam("利用条件(～円以上)", "rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK")); 
    174173        $this->objFormParam->addParam("利用条件(～円以下)", "upper_rule", PRICE_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK")); 
    175         $this->objFormParam->addParam("配送サービス", "deliv_id", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK")); 
    176174        $this->objFormParam->addParam("固定", "fix"); 
    177175    } 
Note: See TracChangeset for help on using the changeset viewer.