Ignore:
Timestamp:
2012/05/07 01:27:10 (12 years ago)
Author:
nanasess
bzr:base-revision:
nanasess@fsm.ne.jp-20120506152147-ax0qre64rxi2o56m
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.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/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/basis/LC_Page_Admin_Basis.php 15291@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis.php
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_PaymentInput.php 20543@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_PaymentInput.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php 15307@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_Point.php
data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php 15335@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Fbasis%2FLC_Page_Admin_Basis_ZipInstall.php
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
html/install/index.php 16809@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Findex.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
bzr:mapping-version:
v4
bzr:merge:

nanasess@fsm.ne.jp-20120506162631-s0q2vyyi2v6an6xu
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20120506162703-jf1842vihihlkmfc
bzr:revno:
4478
bzr:revprop:branch-nick:
branches/version-2_12-dev
bzr:root:
branches/version-2_12-dev
bzr:testament:

bazaar-ng testament short form 2.1
revision-id: nanasess@fsm.ne.jp-20120506162703-jf1842vihihlkmfc
sha1: e2d8362ad9c1bb23909d8cd1f8c0b43ca798206b
bzr:timestamp:
2012-05-07 01:27:03.698999882 +0900
bzr:user-agent:
bzr2.4.2+bzr-svn1.1.2
Message:

#1573 プライマリーキーが無いテーブルの改善

  • dtb_baseinfo, mtb_zip にはプライマリーキーとなるカラムを追加

#800 SQL標準に準拠する

  • rule -> rule_max
Location:
branches/version-2_12-dev/data
Files:
9 edited

Legend:

Unmodified
Added
Removed

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

    r21539 r21810  
    6161            <!--{/if}--> 
    6262            <td class="center"> 
    63                 <!--{if $arrPaymentListFree[cnt].rule > 0}--><!--{$arrPaymentListFree[cnt].rule|number_format|h}--><!--{else}-->0<!--{/if}-->円 
     63                <!--{if $arrPaymentListFree[cnt].rule_max > 0}--><!--{$arrPaymentListFree[cnt].rule_max|number_format|h}--><!--{else}-->0<!--{/if}-->円 
    6464                <!--{if $arrPaymentListFree[cnt].upper_rule > 0}-->～<!--{$arrPaymentListFree[cnt].upper_rule|number_format|h}-->円<!--{elseif $arrPaymentListFree[cnt].upper_rule == "0"}--><!--{else}-->～無制限<!--{/if}--></td> 
    6565            <td class="center"><!--{if $arrPaymentListFree[cnt].fix != 1}--><a href="?" onclick="fnChangeAction('./payment_input.php'); fnModeSubmit('pre_edit', 'payment_id', <!--{$arrPaymentListFree[cnt].payment_id}-->); return false;">編集</a><!--{else}-->-<!--{/if}--></td> 

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

    r21539 r21810  
    6363                <th>利用条件(円)</th> 
    6464                <td> 
    65                     <!--{assign var=key_from value="rule"}--> 
     65                    <!--{assign var=key_from value="rule_max"}--> 
    6666                    <!--{assign var=key_to value="upper_rule"}--> 
    6767                    <span class="attention"><!--{$arrErr[$key_from]}--></span> 

  • branches/version-2_12-dev/data/class/helper/SC_Helper_Purchase.php

    r21664 r21810  
    540540        $where = 'del_flg = 0 AND payment_id IN (' . SC_Utils_Ex::repeatStrWithSeparator('?', count($arrPaymentIds)) . ')'; 
    541541        $objQuery->setOrder('rank DESC'); 
    542         $payments = $objQuery->select('payment_id, payment_method, rule, upper_rule, note, payment_image, charge', 'dtb_payment', $where, $arrPaymentIds); 
     542        $payments = $objQuery->select('payment_id, payment_method, rule_max, upper_rule, note, payment_image, charge', 'dtb_payment', $where, $arrPaymentIds); 
    543543        foreach ($payments as $data) { 
    544544            // 下限と上限が設定されている 
    545             if (strlen($data['rule']) != 0 && strlen($data['upper_rule']) != 0) { 
    546                 if ($data['rule'] <= $total && $data['upper_rule'] >= $total) { 
     545            if (strlen($data['rule_max']) != 0 && strlen($data['upper_rule']) != 0) { 
     546                if ($data['rule_max'] <= $total && $data['upper_rule'] >= $total) { 
    547547                    $arrPayment[] = $data; 
    548548                } 
    549549            } 
    550550            // 下限のみ設定されている 
    551             elseif (strlen($data['rule']) != 0) { 
    552                 if ($data['rule'] <= $total) { 
     551            elseif (strlen($data['rule_max']) != 0) { 
     552                if ($data['rule_max'] <= $total) { 
    553553                    $arrPayment[] = $data; 
    554554                } 

  • branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis.php

    r21743 r21810  
    204204            $sqlval[$val] = $array[$val]; 
    205205        } 
     206        $sqlval['id'] = 1; 
    206207        $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; 
    207208        // INSERTの実行 

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

    r21743 r21810  
    126126    function lfGetPaymentList() { 
    127127        $objQuery =& SC_Query_Ex::getSingletonInstance(); 
    128         $col = 'payment_id, payment_method, charge, rule, upper_rule, note, fix, charge_flg'; 
     128        $col = 'payment_id, payment_method, charge, rule_max, upper_rule, note, fix, charge_flg'; 
    129129        $where = 'del_flg = 0'; 
    130130        $table = 'dtb_payment'; 

  • branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_PaymentInput.php

    r21743 r21810  
    131131                    $objFormParam->addParam('支払方法', 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
    132132                    $objFormParam->addParam('手数料', 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    133                     $objFormParam->addParam('利用条件(～円以上)', 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
     133                    $objFormParam->addParam('利用条件(～円以上)', 'rule_max', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    134134                    $objFormParam->addParam('利用条件(～円以下)', 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    135135                    $objFormParam->addParam('固定', 'fix'); 
    … …  
    176176                $objFormParam->addParam('支払方法', 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
    177177                $objFormParam->addParam('手数料', 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    178                 $objFormParam->addParam('利用条件(～円以上)', 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
     178                $objFormParam->addParam('利用条件(～円以上)', 'rule_max', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    179179                $objFormParam->addParam('利用条件(～円以下)', 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    180180                $objFormParam->addParam('固定', 'fix'); 
    … …  
    188188                $objFormParam->addParam('支払方法', 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
    189189                $objFormParam->addParam('手数料', 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    190                 $objFormParam->addParam('利用条件(～円以上)', 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
     190                $objFormParam->addParam('利用条件(～円以上)', 'rule_max', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    191191                $objFormParam->addParam('利用条件(～円以下)', 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    192192                $objFormParam->addParam('固定', 'fix'); 
    … …  
    202202                $objFormParam->addParam('支払方法', 'payment_method', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'MAX_LENGTH_CHECK')); 
    203203                $objFormParam->addParam('手数料', 'charge', PRICE_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    204                 $objFormParam->addParam('利用条件(～円以上)', 'rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
     204                $objFormParam->addParam('利用条件(～円以上)', 'rule_max', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    205205                $objFormParam->addParam('利用条件(～円以下)', 'upper_rule', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    206206                $objFormParam->addParam('固定', 'fix'); 
    … …  
    265265 
    266266        // 利用条件(下限)チェック 
    267         if ($arrRet['rule'] < $arrPaymentData['rule_min'] and $arrPaymentData['rule_min'] != '') { 
     267        if ($arrRet['rule_max'] < $arrPaymentData['rule_min'] and $arrPaymentData['rule_min'] != '') { 
    268268            $objErr->arrErr['rule'] = '利用条件(下限)は' . $arrPaymentData['rule_min'] .'円以上にしてください。<br>'; 
    269269        } 
    … …  
    275275 
    276276        // 利用条件チェック 
    277         $objErr->doFunc(array('利用条件(～円以上)', '利用条件(～円以下)', 'rule', 'upper_rule'), array('GREATER_CHECK')); 
     277        $objErr->doFunc(array('利用条件(～円以上)', '利用条件(～円以下)', 'rule_max', 'upper_rule'), array('GREATER_CHECK')); 
    278278 
    279279        return $objErr->arrErr; 

  • branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Point.php

    r21743 r21810  
    138138        // 入力データを渡す。 
    139139        $sqlval = $post; 
     140        $sqlval['id'] = 1; 
    140141        $sqlval['update_date'] = 'CURRENT_TIMESTAMP'; 
    141142        $objQuery =& SC_Query_Ex::getSingletonInstance(); 

  • branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_ZipInstall.php

    r21743 r21810  
    243243            if ($cntCurrentLine >= $start) { 
    244244                $sqlval = array(); 
     245                $sqlval['zip_id'] = $cntInsert; 
    245246                $sqlval['zipcode'] = $arrCSV[2]; 
    246247                $sqlval['state'] = $arrCSV[6]; 

  • branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

    r21743 r21810  
    328328            // ポイント差し引き後の決済方法チェック 
    329329            $arrPayments = $objPurchase->getPaymentsByPaymentsId($arrForm['payment_id']); 
    330             if ($arrPayments['rule'] > $subtotal - $arrForm['use_point'] * POINT_VALUE) { 
    331                 $objErr->arrErr['use_point'] = '※ 選択した支払方法では、ポイントは'.($subtotal - $arrPayments['rule']).'ポイントまでご利用いただけます。<br>'; 
     330            if ($arrPayments['rule_max'] > $subtotal - $arrForm['use_point'] * POINT_VALUE) { 
     331                $objErr->arrErr['use_point'] = '※ 選択した支払方法では、ポイントは'.($subtotal - $arrPayments['rule_max']).'ポイントまでご利用いただけます。<br>'; 
    332332            } 
    333333        } 
Note: See TracChangeset for help on using the changeset viewer.