Changeset 23541


Ignore:
Timestamp:
2014/06/11 13:17:28 (12 years ago)
Author:
h_yoshimoto
Message:

#2578 version-2_13_2の内容をdevにmerge

Location:
branches/version-2_13-dev
Files:
3 edited

Legend:

Unmodified
Added
Removed

  • branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl

    r23230 r23541  
    240240            <dt>生年月日</dt> 
    241241            <dd> 
    242                 <!--{assign var=errBirth value="`$arrErr.year``$arrErr.month``$arrErr.day`"}--> 
     242                <!--{assign var=key1 value="order_year"}--> 
     243                <!--{assign var=key2 value="order_month"}--> 
     244                <!--{assign var=key3 value="order_day"}--> 
     245                <!--{assign var=errBirth value="`$arrErr.$key1``$arrErr.$key2``$arrErr.$key3`"}--> 
     246                <!--{if $errBirth}--> 
    243247                <div class="attention"><!--{$errBirth}--></div> 
    244                 <select name="year" style="<!--{$errBirth|sfGetErrorColor}-->" class="boxShort data-role-none"> 
    245                     <!--{html_options options=$arrYear selected=$arrForm.year.value|default:''}--> 
     248                <!--{/if}--> 
     249                <select name="<!--{$key1}-->" style="<!--{$errBirth|sfGetErrorColor}-->" class="boxShort data-role-none"> 
     250                    <!--{html_options options=$arrYear selected=$arrForm[$key1].value|default:''}--> 
    246251                </select><span class="selectdate">年</span> 
    247252 
    248                 <select name="month" style="<!--{$errBirth|sfGetErrorColor}-->" class="boxShort data-role-none"> 
    249                     <!--{html_options options=$arrMonth selected=$arrForm.month.value|default:''}--> 
     253                <select name="<!--{$key2}-->" style="<!--{$errBirth|sfGetErrorColor}-->" class="boxShort data-role-none"> 
     254                    <!--{html_options options=$arrMonth selected=$arrForm[$key2].value|default:''}--> 
    250255                </select><span class="selectdate">月</span> 
    251256 
    252                 <select name="day" style="<!--{$errBirth|sfGetErrorColor}-->" class="boxShort data-role-none"> 
    253                     <!--{html_options options=$arrDay selected=$arrForm.day.value|default:''}--> 
     257                <select name="<!--{$key3}-->" style="<!--{$errBirth|sfGetErrorColor}-->" class="boxShort data-role-none"> 
     258                    <!--{html_options options=$arrDay selected=$arrForm[$key3].value|default:''}--> 
    254259                </select><span class="selectdate">日</span> 
    255260            </dd> 

  • branches/version-2_13-dev/html/install/sql/create_table_mysql.sql

    r23374 r23541  
    12321232    product_class_id int NOT NULL DEFAULT 0, 
    12331233    calc_rule smallint NOT NULL DEFAULT 1, 
    1234     tax_rate numeric NOT NULL DEFAULT 5, 
     1234    tax_rate numeric NOT NULL DEFAULT 8, 
    12351235    tax_adjust numeric NOT NULL DEFAULT 0, 
    12361236    apply_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 

  • branches/version-2_13-dev/html/install/sql/create_table_pgsql.sql

    r23475 r23541  
    12251225    product_class_id int NOT NULL DEFAULT 0, 
    12261226    calc_rule smallint NOT NULL DEFAULT 1, 
    1227     tax_rate numeric NOT NULL DEFAULT 5, 
     1227    tax_rate numeric NOT NULL DEFAULT 8, 
    12281228    tax_adjust numeric NOT NULL DEFAULT 0, 
    12291229    apply_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
Note: See TracChangeset for help on using the changeset viewer.