[Svn-src-all:4316] [version-2_13-dev 23230] #2363 r23177, r23181 - r23186, r23188 - r23191, r23194, r23197, r23199 - r23218, r23220, r23223 - r23225 をマージ
m_uehara
admin ＠ mail.ec-cube.net
2013年 9月 19日 (木) 11:49:04 JST
Subversion committed to /home/svn/open 23230
http://svn.ec-cube.net/open_trac/changeset/23230
┌────────────────────────────┐
│更新者 : m_uehara │
│更新日時: 2013-09-19 11:49:03 +0900 (木, 19 9月 2013)│
└────────────────────────────┘
Log:
--------------------------------------------------------
#2363 r23177, r23181 - r23186, r23188 - r23191, r23194, r23197, r23199 - r23218, r23220, r23223 - r23225 をマージ
Changed: [U:修正，A:追加，D:削除]
--------------------------------------------------------
U branches/version-2_13-dev/data/Smarty/templates/admin/admin_popup_header.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/basis/holiday.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/basis/subnavi.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/basis/tradelaw.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/contents/recommend.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/customer/edit.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/login_frame.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/order/product_select.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/products/category.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/products/class.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/products/classcategory.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/products/maker.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/products/product.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/products/product_class.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl
U branches/version-2_13-dev/data/Smarty/templates/admin/system/input.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/popup_header.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl
U branches/version-2_13-dev/data/Smarty/templates/default/site_frame.tpl
U branches/version-2_13-dev/data/Smarty/templates/mobile/entry/confirm.tpl
U branches/version-2_13-dev/data/Smarty/templates/mobile/entry/index.tpl
U branches/version-2_13-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
U branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/change.tpl
U branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl
U branches/version-2_13-dev/data/Smarty/templates/mobile/shopping/confirm.tpl
U branches/version-2_13-dev/data/Smarty/templates/mobile/shopping/multiple.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/favorite.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/index.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/popup_header.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/multiple.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
U branches/version-2_13-dev/data/Smarty/templates/sphone/site_frame.tpl
U branches/version-2_13-dev/data/class/SC_Product.php
U branches/version-2_13-dev/data/class/api/SC_Api_Operation.php
U branches/version-2_13-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
U branches/version-2_13-dev/data/class/helper/SC_Helper_Customer.php
U branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php
U branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php
U branches/version-2_13-dev/data/class/helper/SC_Helper_PageLayout.php
U branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php
U branches/version-2_13-dev/data/class/helper/SC_Helper_TaxRule.php
U branches/version-2_13-dev/data/class/pages/LC_Page_Index.php
U branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php
U branches/version-2_13-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
U branches/version-2_13-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
U branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
U branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
U branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
U branches/version-2_13-dev/data/class/pages/cart/LC_Page_Cart.php
U branches/version-2_13-dev/data/class/pages/entry/LC_Page_Entry.php
U branches/version-2_13-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
U branches/version-2_13-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
U branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage.php
U branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
U branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
U branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php
U branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
U branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php
U branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php
U branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php
U branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
U branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
U branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
U branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
U branches/version-2_13-dev/data/class/plugin/SC_Plugin_Installer.php
U branches/version-2_13-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tax_Ex.php
U branches/version-2_13-dev/data/mtb_constants_init.php
U branches/version-2_13-dev/html/install/sql/insert_data.sql
U branches/version-2_13-dev/html/user_data/packages/admin/js/eccube.admin.js
変更: branches/version-2_13-dev/data/Smarty/templates/admin/admin_popup_header.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/admin_popup_header.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/admin_popup_header.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -35,6 +35,7 @@
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.js"></script>
+<!-- #2342 次期メジャーバージョン(2.14)にてeccube.legacy.js,eccube.admin.legacy.jsは削除予定.モジュール、プラグインの互換性を考慮して2.13では残します. -->
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script>
<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.legacy.js"></script>
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/jquery.colorbox-min.js"></script>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/basis/delivery_input.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/basis/delivery_input.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/basis/delivery_input.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -93,7 +93,12 @@
<table>
<tr>
<th>商品種別</th>
- <td><span class="attention"><!--{$arrErr[$key]}--></span><!--{html_radios name=$key options=$arrProductType selected=$arrForm[$key].value separator=' '}--></td>
+ <td>
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <span style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
+ <!--{html_radios name=$key options=$arrProductType selected=$arrForm[$key].value separator=' '}-->
+ </span>
+ </td>
</tr>
</table>
@@ -104,7 +109,9 @@
<th>支払方法</th>
<td>
<span class="attention"><!--{$arrErr[$key]}--></span>
+ <span style="<!--{$arrErr[$key]|sfGetErrorColor}-->">
<!--{html_checkboxes name=$key options=$arrPayments selected=$arrForm[$key].value separator=' '}-->
+ </span>
</td>
</tr>
</table>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/basis/holiday.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/basis/holiday.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/basis/holiday.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -33,7 +33,7 @@
<th>タイトル<span class="attention"> *</span></th>
<td>
<!--{if $arrErr.title}--><span class="attention"><!--{$arrErr.title}--></span><!--{/if}-->
- <input type="text" name="title" value="<!--{$arrForm.title.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+ <input type="text" name="title" value="<!--{$arrForm.title.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="<!--{$arrErr.title|sfGetErrorColor}-->" size="60" class="box60"/>
<span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
</td>
</tr>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/basis/subnavi.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/basis/subnavi.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/basis/subnavi.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -32,5 +32,5 @@
<li<!--{if $tpl_subno == 'kiyaku'}--> class="on"<!--{/if}--> id="navi-basis-kiyaku"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/kiyaku.php"><span>会員規約設定</span></a></li>
<li<!--{if $tpl_subno == 'zip_install'}--> class="on"<!--{/if}--> id="navi-basis-zip"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/zip_install.php"><span>郵便番号DB登録</span></a></li>
<li<!--{if $tpl_subno == 'holiday'}--> class="on"<!--{/if}--> id="navi-basis-holiday"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/holiday.php"><span>定休日管理</span></a></li>
-<li<!--{if $tpl_subno == 'tax'}--> class="on"<!--{/if}--> id="navi-basis-tax"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/tax.php"><span>税金設定</span></a></li>
+<li<!--{if $tpl_subno == 'tax'}--> class="on"<!--{/if}--> id="navi-basis-tax"><a href="<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->basis/tax.php"><span>税率設定</span></a></li>
</ul>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/basis/tax.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -6,14 +6,16 @@
<div id="basis" class="contents-main">
<!--{* 軽減税率対応 軽減税率が無いとなれば、税率設定より下に移動しても良いかと思います。 *}-->
-<h2>税金共通設定</h2>
+<h2>個別税率設定</h2>
<table id="basis-tax-func">
<tr>
- <th>商品個別 税率設定機能(軽減税率機能)<span class="attention"> *</span></th>
+ <th>商品別税率機能<span class="attention"> *</span></th>
<td>
<span class="attention"><!--{$arrErr.product_tax_flg}--></span>
+ <span style="<!--{$arrErr.product_tax_flg|sfGetErrorColor}-->">
<!--{html_radios name="product_tax_flg" options=$arrEnable selected=$arrForm.product_tax_flg.value}-->
+ </span>
</td>
</tr>
</table>
@@ -24,7 +26,7 @@
</div>
-<h2>税率設定</h2>
+<h2>共通税率設定</h2>
<span class="attention"><!--{$arrErr.tax_rule_id}--></span>
<table id="basis-tax-func">
@@ -32,49 +34,53 @@
<th>消費税率<span class="attention"> *</span></th>
<td>
<span class="attention"><!--{$arrErr.tax_rate}--></span>
- <input type="text" name="tax_rate" value="<!--{$arrForm.tax_rate.value|h}-->" maxlength="<!--{$smarty.const.PERCENTAGE_LEN}-->" size="6" class="box6" style="<!--{if $arrErr.tax_rate != ""}-->background-color: <!--{$smarty.const.ERR_COLOR}-->;<!--{/if}-->" /> ％
+ <input type="text" name="tax_rate" value="<!--{$arrForm.tax_rate.value|h}-->" maxlength="<!--{$smarty.const.PERCENTAGE_LEN}-->" size="6" class="box6" style="<!--{$arrErr.tax_rate|sfGetErrorColor}-->" /> ％
</td>
</tr>
<tr>
<th>課税規則<span class="attention"> *</span></th>
<td>
<span class="attention"><!--{$arrErr.calc_rule}--></span>
+ <span style="<!--{$arrErr.calc_rule|sfGetErrorColor}-->">
<!--{html_radios name="calc_rule" options=$arrTAXCALCRULE selected=$arrForm.calc_rule.value}-->
+ </span>
</td>
</tr>
<!--{if $tpl_tax_rule_id != "0"}-->
<tr>
<th>適用日時<span class="attention"> *</span></th>
<td><span class="attention"><!--{$arrErr.apply_date}--></span>
- <!--{assign var=key value="apply_date_year"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <select name="<!--{$key}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+ <!--{assign var=key1 value="apply_date_year"}-->
+ <!--{assign var=key2 value="apply_date_month"}-->
+ <!--{assign var=key3 value="apply_date_day"}-->
+ <!--{assign var=key4 value="apply_date_hour"}-->
+ <!--{assign var=key5 value="apply_date_minutes"}-->
+
+ <span class="attention"><!--{$arrErr[$key1]}--></span>
+ <span class="attention"><!--{$arrErr[$key2]}--></span>
+ <span class="attention"><!--{$arrErr[$key3]}--></span>
+ <span class="attention"><!--{$arrErr[$key4]}--></span>
+ <span class="attention"><!--{$arrErr[$key5]}--></span>
+
+ <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
<option value="" selected="selected">------</option>
- <!--{html_options options=$arrYear selected=$arrForm[$key].value|h}-->
+ <!--{html_options options=$arrYear selected=$arrForm[$key1].value|h}-->
</select>年
- <!--{assign var=key value="apply_date_month"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <select name="<!--{$key}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+ <select name="<!--{$key2}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->">
<option value="" selected="selected">----</option>
- <!--{html_options options=$objDate->getMonth() selected=$arrForm[$key].value|h}-->
+ <!--{html_options options=$objDate->getMonth() selected=$arrForm[$key2].value|h}-->
</select>月
- <!--{assign var=key value="apply_date_day"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <select name="<!--{$key}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+ <select name="<!--{$key3}-->" style="<!--{$arrErr[$key3]|sfGetErrorColor}-->">
<option value="" selected="selected">----</option>
- <!--{html_options options=$objDate->getDay() selected=$arrForm[$key].value|h}-->
+ <!--{html_options options=$objDate->getDay() selected=$arrForm[$key3].value|h}-->
</select>日
- <!--{assign var=key value="apply_date_hour"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <select name="<!--{$key}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+ <select name="<!--{$key4}-->" style="<!--{$arrErr[$key4]|sfGetErrorColor}-->">
<option value="" selected="selected">----</option>
- <!--{html_options options=$objDate->getHour() selected=$arrForm[$key].value|h}-->
+ <!--{html_options options=$objDate->getHour() selected=$arrForm[$key4].value|h}-->
</select>時
- <!--{assign var=key value="apply_date_minutes"}-->
- <span class="attention"><!--{$arrErr[$key]}--></span>
- <select name="<!--{$key}-->" <!--{if $arrErr[$key] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+ <select name="<!--{$key5}-->" style="<!--{$arrErr[$key5]|sfGetErrorColor}-->">
<option value="" selected="selected">----</option>
- <!--{html_options options=$arrMinutes selected=$arrForm[$key].value|h}-->
+ <!--{html_options options=$arrMinutes selected=$arrForm[$key5].value|h}-->
</select>分
</td>
</tr>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/basis/tradelaw.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/basis/tradelaw.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/basis/tradelaw.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -128,7 +128,7 @@
<td>
<!--{assign var=key value="law_email"}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
- <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" maxlength="<!--{$arrForm[$key].length}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />
+ <input type="text" name="<!--{$arrForm[$key].keyname}-->" value="<!--{$arrForm[$key].value|h}-->" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" size="60" class="box60" />
</td>
</tr>
<tr>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/contents/recommend.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/contents/recommend.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/contents/recommend.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -27,15 +27,16 @@
<!--
function lfnCheckSubmit( fm ){
var err = '';
- /*
- if ( ! fm["title"].value ){
- err += '見出しコメントを入力して下さい。';
+
+ if ( ! fm["product_id"].value ){
+ err += '商品を選択して下さい。';
}
- */
- if ( ! fm["comment"].value ){
+
+ if ( fm["comment"] && !fm["comment"].value ){
if ( err ) err += '';
err += 'コメントを入力して下さい。';
}
+
if ( err ){
alert(err);
return false;
変更: branches/version-2_13-dev/data/Smarty/templates/admin/customer/edit.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/customer/edit.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/customer/edit.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -92,7 +92,7 @@
</td>
</tr>
<tr>
- <th>お名前(フリガナ)<span class="attention"> *</span></th>
+ <th>お名前(フリガナ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><span class="attention"> *</span><!--{/if}--></th>
<td>
<span class="attention"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></span>
<input type="text" name="kana01" value="<!--{$arrForm.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.kana01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> <input type="text" name="kana02" value="<!--{$arrForm.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.kana02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
@@ -126,7 +126,7 @@
</tr>
<!--{/if}-->
<tr>
- <th>郵便番号<span class="attention"> *</span></th>
+ <th>郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><span class="attention"> *</span><!--{/if}--></th>
<td>
<span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
〒 <input type="text" name="zip01" value="<!--{$arrForm.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" <!--{if $arrErr.zip01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="zip02" value="<!--{$arrForm.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" <!--{if $arrErr.zip02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
変更: branches/version-2_13-dev/data/Smarty/templates/admin/login_frame.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/login_frame.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/login_frame.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -32,6 +32,7 @@
<link rel="stylesheet" href="<!--{$TPL_URLPATH}-->css/admin_contents.css" type="text/css" media="all" />
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
+<!-- #2342 次期メジャーバージョン(2.14)にてeccube.legacy.jsは削除予定.モジュール、プラグインの互換性を考慮して2.13では残します. -->
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script>
<title>管理機能</title>
<link rel="shortcut icon" href="<!--{$TPL_URLPATH}-->img/common/favicon.ico" />
変更: branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/main_frame.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -43,6 +43,7 @@
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.js"></script>
+<!-- #2342 次期メジャーバージョン(2.14)にてeccube.legacy.js,eccube.admin.legacy.jsは削除予定.モジュール、プラグインの互換性を考慮して2.13では残します. -->
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script>
<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.admin.legacy.js"></script>
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/jquery.colorbox-min.js"></script>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/order/disp.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -75,6 +75,10 @@
<td><!--{$arrForm.order_kana01.value|h}--> <!--{$arrForm.order_kana02.value|h}--></td>
</tr>
<tr>
+ <th>会社名</th>
+ <td><!--{$arrForm.order_company_name.value|h}--></td>
+ </tr>
+ <tr>
<th>メールアドレス</th>
<td><!--{$arrForm.order_email.value|h}--></td>
</tr>
@@ -82,7 +86,21 @@
<th>TEL</th>
<td><!--{$arrForm.order_tel01.value|h}--> - <!--{$arrForm.order_tel02.value|h}--> - <!--{$arrForm.order_tel03.value|h}--></td>
</tr>
+ <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
<tr>
+ <th>国</th>
+ <td>
+ <!--{$arrCountry[$arrForm.order_country_id.value]|h}-->
+ </td>
+ </tr>
+ <tr>
+ <th>ZIP CODE</th>
+ <td>
+ <!--{$arrForm.order_zipcode.value|h}-->
+ </td>
+ </tr>
+ <!--{/if}-->
+ <tr>
<th>住所</th>
<td>
〒 <!--{$arrForm.order_zip01.value|h}--> - <!--{$arrForm.order_zip02.value|h}--><br />
@@ -249,6 +267,11 @@
</td>
</tr>
<tr>
+ <th>会社名</th>
+ <!--{assign var=key1 value="shipping_company_name"}-->
+ <td><!--{$arrShipping[$key1]|h}--></td>
+ </tr>
+ <tr>
<th>TEL</th>
<td>
<!--{assign var=key1 value="shipping_tel01"}-->
@@ -259,7 +282,24 @@
<!--{$arrShipping[$key3]|h}-->
</td>
</tr>
+ <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
<tr>
+ <th>国</th>
+ <td>
+ <!--{assign var=key1 value="shipping_country_id"}-->
+ <!--{assign var=key2 value=$arrShipping[$key1]}-->
+ <!--{$arrCountry[$key2]|h}-->
+ </td>
+ </tr>
+ <tr>
+ <th>ZIP CODE</th>
+ <td>
+ <!--{assign var=key1 value="shipping_zipcode"}-->
+ <!--{$arrShipping[$key1]|h}-->
+ </td>
+ </tr>
+ <!--{/if}-->
+ <tr>
<th>住所</th>
<td>
<!--{assign var=key1 value="shipping_zip01"}-->
変更: branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/order/edit.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -83,7 +83,8 @@
}
$(document).ready(function() {
- if(<!--{$arrForm.shipping_quantity.value}--> > 1){
+ var shipping_quantity = escape('<!--{$arrForm.shipping_quantity.value|h}-->');
+ if(shipping_quantity > 1){
$("input[name^='quantity[']").attr("disabled","disabled");
}
});
@@ -523,7 +524,7 @@
</td>
<td class="right">
<!--{assign var=key value="shipment_price"}-->
- <!--{$arrShipping[$key][$item_index]|sfCalcIncTax:$arrForm.order_tax_rate.value:$arrForm.order_tax_rule.value|number_format}-->円
+ <!--{$arrShipping[$key][$item_index]|number_format}-->円
<input type="hidden" name="<!--{$key}-->[<!--{$shipping_index}-->][<!--{$item_index}-->]" value="<!--{$arrShipping[$key][$item_index]|h}-->" />
</td>
<td class="right">
変更: branches/version-2_13-dev/data/Smarty/templates/admin/order/product_select.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/order/product_select.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/order/product_select.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -57,12 +57,15 @@
err_text = err_text + class_name2 + "を選択してください。\n";
}
- if(!class1_id){
+ if (!class1_id) {
+ // 規格が存在しない商品の場合
err_text = eccube.productsClassCategories[product_id]['__unselected2']['#0']['stock_find'] ? '' : '只今品切れ中です';
- }else if(class1_id && !class2_id){
+ } else if (class1_id && (class1_id != '__unselected') && class2_id && (class2_id != 'undefined')) {
+ // 規格1&規格2の商品の場合
+ err_text = eccube.productsClassCategories[product_id][class1_id]['#' + class2_id]['stock_find'] ? '' : '只今品切れ中です';
+ } else if (class1_id && (class1_id != '__unselected') && (typeof eccube.productsClassCategories[product_id][class1_id]['#0'] != 'undefined')) {
+ // 規格1のみの商品の場合
err_text = eccube.productsClassCategories[product_id][class1_id]['#0']['stock_find'] ? '' : '只今品切れ中です';
- }else{
- err_text = eccube.productsClassCategories[product_id][class1_id]['#' + class2_id]['stock_find'] ? '' : '只今品切れ中です';
}
if (err_text != '') {
変更: branches/version-2_13-dev/data/Smarty/templates/admin/products/category.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/products/category.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/products/category.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -60,7 +60,7 @@
<!--{if $arrErr.category_name}-->
<span class="attention"><!--{$arrErr.category_name}--></span>
<!--{/if}-->
- <input type="text" name="category_name" value="<!--{$arrForm.category_name|h}-->" size="30" class="box30" maxlength="<!--{$smarty.const.STEXT_LEN}-->" />
+ <input type="text" name="category_name" value="<!--{$arrForm.category_name|h}-->" size="30" class="box30" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.category_name|sfGetErrorColor}-->" />
<a class="btn-normal" href="javascript:;" onclick="eccube.setModeAndSubmit('edit','',''); return false;"><span class="btn-next">登録</span></a><span class="attention"> （上限<!--{$smarty.const.STEXT_LEN}-->文字）</span>
</div>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/products/class.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/products/class.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/products/class.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -35,7 +35,7 @@
<!--{if $arrErr.name}-->
<span class="attention"><!--{$arrErr.name}--></span>
<!--{/if}-->
- <input type="text" name="name" value="<!--{$arrForm.name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="" size="30" class="box30" />
+ <input type="text" name="name" value="<!--{$arrForm.name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.name|sfGetErrorColor}-->" size="30" class="box30" />
<span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
</td>
</tr>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/products/classcategory.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/products/classcategory.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/products/classcategory.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -34,7 +34,7 @@
<table>
<tr>
<th>規格名</th>
- <td><!--{$tpl_class_name}--></td>
+ <td><!--{$tpl_class_name|h}--></td>
</tr>
<tr>
<th>分類名<span class="attention"> *</span></th>
@@ -42,7 +42,7 @@
<!--{if $arrErr.name}-->
<span class="attention"><!--{$arrErr.name}--></span>
<!--{/if}-->
- <input type="text" name="name" value="<!--{$arrForm.name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="" size="30" class="box30" />
+ <input type="text" name="name" value="<!--{$arrForm.name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.name|sfGetErrorColor}-->" size="30" class="box30" />
<span class="attention"> (上限<!--{$smarty.const.STEXT_LEN}-->文字)</span>
</td>
</tr>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/products/maker.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/products/maker.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/products/maker.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -34,7 +34,7 @@
<td>
<!--{if $arrErr.maker_id}--><span class="attention"><!--{$arrErr.maker_id}--></span><br /><!--{/if}-->
<!--{if $arrErr.name}--><span class="attention"><!--{$arrErr.name}--></span><!--{/if}-->
- <input type="text" name="name" value="<!--{$arrForm.name.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" style="" size="60" class="box60"/>
+ <input type="text" name="name" value="<!--{$arrForm.name.value|h}-->" maxlength="<!--{$smarty.const.SMTEXT_LEN}-->" size="60" class="box60"<!--{if $arrErr.maker_id || $arrErr.name}--> <!--{sfSetErrorStyle}--><!--{/if}--> />
<span class="attention"> (上限<!--{$smarty.const.SMTEXT_LEN}-->文字)</span>
</td>
</tr>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/products/product.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/products/product.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/products/product.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -441,7 +441,11 @@
<input type="checkbox" name="<!--{$key}-->" value="1" />削除<br />
<!--{assign var=key value="recommend_comment`$smarty.section.cnt.iteration`"}-->
<span class="attention"><!--{$arrErr[$key]}--></span>
- 商品コード:<!--{$arrRecommend[$recommend_no].product_code_min}--><br />
+ 商品コード:<!--{$arrRecommend[$recommend_no].product_code_min}-->
+ <!--{if $arrRecommend[$recommend_no].product_code_min != $arrRecommend[$recommend_no].product_code_max}-->
+ 〜 <!--{$arrRecommend[$recommend_no].product_code_max}-->
+ <!--{/if}-->
+ <br />
商品名:<!--{$arrRecommend[$recommend_no].name|h}--><br />
<textarea name="<!--{$key}-->" cols="60" rows="8" class="area60" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{"\n"}--><!--{$arrRecommend[$recommend_no].comment|h}--></textarea><br />
<span class="attention"> (上限<!--{$smarty.const.LTEXT_LEN}-->文字)</span>
変更: branches/version-2_13-dev/data/Smarty/templates/admin/products/product_class.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/products/product_class.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/products/product_class.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -85,6 +85,9 @@
var price02 = $('#price02_0').val();
$('input[id^=price02_]').val(price02);
+ var tax_rate = $('#tax_rate_0').val();
+ $('input[id^=tax_rate_]').val(tax_rate);
+
var product_type_id_value = '';
$('input[id^=product_type_id_0_]').each(function() {
if ($(this).attr('checked')) {
@@ -200,7 +203,9 @@
<th>在庫数<span class="attention">*</span></th>
<th><!--{$smarty.const.NORMAL_PRICE_TITLE}-->(円)</th>
<th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)<span class="attention">*</span></th>
+ <!--{if $smarty.const.OPTION_PRODUCT_TAX_RULE}-->
<th>消費税率(%)<span class="attention">*</span></th>
+ <!--{/if}-->
<th>商品種別<span class="attention">*</span></th>
<th>ダウンロード<br />ファイル名<span class="red"><br />上限<!--{$smarty.const.STEXT_LEN}-->文字</span></th>
<th>ダウンロード商品用<br />ファイル</th>
@@ -271,6 +276,7 @@
<!--{/if}-->
<input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" size="6" class="box6" maxlength="<!--{$arrForm[$key].length}-->" <!--{if $arrErr[$key][$index] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> id="<!--{$key}-->_<!--{$index}-->" />
</td>
+ <!--{if $smarty.const.OPTION_PRODUCT_TAX_RULE}-->
<td class="center">
<!--{assign var=key value="tax_rate"}-->
<!--{if $arrErr[$key][$index]}-->
@@ -278,6 +284,7 @@
<!--{/if}-->
<input type="text" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" size="6" class="box6" maxlength="<!--{$arrForm[$key].length}-->" <!--{if $arrErr[$key][$index] != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> id="<!--{$key}-->_<!--{$index}-->" />
</td>
+ <!--{/if}-->
<td class="class-product-type">
<!--{assign var=key value="product_type_id"}-->
<!--{if $arrErr[$key][$index]}-->
変更: branches/version-2_13-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/products/product_class_confirm.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -63,7 +63,9 @@
<th>在庫数</th>
<th><!--{$smarty.const.NORMAL_PRICE_TITLE}-->(円)</th>
<th><!--{$smarty.const.SALE_PRICE_TITLE}-->(円)</th>
+ <!--{if $smarty.const.OPTION_PRODUCT_TAX_RULE}-->
<th>消費税率(%)</th>
+ <!--{/if}-->
<th>商品種別</th>
<th>ダウンロードファイル名</th>
<th>ダウンロード商品用ファイルアップロード</th>
@@ -92,8 +94,10 @@
<td class="right"><!--{$arrForm[$key].value[$index]|h}--></td>
<!--{assign var=key value="price02"}-->
<td class="right"><!--{$arrForm[$key].value[$index]|h}--></td>
+ <!--{if $smarty.const.OPTION_PRODUCT_TAX_RULE}-->
<!--{assign var=key value="tax_rate"}-->
<td class="right"><!--{$arrForm[$key].value[$index]|h}--></td>
+ <!--{/if}-->
<!--{assign var=key value="product_type_id"}-->
<td class="right">
<!--{foreach from=$arrForm[$key].value[$index] item=product_type_id}-->
変更: branches/version-2_13-dev/data/Smarty/templates/admin/system/input.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/admin/system/input.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/admin/system/input.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -45,7 +45,7 @@
<th>名前</th>
<td>
<!--{if $arrErr.name}--><span class="attention"><!--{$arrErr.name}--></span><!--{/if}-->
- <input type="text" name="name" size="30" class="box30" value="<!--{$arrForm.name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" />
+ <input type="text" name="name" size="30" class="box30" value="<!--{$arrForm.name|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.name|sfGetErrorColor}-->" />
<span class="attention">※必須入力</span>
</td>
</tr>
@@ -53,14 +53,14 @@
<th>所属</th>
<td>
<!--{if $arrErr.department}--><span class="attention"><!--{$arrErr.department}--></span><!--{/if}-->
- <input type="text" name="department" size="30" class="box30" value="<!--{$arrForm.department|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" />
+ <input type="text" name="department" size="30" class="box30" value="<!--{$arrForm.department|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.department|sfGetErrorColor}-->" />
</td>
</tr>
<tr>
<th>ログインＩＤ</th>
<td>
<!--{if $arrErr.login_id}--><span class="attention"><!--{$arrErr.login_id}--></span><!--{/if}-->
- <input type="text" name="login_id" size="20" class="box20" value="<!--{$arrForm.login_id|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/>
+ <input type="text" name="login_id" size="20" class="box20" value="<!--{$arrForm.login_id|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.login_id|sfGetErrorColor}-->" />
<span class="attention">※必須入力</span><br />
※半角英数字<!--{$smarty.const.ID_MIN_LEN}-->〜<!--{$smarty.const.ID_MAX_LEN}-->文字
</td>
@@ -69,11 +69,11 @@
<th>パスワード</th>
<td>
<!--{if $arrErr.password}--><span class="attention"><!--{$arrErr.password}--><!--{$arrErr.password02}--></span><!--{/if}-->
- <input type="password" name="password" size="20" class="box20" value="<!--{$arrForm.password}-->" onfocus="<!--{$tpl_onfocus}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/>
+ <input type="password" name="password" size="20" class="box20" value="<!--{$arrForm.password}-->" onfocus="<!--{$tpl_onfocus}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.password|sfGetErrorColor}-->" />
<span class="attention">※必須入力</span><br />
※半角英数字<!--{$smarty.const.ID_MIN_LEN}-->〜<!--{$smarty.const.ID_MAX_LEN}-->文字
<br />
- <input type="password" name="password02" size="20" class="box20" value="<!--{$arrForm.password02}-->" onfocus="<!--{$tpl_onfocus}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->"/>
+ <input type="password" name="password02" size="20" class="box20" value="<!--{$arrForm.password02}-->" onfocus="<!--{$tpl_onfocus}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" style="<!--{$arrErr.password02|sfGetErrorColor}-->" />
<p><span class="attention mini">確認のために2度入力してください。</span></p>
</td>
</tr>
@@ -81,7 +81,7 @@
<th>権限</th>
<td>
<!--{if $arrErr.authority}--><span class="attention"><!--{$arrErr.authority}--></span><!--{/if}-->
- <select name="authority">
+ <select name="authority" style="<!--{$arrErr.authority|sfGetErrorColor}-->">
<option value="">選択してください</option>
<!--{html_options options=$arrAUTHORITY selected=$arrForm.authority}-->
</select>
@@ -93,8 +93,10 @@
<td>
<!--{if $arrErr.work}--><span class="attention"><!--{$arrErr.work}--></span><!--{/if}-->
<!--{assign var=key value="work"}-->
- <input type="radio" id="<!--{$key}-->_1" name="<!--{$key}-->" value="1" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:1}--> /><label for="<!--{$key}-->_1"><!--{$arrWORK.1}--></label>
- <input type="radio" id="<!--{$key}-->_0" name="<!--{$key}-->" value="0" style="<!--{$arrErr.work|sfGetErrorColor}-->" <!--{$arrForm.work|sfGetChecked:0}--> /><label for="<!--{$key}-->_0"><!--{$arrWORK.0}--></label>
+ <span style="<!--{$arrErr.work|sfGetErrorColor}-->">
+ <input type="radio" id="<!--{$key}-->_1" name="<!--{$key}-->" value="1" <!--{$arrForm.work|sfGetChecked:1}--> /><label for="<!--{$key}-->_1"><!--{$arrWORK.1}--></label>
+ <input type="radio" id="<!--{$key}-->_0" name="<!--{$key}-->" value="0" <!--{$arrForm.work|sfGetChecked:0}--> /><label for="<!--{$key}-->_0"><!--{$arrWORK.0}--></label>
+ </span>
<span class="attention">※必須入力</span>
</td>
</tr>
変更: branches/version-2_13-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/default/mail_templates/order_mail.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -111,8 +111,9 @@
<!--{foreach item=item name=item from=$shipping.shipment_item}-->
商品コード: <!--{$item.product_code}-->
商品名: <!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-単価：￥<!--{$item.price|number_format}-->
-数量：<!--{$item.quantity}-->
+<!--{assign var=shipping_product value=$item.productsClass}-->
+単価：￥<!--{$shipping_product.price02_inctax|number_format}-->
+数量：<!--{$item.quantity|number_format}-->
<!--{/foreach}-->
<!--{/foreach}-->
変更: branches/version-2_13-dev/data/Smarty/templates/default/popup_header.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/popup_header.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/default/popup_header.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -30,6 +30,7 @@
<link rel="stylesheet" href="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/colorbox.css" type="text/css" media="all" />
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
+<!-- #2342 次期メジャーバージョン(2.14)にてeccube.legacy.jsは削除予定.モジュール、プラグインの互換性を考慮して2.13では残します. -->
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script>
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/jquery.colorbox-min.js"></script>
<title><!--{$arrSiteInfo.shop_name}-->/<!--{$subtitle|h}--></title>
変更: branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/default/shopping/multiple.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -72,7 +72,7 @@
<!--{if $arrForm.classcategory_name2.value[$index] != ""}-->
<!--{$arrForm.class_name2.value[$index]|h}-->：<!--{$arrForm.classcategory_name2.value[$index]|h}--><br />
<!--{/if}-->
- <!--{$arrForm.price.value[$index]|sfCalcIncTax|number_format}-->円
+ <!--{$arrForm.price_inctax.value[$index]|number_format}-->円
</td>
<td>
<!--{assign var=key value="quantity"}-->
@@ -101,6 +101,8 @@
<input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="price"}-->
<input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
+ <!--{assign var=key value="price_inctax"}-->
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="shipping"}-->
<!--{if strlen($arrErr[$key][$index]) >= 1}-->
<div class="attention"><!--{$arrErr[$key][$index]}--></div>
変更: branches/version-2_13-dev/data/Smarty/templates/default/site_frame.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/default/site_frame.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/default/site_frame.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -46,6 +46,7 @@
<link rel="alternate" type="application/rss+xml" title="RSS" href="<!--{$smarty.const.HTTP_URL}-->rss/<!--{$smarty.const.DIR_INDEX_PATH}-->" />
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery-1.4.2.min.js"></script>
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
+<!-- #2342 次期メジャーバージョン(2.14)にてeccube.legacy.jsは削除予定.モジュール、プラグインの互換性を考慮して2.13では残します. -->
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script>
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/jquery.colorbox-min.js"></script>
<!--{if $tpl_page_class_name === "LC_Page_Abouts"}-->
変更: branches/version-2_13-dev/data/Smarty/templates/mobile/entry/confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/mobile/entry/confirm.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/mobile/entry/confirm.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -38,6 +38,9 @@
●お名前(フリガナ)<br>
<!--{$arrForm.kana01.value|h}--> <!--{$arrForm.kana02.value|h}--><br>
+ ●会社名<br>
+ <!--{$arrForm.company_name.value|h}--><br>
+
●性別<br>
<!--{assign var=key1 value="sex"}-->
<!--{assign var="sex_id" value=$arrForm[$key1].value}-->
@@ -49,6 +52,15 @@
●生年月日<br>
<!--{if strlen($arrForm.year.value) > 0 && strlen($arrForm.month.value) > 0 && strlen($arrForm.day.value) > 0}--><!--{$arrForm.year.value|h}-->年<!--{$arrForm.month.value|h}-->月<!--{$arrForm.day.value|h}-->日生まれ<!--{else}-->未登録<!--{/if}--><br>
+ <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+ ●国<br>
+ <!--{assign var="country_id" value=$arrForm.country_id.value}-->
+ <!--{$arrCountry[$country_id]|h}--><br>
+
+ ●ZIP CODE<br>
+ <!--{$arrForm.zipcode.value|h}--><br>
+ <!--{/if}-->
+
●住所<br>
〒<!--{$arrForm.zip01.value|h}--> - <!--{$arrForm.zip02.value|h}--><br>
<!--{$arrPref[$arrForm.pref.value]|h}--><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}--><br>
変更: branches/version-2_13-dev/data/Smarty/templates/mobile/entry/index.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/mobile/entry/index.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/mobile/entry/index.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -37,7 +37,7 @@
名（例：花子）<br>
<input type="text" name="name02" value="<!--{$arrForm.name02.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
- ●お名前(フリガナ)<font color="#FF0000"> *</font><br>
+ ●お名前(フリガナ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000"> *</font><!--{/if}--><br>
<font color="#FF0000"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></font>
フリガナ/姓（例：シブヤ）<br>
<input type="text" name="kana01" value="<!--{$arrForm.kana01.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
@@ -45,6 +45,10 @@
フリガナ/名（例：ハナコ）<br>
<input type="text" name="kana02" value="<!--{$arrForm.kana02.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
+ ●会社名<br>
+ <font color="#FF0000"><!--{$arrErr.company_name}--></font>
+ <input type="text" name="company_name" value="<!--{$arrForm.company_name.value|h}-->" istyle="1"><br>
+
●性別<font color="#FF0000"> *</font><br>
<!--{assign var=key1 value="sex"}-->
<!--{if $arrErr[$key1]}-->
@@ -69,9 +73,24 @@
<!--{html_options options=$arrDay selected=$arrForm.day.value|h}-->
</select>日<br>
+ <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+ ●国<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.country_id}--></font>
+ <select name="country_id">
+ <option value="">選択してください</option>
+ <!--{html_options options=$arrCountry selected=$arrForm.country_id.value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+ </select><br>
+
+ ●ZIP CODE<br>
+ <font color="#FF0000"><!--{$arrErr.zipcode}--></font>
+ <input type="text" name="zipcode" value="<!--{$arrForm.zipcode.value|h}-->"><br>
+ <!--{else}-->
+ <input type="hidden" name="country_id" value="<!--{$smarty.const.DEFAULT_COUNTRY_ID}-->" />
+ <!--{/if}-->
+
<!--{assign var=key1 value="zip01"}-->
<!--{assign var=key2 value="zip02"}-->
- ●郵便番号<font color="#FF0000"> *</font><br>
+ ●郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000"> *</font><!--{/if}--><br>
<font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font>
<!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}-->
<!--{assign var="size2" value="`$smarty.const.ZIP02_LEN+2`"}-->
変更: branches/version-2_13-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/mobile/mail_templates/order_mail.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -84,8 +84,9 @@
<!--{foreach item=item name=item from=$shipping.shipment_item}-->
商品コード：<!--{$item.product_code}-->
商品名：<!--{$item.product_name}--> <!--{$item.classcategory_name1}--> <!--{$item.classcategory_name2}-->
-単価：￥<!--{$item.price|sfCalcIncTax:$arrOrder.order_tax_rate:$arrOrder.order_tax_rule|number_format}-->
-数量：<!--{$item.quantity}-->
+<!--{assign var=shipping_product value=$item.productsClass}-->
+単価：￥<!--{$shipping_product.price02_inctax|number_format}-->
+数量：<!--{$item.quantity|number_format}-->
<!--{/foreach}-->
<!--{/foreach}-->
変更: branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/change.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/change.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/change.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -37,12 +37,16 @@
名（例：花子）<br>
<input type="text" name="name02" value="<!--{$arrForm.name02.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="1"><br>
- フリガナ/姓（例：シブヤ）<font color="#FF0000">※</font><br>
+ フリガナ/姓（例：シブヤ）<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000">※</font><!--{/if}--><br>
<font color="#FF0000"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></font>
<input type="text" name="kana01" value="<!--{$arrForm.kana01.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
- フリガナ/名（例：ハナコ）<font color="#FF0000">※</font><br>
+ フリガナ/名（例：ハナコ）<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000">※</font><!--{/if}--><br>
<input type="text" name="kana02" value="<!--{$arrForm.kana02.value|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" istyle="2"><br>
+
+ 【会社名】<br>
+ <font color="#FF0000"><!--{$arrErr.company_name}--></font>
+ <input type="text" name="company_name" value="<!--{$arrForm.company_name.value|h}-->" istyle="1"><br>
【性別】<font color="#FF0000">※</font><br>
<!--{assign var=key1 value="sex"}-->
@@ -67,10 +71,23 @@
<select name="day">
<!--{html_options options=$arrDay selected=$arrForm.day.value}-->
</select>日<br>
+
+ <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+ 【国】<font color="#FF0000">※</font><br>
+ <font color="#FF0000"><!--{$arrErr.country_id}--></font>
+ <select name="country_id">
+ <option value="">選択してください</option>
+ <!--{html_options options=$arrCountry selected=$arrForm.country_id.value|h}-->
+ </select><br>
+
+ 【ZIP CODE】<br>
+ <font color="#FF0000"><!--{$arrErr.zipcode}--></font>
+ <input type="text" name="zipcode" value="<!--{$arrForm.zipcode.value|h}-->"><br>
+ <!--{/if}-->
<!--{assign var=key1 value="zip01"}-->
<!--{assign var=key2 value="zip02"}-->
- 【郵便番号】<font color="#FF0000">※</font><br>
+ 【郵便番号】<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--><font color="#FF0000">※</font><!--{/if}--><br>
<font color="#FF0000"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></font>
<!--{assign var="size1" value="`$smarty.const.ZIP01_LEN+2`"}-->
<!--{assign var="size2" value="`$smarty.const.ZIP02_LEN+2`"}-->
変更: branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/mobile/mypage/change_confirm.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -35,11 +35,17 @@
【個人情報】<br>
<!--{$arrForm.name01.value|h}--> <!--{$arrForm.name02.value|h}--><br>
<!--{$arrForm.kana01.value|h}--> <!--{$arrForm.kana02.value|h}--><br>
+ <!--{$arrForm.company_name.value|h}--><br>
<!--{assign var=key1 value="sex"}-->
<!--{assign var="sex_id" value=$arrForm[$key1].value}-->
<!--{$arrSex[$sex_id]|h}--><br>
<!--{$arrJob[$arrForm.job.value]|h}--><br>
<!--{if strlen($arrForm.year.value) > 0 && strlen($arrForm.month.value) > 0 && strlen($arrForm.day.value) > 0}--><!--{$arrForm.year.value|h}-->年<!--{$arrForm.month.value|h}-->月<!--{$arrForm.day.value|h}-->日生まれ<!--{else}-->生年月日 未登録<!--{/if}--><br>
+ <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+ <!--{assign var="country_id" value=$arrForm.country_id.value}-->
+ <!--{$arrCountry[$country_id]|h}--><br>
+ <!--{$arrForm.zipcode.value|h}--><br>
+ <!--{/if}-->
〒<!--{$arrForm.zip01.value|h}--> - <!--{$arrForm.zip02.value|h}--><br>
<!--{$arrPref[$arrForm.pref.value]|h}--><!--{$arrForm.addr01.value|h}--><!--{$arrForm.addr02.value|h}--><br>
<!--{$arrForm.tel01.value|h}-->-<!--{$arrForm.tel02.value|h}-->-<!--{$arrForm.tel03.value|h}--><br>
変更: branches/version-2_13-dev/data/Smarty/templates/mobile/shopping/confirm.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/mobile/shopping/confirm.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/mobile/shopping/confirm.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -37,7 +37,7 @@
◎<!--{$item.productsClass.name|h}--><br>
<!--{if $item.productsClass.classcategory_name1 != ""}--><!--{$item.productsClass.class_name1|h}-->：<!--{$item.productsClass.classcategory_name1|h}--><br><!--{/if}-->
<!--{if $item.productsClass.classcategory_name2 != ""}--><!--{$item.productsClass.class_name2|h}-->：<!--{$item.productsClass.classcategory_name2|h}--><br><!--{/if}-->
- 単価：<!--{$item.price|sfCalcIncTax|number_format}-->円<br>
+ 単価：<!--{$item.price_inctax|number_format}-->円<br>
数量：<!--{$item.quantity|number_format}--><br>
小計：<!--{$item.total_inctax|number_format}-->円<br>
<br>
変更: branches/version-2_13-dev/data/Smarty/templates/mobile/shopping/multiple.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/mobile/shopping/multiple.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/mobile/shopping/multiple.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -51,12 +51,14 @@
<input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{assign var=key value="price"}-->
<input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
+ <!--{assign var=key value="price_inctax"}-->
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->">
<!--{* 商品名 *}-->◎<!--{$arrForm.name.value[$index]|h}--><br>
<!--{* 規格名1 *}--><!--{if $arrForm.classcategory_name1.value[$index] != ""}--><!--{$arrForm.class_name1.value[$index]|h}-->：<!--{$arrForm.classcategory_name1.value[$index]|h}--><br><!--{/if}-->
<!--{* 規格名2 *}--><!--{if $arrForm.classcategory_name2.value[$index] != ""}--><!--{$arrForm.class_name2.value[$index]|h}-->：<!--{$arrForm.classcategory_name2.value[$index]|h}--><br><!--{/if}-->
<!--{* 販売価格 *}-->
- <!--{$arrForm.price.value[$index]|sfCalcIncTax|number_format}-->円<br>
+ <!--{$arrForm.price_inctax.value[$index]|number_format}-->円<br>
<!--{assign var=key value="quantity"}-->
<!--{if $arrErr[$key][$index] != ''}-->
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/bloc/news.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -139,9 +139,8 @@
//コメントをセット(iphone4の場合、innerHTMLの再描画が行われない為、タイマーで無理やり再描画させる)
setTimeout( function() {
- $("#newsComment").html(news.news_comment.replace(/\n/g,"<br />"));
+ news.news_comment == null ? $("#newsComment").html("") : $("#newsComment").html(news.news_comment.replace(/\n/g,"<br />"));
}, 10);
-
$.mobile.changePage('#windowcolumn', {transition: "slideup"});
//ダイアログが開き終わるまで待機
setTimeout( function() {
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/frontparts/form_personal_input.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -33,7 +33,7 @@
<input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" class="boxHarf text data-role-none" placeholder="名" />
</dd>
-<dt>お名前(フリガナ) <span class="attention">※</span></dt>
+<dt>お名前(フリガナ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt>
<dd>
<!--{assign var=key1 value="`$prefix`kana01"}-->
<!--{assign var=key2 value="`$prefix`kana02"}-->
@@ -43,8 +43,44 @@
<input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" class="boxHarf text data-role-none" placeholder="セイ"/> <input type="text" name="<!--{$key2}-->" value="<!--{$arrForm[$key2].value|h}-->" maxlength="<!--{$arrForm[$key2].length}-->" style="<!--{$arrErr[$key2]|sfGetErrorColor}-->" class="boxHarf text data-role-none" placeholder="メイ"/>
</dd>
-<dt>郵便番号 <span class="attention">※</span></dt>
+<dt>会社名</dt>
<dd>
+ <!--{assign var=key1 value="`$prefix`company_name"}-->
+ <!--{if $arrErr[$key1]}-->
+ <div class="attention"><!--{$arrErr[$key1]}--></div>
+ <!--{/if}-->
+ <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->" class="boxLong text data-role-none" />
+</dd>
+
+<!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+<dt>国 <span class="attention">※</span></dt>
+<dd>
+ <!--{assign var=key1 value="`$prefix`country_id"}-->
+ <!--{if $arrErr[$key1]}-->
+ <div class="attention"><!--{$arrErr[$key1]}--></div>
+ <!--{/if}-->
+ <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
+ <option value="" selected="selected">国を選択</option>
+ <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+ </select>
+</dd>
+
+<dt>ZIP CODE</dt>
+<dd>
+ <!--{assign var=key1 value="`$prefix`zipcode"}-->
+ <!--{if $arrErr[$key1]}-->
+ <div class="attention"><!--{$arrErr[$key1]}--></div>
+ <!--{/if}-->
+ <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" />
+</dd>
+
+<!--{else}-->
+<!--{assign var=key1 value="`$prefix`country_id"}-->
+<input type="hidden" name="<!--{$key1}-->" value="<!--{$smarty.const.DEFAULT_COUNTRY_ID}-->" />
+<!--{/if}-->
+
+<dt>郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt>
+<dd>
<!--{assign var=key1 value="`$prefix`zip01"}-->
<!--{assign var=key2 value="`$prefix`zip02"}-->
<!--{assign var=key3 value="`$prefix`pref"}-->
@@ -108,7 +144,7 @@
</dd>
<!--{if $emailMobile}-->
- <dt>携帯メールアドレス <span class="attention">※</span></dt>
+ <dt>携帯メールアドレス</dt>
<dd>
<!--{assign var=key1 value="`$prefix`email_mobile"}-->
<!--{assign var=key2 value="`$prefix`email_mobile02"}-->
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/favorite.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/favorite.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/favorite.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -78,7 +78,7 @@
<div class="btn_area">
<!--{if $tpl_linemax > $dispNumber}-->
- <p><a rel="external" href="javascript: void(0);" class="btn_more" id="btn_more_product" onclick="getProducts(5); return false;">もっとみる(＋<!--{$dispNumber}-->件)</a></p>
+ <p><a rel="external" href="javascript: void(0);" class="btn_more" id="btn_more_product" onclick="getProducts(<!--{$dispNumber}-->); return false;">もっとみる(＋<!--{$dispNumber}-->件)</a></p>
<!--{/if}-->
</div>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/index.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/index.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/mypage/index.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -74,7 +74,7 @@
</div><!-- /.form_area-->
<div class="btn_area">
<!--{if $objNavi->all_row > $dispNumber}-->
- <p><a href="javascript: void(0);" class="btn_more" id="btn_more_history" onClick="getHistory(5); return false;" rel="external">もっとみる(＋<!--{$dispNumber}-->件)</a></p>
+ <p><a href="javascript: void(0);" class="btn_more" id="btn_more_history" onClick="getHistory(<!--{$dispNumber}-->); return false;" rel="external">もっとみる(＋<!--{$dispNumber}-->件)</a></p>
<!--{/if}-->
</div>
<!--{else}-->
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/popup_header.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/popup_header.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/popup_header.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -35,6 +35,7 @@
<script src="<!--{$TPL_URLPATH}-->js/jquery-1.9.1.min.js"></script>
<script src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
<script src="<!--{$TPL_URLPATH}-->js/eccube.sphone.js"></script>
+ <!-- #2342 次期メジャーバージョン(2.14)にてeccube.legacy.jsは削除予定.モジュール、プラグインの互換性を考慮して2.13では残します. -->
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script>
<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.sphone.legacy.js"></script>
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/jquery.colorbox/jquery.colorbox-min.js"></script>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/multiple.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/multiple.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/multiple.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -66,7 +66,7 @@
<!--{if $arrForm.classcategory_name2.value[$index] != ""}-->
<span class="mini"><!--{$arrForm.class_name2.value[$index]|h}-->：<!--{$arrForm.classcategory_name2.value[$index]|h}--></span><br />
<!--{/if}-->
- <!--{$arrForm.price.value[$index]|sfCalcIncTax|number_format}-->円
+ <!--{$arrForm.price_inctax.value[$index]|number_format}-->円
</p>
<ul>
<li class="result"><span class="mini">数量</span></li>
@@ -98,6 +98,8 @@
<input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="price"}-->
<input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
+ <!--{assign var=key value="price_inctax"}-->
+ <input type="hidden" name="<!--{$key}-->[<!--{$index}-->]" value="<!--{$arrForm[$key].value[$index]|h}-->" />
<!--{assign var=key value="shipping"}-->
<select name="<!--{$key}-->[<!--{$index}-->]" class="boxLong data-role-none"><!--{html_options options=$addrs selected=$arrForm[$key].value[$index]}--></select>
</div>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/shopping/nonmember_input.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -69,7 +69,7 @@
class="boxHarf text data-role-none" placeholder="名"/>
</dd>
- <dt>お名前(フリガナ) <span class="attention">※</span></dt>
+ <dt>お名前(フリガナ)<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt>
<dd>
<!--{assign var=key1 value="order_kana01"}-->
<!--{assign var=key2 value="order_kana02"}-->
@@ -86,8 +86,34 @@
class="boxHarf text data-role-none" placeholder="メイ"/>
</dd>
- <dt>郵便番号 <span class="attention">※</span></dt>
+ <dt>会社名</dt>
<dd>
+ <!--{assign var=key value="order_company_name"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+ </dd>
+
+ <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+ <dt>国 <span class="attention">※</span></dt>
+ <dd>
+ <!--{assign var=key1 value="order_country_id"}-->
+ <div class="attention"><!--{$arrErr[$key1]}--></div>
+ <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
+ <option value="" selected="selected">国を選択</option>
+ <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+ </select>
+ </dd>
+
+ <dt>ZIP CODE</dt>
+ <dd>
+ <!--{assign var=key1 value="order_zipcode"}-->
+ <div class="attention"><!--{$arrErr[$key1]}--></div>
+ <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" />
+ </dd>
+ <!--{/if}-->
+
+ <dt>郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt>
+ <dd>
<!--{assign var=key1 value="order_zip01"}-->
<!--{assign var=key2 value="order_zip02"}-->
<span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
@@ -255,7 +281,7 @@
class="boxHarf text data-role-none" placeholder="名"/>
</dd>
- <dt>フリガナ <span class="attention">※</span></dt>
+ <dt>フリガナ<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt>
<dd>
<!--{assign var=key1 value="shipping_kana01"}-->
<!--{assign var=key2 value="shipping_kana02"}-->
@@ -272,8 +298,34 @@
class="boxHarf text data-role-none" placeholder="メイ"/>
</dd>
- <dt>郵便番号 <span class="attention">※</span></dt>
+ <dt>会社名</dt>
<dd>
+ <!--{assign var=key value="shipping_company_name"}-->
+ <span class="attention"><!--{$arrErr[$key]}--></span>
+ <input type="text" name="<!--{$key}-->" value="<!--{$arrForm[$key].value|h}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" />
+ </dd>
+
+ <!--{if $smarty.const.FORM_COUNTRY_ENABLE}-->
+ <dt>国 <span class="attention">※</span></dt>
+ <dd>
+ <!--{assign var=key1 value="shipping_country_id"}-->
+ <div class="attention"><!--{$arrErr[$key1]}--></div>
+ <select name="<!--{$key1}-->" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->">
+ <option value="" selected="selected">国を選択</option>
+ <!--{html_options options=$arrCountry selected=$arrForm[$key1].value|h|default:$smarty.const.DEFAULT_COUNTRY_ID}-->
+ </select>
+ </dd>
+
+ <dt>ZIP CODE</dt>
+ <dd>
+ <!--{assign var=key1 value="shipping_zipcode"}-->
+ <div class="attention"><!--{$arrErr[$key1]}--></div>
+ <input type="text" name="<!--{$key1}-->" value="<!--{$arrForm[$key1].value|h}-->" maxlength="<!--{$arrForm[$key1].length}-->" class="boxLong text data-role-none" style="<!--{$arrErr[$key1]|sfGetErrorColor}-->; ime-mode: disabled;" />
+ </dd>
+ <!--{/if}-->
+
+ <dt>郵便番号<!--{if !$smarty.const.FORM_COUNTRY_ENABLE}--> <span class="attention">※</span><!--{/if}--></dt>
+ <dd>
<!--{assign var=key1 value="shipping_zip01"}-->
<!--{assign var=key2 value="shipping_zip02"}-->
<span class="attention"><!--{$arrErr[$key1]}--><!--{$arrErr[$key2]}--></span>
変更: branches/version-2_13-dev/data/Smarty/templates/sphone/site_frame.tpl
===================================================================
--- branches/version-2_13-dev/data/Smarty/templates/sphone/site_frame.tpl 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/Smarty/templates/sphone/site_frame.tpl 2013-09-19 02:49:03 UTC (rev 23230)
@@ -51,6 +51,7 @@
<script src="<!--{$TPL_URLPATH}-->js/jquery-1.9.1.min.js"></script>
<script src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.js"></script>
<script src="<!--{$TPL_URLPATH}-->js/eccube.sphone.js"></script>
+ <!-- #2342 次期メジャーバージョン(2.14)にてeccube.legacy.jsは削除予定.モジュール、プラグインの互換性を考慮して2.13では残します. -->
<script type="text/javascript" src="<!--{$smarty.const.ROOT_URLPATH}-->js/eccube.legacy.js"></script>
<script type="text/javascript" src="<!--{$TPL_URLPATH}-->js/eccube.sphone.legacy.js"></script>
<script src="<!--{$TPL_URLPATH}-->js/jquery.biggerlink.js"></script>
変更: branches/version-2_13-dev/data/class/SC_Product.php
===================================================================
--- branches/version-2_13-dev/data/class/SC_Product.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/SC_Product.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -404,7 +404,17 @@
$objQuery->setWhere('product_class_id = ? AND T1.del_flg = 0');
$arrRes = $this->getProductsClassByQuery($objQuery, $productClassId);
- return (array) $arrRes[0];
+ $arrProduct = (array) $arrRes[0];
+
+ // 税込計算
+ if(!SC_Utils_Ex::isBlank($arrProduct['price01'])) {
+ $arrProduct['price01_inctax'] = SC_Helper_TaxRule_Ex::sfCalcIncTax($arrProduct['price01'], $arrProduct['product_id'], $productClassId);
+ }
+ if(!SC_Utils_Ex::isBlank($arrProduct['price02'])) {
+ $arrProduct['price02_inctax'] = SC_Helper_TaxRule_Ex::sfCalcIncTax($arrProduct['price02'], $arrProduct['product_id'], $productClassId);
+ }
+
+ return $arrProduct;
}
/**
変更: branches/version-2_13-dev/data/class/api/SC_Api_Operation.php
===================================================================
--- branches/version-2_13-dev/data/class/api/SC_Api_Operation.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/api/SC_Api_Operation.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -300,7 +300,12 @@
$objFormParam->setParam($arrPost);
$objFormParam->convParam();
- $arrErr = $objFormParam->checkError();
+ $arrErr = SC_Api_Operation_Ex::checkParam($objFormParam);
+
+ // API機能が有効であるかをチェック.
+ if (API_ENABLE_FLAG == false){
+ $arrErr['ECCUBE.Function.Disable'] = 'API機能が無効です。';
+ }
if (SC_Utils_Ex::isBlank($arrErr)) {
$arrParam = $objFormParam->getHashArray();
$operation_name = $arrParam['Operation'];
@@ -418,4 +423,31 @@
break;
}
}
+
+ /**
+ * APIのリクエスト基本パラメーターのチェック
+ *
+ * @param object $objFormParam
+ * @return array $arrErr
+ */
+ protected function checkParam($objFormParam)
+ {
+ $arrErr = $objFormParam->checkError();
+ if (!preg_match("/^[a-zA-Z0-9\-\_]+$/", $objFormParam->getValue('Operation')) && !SC_Utils::isBlank($objFormParam->getValue('Operation'))) {
+ $arrErr['ECCUBE.Operation.ParamError'] = 'Operationの値が不正です。';
+ }
+ if (!preg_match("/^[a-zA-Z0-9\-\_]+$/", $objFormParam->getValue('Service')) && !SC_Utils::isBlank($objFormParam->getValue('Service'))) {
+ $arrErr['ECCUBE.Service.ParamError'] = 'Serviceの値が不正です。';
+ }
+ if (!preg_match("/^[a-zA-Z0-9\-\_]+$/", $objFormParam->getValue('Style')) && !SC_Utils::isBlank($objFormParam->getValue('Style'))) {
+ $arrErr['ECCUBE.Style.ParamError'] = 'Styleの値が不正です。';
+ }
+ if (!preg_match("/^[a-zA-Z0-9\-\_]+$/", $objFormParam->getValue('Validate')) && !SC_Utils::isBlank($objFormParam->getValue('Validate'))) {
+ $arrErr['ECCUBE.Validate.ParamError'] = 'Validateの値が不正です。';
+ }
+ if (!preg_match("/^[a-zA-Z0-9\-\_\.]+$/", $objFormParam->getValue('Version')) && !SC_Utils::isBlank($objFormParam->getValue('Version'))) {
+ $arrErr['ECCUBE.Version.ParamError'] = 'Versionの値が不正です。';
+ }
+ return $arrErr;
+ }
}
変更: branches/version-2_13-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php
===================================================================
--- branches/version-2_13-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/db/dbfactory/SC_DB_DBFactory_MYSQL.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -150,7 +150,18 @@
*/
public function getDownloadableDaysWhereSql($dtb_order_alias = 'dtb_order')
{
- return '(SELECT IF((SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1)=1, 1, DATE(CURRENT_TIMESTAMP) <= DATE(DATE_ADD(' . $dtb_order_alias . '.payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY))))';
+ $sql = <<< __EOS__
+ (
+ SELECT
+ IF (
+ (SELECT d1.downloadable_days_unlimited FROM dtb_baseinfo d1) = 1 AND $dtb_order_alias.payment_date IS NOT NULL,
+ 1,
+ IF( DATE(CURRENT_TIMESTAMP) <= DATE(DATE_ADD($dtb_order_alias.payment_date, INTERVAL (SELECT downloadable_days FROM dtb_baseinfo) DAY)), 1, 0)
+ )
+ )
+__EOS__;
+
+ return $sql;
}
/**
変更: branches/version-2_13-dev/data/class/helper/SC_Helper_Customer.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_Customer.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_Customer.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -387,7 +387,7 @@
{
$objFormParam->addParam('お名前(姓)', $prefix . 'name01', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(名)', $prefix . 'name02', STEXT_LEN, 'aKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
- $objFormParam->addParam('会社名', $prefix . 'company_name', STEXT_LEN, 'aKV', array('NO_SPTAB', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('会社名', $prefix . 'company_name', STEXT_LEN, 'aKV', array('MAX_LENGTH_CHECK', 'SPTAB_CHECK'));
if (FORM_COUNTRY_ENABLE === false) {
$objFormParam->addParam('お名前(フリガナ・姓)', $prefix . 'kana01', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
$objFormParam->addParam('お名前(フリガナ・名)', $prefix . 'kana02', STEXT_LEN, 'CKV', array('EXIST_CHECK', 'NO_SPTAB', 'SPTAB_CHECK' ,'MAX_LENGTH_CHECK', 'KANA_CHECK'));
変更: branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_DB.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -1215,7 +1215,7 @@
$arrRawSql = array();
$where = 'rank BETWEEN ? AND ?';
if ($addWhere != '') {
- $where .= " AND $Where";
+ $where .= " AND $addWhere";
}
if ($newRank > $oldRank) {
//位置を上げる場合、他の商品の位置を1つ下げる（ランクを1下げる）
変更: branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_Mail.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -317,9 +317,11 @@
* @param string $secret_key 会員固有キー
* @param integer $customer_id 会員ID
* @param boolean $is_mobile false(default):PCアドレスにメールを送る true:携帯アドレスにメールを送る
+ * @param $resend_flg true 仮登録メール再送
* @return boolean true:成功 false:失敗
+ *
*/
- public function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false)
+ public function sfSendRegistMail($secret_key, $customer_id = '', $is_mobile = false, $resend_flg = false)
{
// 会員データの取得
if (SC_Utils_Ex::sfIsInt($customer_id)) {
@@ -343,14 +345,14 @@
$objMailText->assignobj($this);
$objHelperMail = new SC_Helper_Mail_Ex();
-
- // 仮会員が有効の場合
- if (CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1) {
+ // 仮会員が有効の場合
+ if (CUSTOMER_CONFIRM_MAIL == true and $arrCustomerData['status'] == 1 or $arrCustomerData['status'] == 1 and $resend_flg == true) {
$subject = $objHelperMail->sfMakeSubject('会員登録のご確認', $objMailText);
$toCustomerMail = $objMailText->fetch('mail_templates/customer_mail.tpl');
} else {
$subject = $objHelperMail->sfMakeSubject('会員登録のご完了', $objMailText);
$toCustomerMail = $objMailText->fetch('mail_templates/customer_regist_mail.tpl');
+
}
$objMail = new SC_SendMail_Ex();
変更: branches/version-2_13-dev/data/class/helper/SC_Helper_PageLayout.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_PageLayout.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_PageLayout.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -56,14 +56,14 @@
}
if (empty($arrPageData[0])) {
- trigger_error('ページ情報を取得できませんでした。', E_USER_ERROR);
+ trigger_error('ページ情報を取得できませんでした。', E_USER_WARNING);
}
$objPage->tpl_mainpage = $this->getTemplatePath($device_type_id) . $arrPageData[0]['filename'] . '.tpl';
if (!file_exists($objPage->tpl_mainpage)) {
$msg = 'メイン部のテンプレートが存在しません。[' . $objPage->tpl_mainpage . ']';
- trigger_error($msg, E_USER_ERROR);
+ trigger_error($msg, E_USER_WARNING);
}
$objPage->arrPageLayout =& $arrPageData[0];
@@ -263,7 +263,7 @@
* @access public
* @param integer $device_type_id 端末種別ID
* @param integer $page_id ページID
- * @return 編集可能ページの翫 true
+ * @return 編集可能ページの 合 true
*/
public function isEditablePage($device_type_id, $page_id)
{
変更: branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_Purchase.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -1341,8 +1341,21 @@
return $objQuery->nextVal('dtb_order_order_id');
}
-
+
/**
+ * 決済処理中スタータスの受注データのキャンセル処理
+ * @param $cancel_flg 決済処理中ステータスのロールバックをするか(true:する false:しない)
+ */
+ public function cancelPendingOrder($cancel_flg)
+ {
+ if($cancel_flg == true){
+ $this->checkDbAllPendingOrder();
+ $this->checkDbMyPendignOrder();
+ $this->checkSessionPendingOrder();
+ }
+ }
+
+ /**
* 決済処理中スタータスの全受注検索
*/
public function checkDbAllPendingOrder()
@@ -1357,7 +1370,7 @@
if (!SC_Utils_Ex::isBlank($arrOrders)) {
foreach ($arrOrders as $arrOrder) {
$order_id = $arrOrder['order_id'];
- SC_Helper_Purchase_Ex::cancelOrder($order_id, ORDER_CANCEL, false);
+ SC_Helper_Purchase_Ex::cancelOrder($order_id, ORDER_CANCEL, true);
GC_Utils_Ex::gfPrintLog('order cancel.(time expire) order_id=' . $order_id);
}
}
変更: branches/version-2_13-dev/data/class/helper/SC_Helper_TaxRule.php
===================================================================
--- branches/version-2_13-dev/data/class/helper/SC_Helper_TaxRule.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/helper/SC_Helper_TaxRule.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -116,7 +116,7 @@
}
/**
- * 現在有効な税金設定情報を返す
+ * 現在有効な税率設定情報を返す
*
* @param integer $price 計算対象の金額
* @return array 税設定情報
@@ -222,7 +222,7 @@
}
/**
- * 税金設定情報を登録する（商品管理用）
+ * 税率設定情報を登録する（商品管理用）
*
* @param decimal $tax_rate 消費税率
* @param integer $product_id 商品ID
@@ -249,7 +249,7 @@
}
/**
- * 税金設定情報を登録する（仮）リファクタする（memo：規格設定後に商品編集を行うと消費税が0になるのを対応が必要）
+ * 税率設定情報を登録する（仮）リファクタする（memo：規格設定後に商品編集を行うと消費税が0になるのを対応が必要）
*
* @param
* @return
変更: branches/version-2_13-dev/data/class/pages/LC_Page_Index.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/LC_Page_Index.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/LC_Page_Index.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -63,9 +63,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$this->tpl_title = '';
$objCustomer = new SC_Customer_Ex();
変更: branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_Tax.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -24,7 +24,7 @@
require_once CLASS_EX_REALDIR . 'page_extends/admin/LC_Page_Admin_Ex.php';
/**
- * 税金設定 のページクラス.
+ * 税率設定 のページクラス.
*
* @package Page
* @author LOCKON CO.,LTD.
@@ -47,7 +47,7 @@
$this->tpl_subno = 'tax';
$this->tpl_mainno = 'basis';
$this->tpl_maintitle = '基本情報管理';
- $this->tpl_subtitle = '税金設定';
+ $this->tpl_subtitle = '税率設定';
$masterData = new SC_DB_MasterData_Ex();
$this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrTAXCALCRULE = $masterData->getMasterData('mtb_taxrule');
変更: branches/version-2_13-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -186,11 +186,12 @@
//対象となるデータが見つからない、または削除済み
return false;
}
+ //仮登録メール再送
+ $resend_flg = true;
// 登録メール再送
$objHelperMail = new SC_Helper_Mail_Ex();
$objHelperMail->setPage($this);
- $objHelperMail->sfSendRegistMail($arrData['secret_key'], $customer_id);
-
+ $objHelperMail->sfSendRegistMail($arrData['secret_key'], $customer_id, null, $resend_flg);
return true;
}
変更: branches/version-2_13-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -152,7 +152,7 @@
// query:配信履歴から「確認」
case 'query':
if (SC_Utils_Ex::sfIsInt($_GET['send_id'])) {
- $this->arrSearchData = $this->lfGetMailQuery();
+ $this->arrSearchData = $this->lfGetMailQuery($_GET['send_id']);
}
$this->setTemplate('mail/query.tpl');
break;
@@ -280,7 +280,7 @@
/**
* 配信履歴から条件を取得する
*
- * @param integer $send_id 堺ソ。螻・豁エ逡ェ蜿キ
+ * @param integer $send_id縲信履歴番号
* @return array
*/
public function lfGetMailQuery($send_id)
変更: branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -38,12 +38,15 @@
'shipping_name02',
'shipping_kana01',
'shipping_kana02',
+ 'shipping_company_name',
'shipping_tel01',
'shipping_tel02',
'shipping_tel03',
'shipping_fax01',
'shipping_fax02',
'shipping_fax03',
+ 'shipping_country_id',
+ 'shipping_zipcode',
'shipping_pref',
'shipping_zip01',
'shipping_zip02',
@@ -83,6 +86,7 @@
$this->arrPref = $masterData->getMasterData('mtb_pref');
$this->arrORDERSTATUS = $masterData->getMasterData('mtb_order_status');
$this->arrDeviceType = $masterData->getMasterData('mtb_device_type');
+ $this->arrCountry = $masterData->getMasterData('mtb_country');
// 支払い方法の取得
$this->arrPayment = SC_Helper_Payment_Ex::getIDValueList();
@@ -145,7 +149,12 @@
$objFormParam->addParam('注文者 お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('注文者 会社名', 'order_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
+ if (FORM_COUNTRY_ENABLE) {
+ $objFormParam->addParam('国', 'order_country_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
+ $objFormParam->addParam('ZIPCODE', 'order_zipcode', STEXT_LEN, 'n', array('NO_SPTAB', 'SPTAB_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
+ }
$objFormParam->addParam('郵便番号1', 'order_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
$objFormParam->addParam('郵便番号2', 'order_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
$objFormParam->addParam('都道府県', 'order_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -212,6 +221,11 @@
$objFormParam->addParam('お名前2', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ $objFormParam->addParam('会社名', 'shipping_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
+ if (FORM_COUNTRY_ENABLE) {
+ $objFormParam->addParam('国', 'shipping_country_id', INT_LEN, 'n', array('EXIST_CHECK', 'NUM_CHECK'));
+ $objFormParam->addParam('ZIPCODE', 'shipping_zipcode', STEXT_LEN, 'n', array('NO_SPTAB', 'SPTAB_CHECK', 'GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
+ }
$objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
$objFormParam->addParam('郵便番号2', 'shipping_zip02', ZIP02_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
$objFormParam->addParam('都道府県', 'shipping_pref', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
変更: branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -324,7 +324,7 @@
$objFormParam->addParam('注文者 お名前(名)', 'order_name02', STEXT_LEN, 'KVa', array('EXIST_CHECK', 'SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
$objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
$objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('注文者 会社名', 'order_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+ $objFormParam->addParam('注文者 会社名', 'order_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK'));
$objFormParam->addParam('国', 'order_country_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('ZIPCODE', 'order_zipcode', STEXT_LEN, 'n', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
@@ -399,7 +399,7 @@
$objFormParam->addParam('お名前(名)', 'shipping_name02', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
$objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
$objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
- $objFormParam->addParam('会社名', 'shipping_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB'));
+ $objFormParam->addParam('会社名', 'shipping_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('国', 'shipping_country_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('ZIPCODE', 'shipping_zipcode', STEXT_LEN, 'n', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam('郵便番号1', 'shipping_zip01', ZIP01_LEN, 'n', array('NUM_CHECK', 'NUM_COUNT_CHECK'));
@@ -1088,18 +1088,22 @@
public function setProductsQuantity(&$objFormParam)
{
$arrShipmentsItems = $objFormParam->getSwapArray(array('shipment_product_class_id','shipment_quantity'));
- foreach ($arrShipmentsItems as $arritems) {
- foreach ($arritems['shipment_product_class_id'] as $relation_index => $shipment_product_class_id) {
- $arrUpdateQuantity[$shipment_product_class_id] += $arritems['shipment_quantity'][$relation_index];
+
+ // 配送先が存在する時のみ、商品個数の再設定を行います
+ if(!SC_Utils_Ex::isBlank($arrShipmentsItems)) {
+ foreach ($arrShipmentsItems as $arritems) {
+ foreach ($arritems['shipment_product_class_id'] as $relation_index => $shipment_product_class_id) {
+ $arrUpdateQuantity[$shipment_product_class_id] += $arritems['shipment_quantity'][$relation_index];
+ }
}
- }
- $arrProductsClass = $objFormParam->getValue('product_class_id');
- $arrProductsQuantity = $objFormParam->getValue('quantity');
- foreach ($arrProductsClass as $relation_key => $product_class_id) {
- $arrQuantity['quantity'][$relation_key] = $arrUpdateQuantity[$product_class_id];
+ $arrProductsClass = $objFormParam->getValue('product_class_id');
+ $arrProductsQuantity = $objFormParam->getValue('quantity');
+ foreach ($arrProductsClass as $relation_key => $product_class_id) {
+ $arrQuantity['quantity'][$relation_key] = $arrUpdateQuantity[$product_class_id];
+ }
+ $objFormParam->setParam($arrQuantity);
}
- $objFormParam->setParam($arrQuantity);
}
/**
変更: branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/admin/products/LC_Page_Admin_Products_ProductClass.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -198,7 +198,9 @@
$objFormParam->addParam('在庫数', 'stock_unlimited', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam(NORMAL_PRICE_TITLE, 'price01', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
$objFormParam->addParam(SALE_PRICE_TITLE, 'price02', PRICE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
- $objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+ if(OPTION_PRODUCT_TAX_RULE) {
+ $objFormParam->addParam('消費税率', 'tax_rate', PERCENTAGE_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK'));
+ }
$objFormParam->addParam('商品種別', 'product_type_id', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('削除フラグ', 'del_flg', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('ダウンロード販売用ファイル名', 'down_filename', STEXT_LEN, 'KVa', array('MAX_LENGTH_CHECK'));
@@ -278,7 +280,9 @@
$objQuery->insert('dtb_products_class', $arrPC);
// 税情報登録/更新
- SC_Helper_TaxRule_Ex::setTaxRuleForProduct($arrList['tax_rate'][$i], $arrPC['product_id'], $arrPC['product_class_id']);
+ if (OPTION_PRODUCT_TAX_RULE) {
+ SC_Helper_TaxRule_Ex::setTaxRuleForProduct($arrList['tax_rate'][$i], $arrPC['product_id'], $arrPC['product_class_id']);
+ }
}
// 規格無し用の商品規格を非表示に
@@ -349,7 +353,7 @@
/*
* 消費税率の必須チェック
*/
- if (SC_Utils_Ex::isBlank($arrValues['tax_rate'][$i])) {
+ if (OPTION_PRODUCT_TAX_RULE && SC_Utils_Ex::isBlank($arrValues['tax_rate'][$i])) {
$arrErr['tax_rate'][$i] = '※ 消費税率が入力されていません。<br />';
}
/*
@@ -497,9 +501,12 @@
} else {
$arrValues['del_flg'] = '0';
}
+
// 消費税率を設定
- $arrRet = SC_Helper_TaxRule_Ex::getTaxRule($arrValues['product_id'], $arrValues['product_class_id']);
- $arrValues['tax_rate'] = $arrRet['tax_rate'];
+ if (OPTION_PRODUCT_TAX_RULE) {
+ $arrRet = SC_Helper_TaxRule_Ex::getTaxRule($arrValues['product_id'], $arrValues['product_class_id']);
+ $arrValues['tax_rate'] = $arrRet['tax_rate'];
+ }
$arrMergeProductsClass[] = $arrValues;
}
変更: branches/version-2_13-dev/data/class/pages/cart/LC_Page_Cart.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/cart/LC_Page_Cart.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/cart/LC_Page_Cart.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -75,9 +75,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objCartSess = new SC_CartSession_Ex();
$objSiteSess = new SC_SiteSession_Ex();
変更: branches/version-2_13-dev/data/class/pages/entry/LC_Page_Entry.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/entry/LC_Page_Entry.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/entry/LC_Page_Entry.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -76,9 +76,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objFormParam = new SC_FormParam_Ex();
変更: branches/version-2_13-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/entry/LC_Page_Entry_Kiyaku.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -64,9 +64,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- SC_Helper_Purchase_Ex::checkSessionPendingOrder();
- SC_Helper_Purchase_Ex::checkDbMyPendignOrder();
- SC_Helper_Purchase_Ex::checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$arrKiyaku = $this->lfGetKiyakuData();
$this->max = count($arrKiyaku);
変更: branches/version-2_13-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/frontparts/LC_Page_FrontParts_LoginCheck.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -65,9 +65,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
// 会員管理クラス
$objCustomer = new SC_Customer_Ex();
変更: branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -74,9 +74,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objCustomer = new SC_Customer_Ex();
$customer_id = $objCustomer->getValue('customer_id');
変更: branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Favorite.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -83,6 +83,12 @@
$this->arrFavorite = $this->lfGetFavoriteProduct($customer_id, $this);
SC_Product_Ex::setPriceTaxTo($this->arrFavorite);
+
+ // 一覧メイン画像の指定が無い商品のための処理
+ foreach ($this->arrFavorite as $key => $val) {
+ $this->arrFavorite[$key]['main_list_image'] = SC_Utils_Ex::sfNoImageMainList($val['main_list_image']);
+ }
+
echo SC_Utils_Ex::jsonEncode($this->arrFavorite);
SC_Response_Ex::actionExit();
break;
変更: branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_History.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_History.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_History.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -72,12 +72,9 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- SC_Helper_Purchase_Ex::checkSessionPendingOrder();
- SC_Helper_Purchase_Ex::checkDbMyPendignOrder();
- SC_Helper_Purchase_Ex::checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objCustomer = new SC_Customer_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$objProduct = new SC_Product();
if (!SC_Utils_Ex::sfIsInt($_GET['order_id'])) {
変更: branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Login.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -62,9 +62,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
SC_Response_Ex::sendRedirect(DIR_INDEX_PATH);
}
変更: branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -62,9 +62,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
//受注詳細データの取得
$arrOrderDetail = $this->lfGetOrderDetail($_POST['order_id']);
変更: branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_Detail.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -100,9 +100,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
// 会員クラス
$objCustomer = new SC_Customer_Ex();
変更: branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/products/LC_Page_Products_List.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -93,9 +93,7 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objProduct = new SC_Product_Ex();
// パラメーター管理クラス
変更: branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -77,15 +77,12 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objCustomer = new SC_Customer_Ex();
$objCookie = new SC_Cookie_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$objFormParam = new SC_FormParam_Ex();
$nonmember_mainpage = 'shopping/nonmember_input.tpl';
変更: branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -73,14 +73,11 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objCartSess = new SC_CartSession_Ex();
$objSiteSess = new SC_SiteSession_Ex();
$objCustomer = new SC_Customer_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$this->is_multiple = $objPurchase->isMultiple();
変更: branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -68,14 +68,11 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
$objCustomer = new SC_Customer_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$objFormParam = new SC_FormParam_Ex();
$objAddress = new SC_Helper_Address_Ex();
変更: branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -65,13 +65,10 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$objCustomer = new SC_Customer_Ex();
$objFormParam = new SC_FormParam_Ex();
$objAddress = new SC_Helper_Address_Ex();
@@ -135,6 +132,7 @@
$objFormParam->addParam('メイン画像', 'main_image');
$objFormParam->addParam('メイン一覧画像', 'main_list_image');
$objFormParam->addParam(SALE_PRICE_TITLE, 'price');
+ $objFormParam->addParam(SALE_PRICE_TITLE . '(税込)', 'price_inctax');
$objFormParam->addParam('数量', 'quantity', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'), 1);
$objFormParam->addParam('お届け先', 'shipping', INT_LEN, 'n', array('MAX_LENGTH_CHECK', 'NUM_CHECK'));
$objFormParam->addParam('カート番号', 'cart_no', INT_LEN, 'n', array('EXIST_CHECK', 'MAX_LENGTH_CHECK', 'NUM_CHECK'));
@@ -162,6 +160,7 @@
}
$arrItems['quantity'][$index] = 1;
$arrItems['price'][$index] = $cartLists[$key]['price'];
+ $arrItems['price_inctax'][$index] = $cartLists[$key]['price_inctax'];
$index++;
}
}
変更: branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -73,13 +73,10 @@
{
//決済処理中ステータスのロールバック
$objPurchase = new SC_Helper_Purchase_Ex();
- $objPurchase->checkSessionPendingOrder();
- $objPurchase->checkDbMyPendignOrder();
- $objPurchase->checkDbAllPendingOrder();
+ $objPurchase->cancelPendingOrder(PENDING_ORDER_CANCEL_FLAG);
$objSiteSess = new SC_SiteSession_Ex();
$objCartSess = new SC_CartSession_Ex();
- $objPurchase = new SC_Helper_Purchase_Ex();
$objCustomer = new SC_Customer_Ex();
$objFormParam = new SC_FormParam_Ex();
$objDelivery = new SC_Helper_Delivery_Ex();
変更: branches/version-2_13-dev/data/class/plugin/SC_Plugin_Installer.php
===================================================================
--- branches/version-2_13-dev/data/class/plugin/SC_Plugin_Installer.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class/plugin/SC_Plugin_Installer.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -74,54 +74,64 @@
$objQuery =& SC_Query_Ex::getSingletonInstance();
// SQLの実行
- foreach ($arrSql as $sql) {
- $this->log("exec sql: " . $sql['sql']);
- $objQuery->query($sql['sql'], $sql['params']);
+ if(!SC_Utils_Ex::isBlank($arrSql)) {
+ foreach ($arrSql as $sql) {
+ $this->log("exec sql: " . $sql['sql']);
+ $objQuery->query($sql['sql'], $sql['params']);
+ }
}
$arrInsertQuery = $this->arrInstallData['insert'];
- foreach ($arrInsertQuery as $query) {
- $objQuery->insert(
- $query['table'],
- $query['arrVal'],
- $query['arrSql'],
- $query['arrSqlVal'],
- $query['form'],
- $query['arrFromVal']
- );
+ if(!SC_Utils_Ex::isBlank($arrInsertQuery)) {
+ foreach ($arrInsertQuery as $query) {
+ $objQuery->insert(
+ $query['table'],
+ $query['arrVal'],
+ $query['arrSql'],
+ $query['arrSqlVal'],
+ $query['form'],
+ $query['arrFromVal']
+ );
+ }
}
$arrUpdateQuery = $this->arrInstallData['update'];
- foreach ($arrUpdateQuery as $query) {
- $objQuery->update(
- $query['table'],
- $query['arrVal'],
- $query['where'],
- $query['arrWhereVal'],
- $query['arrRawSql'],
- $query['arrRawSqlVal']
- );
+ if(!SC_Utils_Ex::isBlank($arrUpdateQuery)) {
+ foreach ($arrUpdateQuery as $query) {
+ $objQuery->update(
+ $query['table'],
+ $query['arrVal'],
+ $query['where'],
+ $query['arrWhereVal'],
+ $query['arrRawSql'],
+ $query['arrRawSqlVal']
+ );
+ }
}
// プラグインのディレクトリコピー
$arrCopyDirectories = $this->arrInstallData['copy_directory'];
- foreach ($arrCopyDirectories as $directory) {
- $this->log("exec dir copy: " . $directory['src'] . ' -> ' . $directory['dist']);
- // ディレクトリコピー -> HTML配下とDATA配下を別関数にする
- SC_Utils::copyDirectory(
- PLUGIN_UPLOAD_REALDIR . $plugin_code . DIRECTORY_SEPARATOR . $directory['src'],
- PLUGIN_HTML_REALDIR . $plugin_code . DIRECTORY_SEPARATOR . $directory['dist']);
+ if(!SC_Utils_Ex::isBlank($arrCopyDirectories)) {
+ foreach ($arrCopyDirectories as $directory) {
+ $this->log("exec dir copy: " . $directory['src'] . ' -> ' . $directory['dist']);
+ // ディレクトリコピー -> HTML配下とDATA配下を別関数にする
+ SC_Utils::copyDirectory(
+ PLUGIN_UPLOAD_REALDIR . $plugin_code . DIRECTORY_SEPARATOR . $directory['src'],
+ PLUGIN_HTML_REALDIR . $plugin_code . DIRECTORY_SEPARATOR . $directory['dist']);
+ }
}
// プラグインのファイルコピー
$arrCopyFiles = $this->arrInstallData['copy_file'];
- foreach ($arrCopyFiles as $file) {
- $this->log("exec file copy: " . $file['src'] . ' -> ' . $file['dist']);
- // ファイルコピー
- copy(PLUGIN_UPLOAD_REALDIR . $plugin_code . DIRECTORY_SEPARATOR . $file['src'],
- PLUGIN_HTML_REALDIR . $plugin_code . DIRECTORY_SEPARATOR . $file['dist']);
+ if(!SC_Utils_Ex::isBlank($arrCopyFiles)) {
+ foreach ($arrCopyFiles as $file) {
+ $this->log("exec file copy: " . $file['src'] . ' -> ' . $file['dist']);
+ // ファイルコピー
+ copy(PLUGIN_UPLOAD_REALDIR . $plugin_code . DIRECTORY_SEPARATOR . $file['src'],
+ PLUGIN_HTML_REALDIR . $plugin_code . DIRECTORY_SEPARATOR . $file['dist']);
+ }
}
$this->log("end");
変更: branches/version-2_13-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tax_Ex.php
===================================================================
--- branches/version-2_13-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tax_Ex.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/class_extends/page_extends/admin/basis/LC_Page_Admin_Basis_Tax_Ex.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -24,7 +24,7 @@
require_once CLASS_REALDIR . 'pages/admin/basis/LC_Page_Admin_Basis_Tax.php';
/**
- * 税金管理 のページクラス(拡張).
+ * 税率管理 のページクラス(拡張).
*
* LC_Page_Admin_Basis_Tax をカスタマイズする場合はこのクラスを編集する.
*
変更: branches/version-2_13-dev/data/mtb_constants_init.php
===================================================================
--- branches/version-2_13-dev/data/mtb_constants_init.php 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/data/mtb_constants_init.php 2013-09-19 02:49:03 UTC (rev 23230)
@@ -482,5 +482,7 @@
define('TAX_RULE_PRIORITY', "product_id,product_class_id,pref_id,country_id");
/** 決済処理中ステータスのロールバックを行う時間の設定(秒) */
define('PENDING_ORDER_CANCEL_TIME', 900);
-
-
+/** 決済処理中ステータスのロールバックをするか(true:する false:しない) */
+define('PENDING_ORDER_CANCEL_FLAG', true);
+/** API機能を有効にする(true:する false:しない) */
+define('API_ENABLE_FLAG', false);
\ No newline at end of file
変更: branches/version-2_13-dev/html/install/sql/insert_data.sql
===================================================================
--- branches/version-2_13-dev/html/install/sql/insert_data.sql 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/html/install/sql/insert_data.sql 2013-09-19 02:49:03 UTC (rev 23230)
@@ -310,84 +310,86 @@
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (74, 2, 'name02', 'お名前(名)', 3, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (75, 2, 'kana01', 'お名前(フリガナ・姓)', 4, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (76, 2, 'kana02', 'お名前(フリガナ・名)', 5, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (77, 2, 'zip01', '郵便番号1', 6, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (78, 2, 'zip02', '郵便番号2', 7, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (79, 2, '(SELECT name FROM mtb_pref WHERE mtb_pref.id = dtb_customer.pref) as pref', '都道府県', 8, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (80, 2, 'addr01', '住所1', 9, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (81, 2, 'addr02', '住所2', 10, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (82, 2, 'email', 'E-MAIL', 11, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (83, 2, 'tel01', 'TEL1', 12, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (84, 2, 'tel02', 'TEL2', 13, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (85, 2, 'tel03', 'TEL3', 14, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (86, 2, 'fax01', 'FAX1', 15, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (87, 2, 'fax02', 'FAX2', 16, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (88, 2, 'fax03', 'FAX3', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (89, 2, '(SELECT name FROM mtb_sex WHERE mtb_sex.id = dtb_customer.sex) as sex', '性別', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (90, 2, '(SELECT name FROM mtb_job WHERE mtb_job.id = dtb_customer.job) as job', '職業', 19, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (91, 2, 'birth', '誕生日', 20, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (92, 2, 'first_buy_date', '初回購入日', 21, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (93, 2, 'last_buy_date', '最終購入日', 22, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (94, 2, 'buy_times', '購入回数', 23, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (95, 2, 'point', 'ポイント残高', 24, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (96, 2, 'note', '備考', 25, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (97, 2, 'create_date', '登録日', 26, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (98, 2, 'update_date', '更新日', 27, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
-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 (99, 3, 'order_id', '注文番号', 1, 3, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
-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 (100, 3, 'customer_id', '会員ID', 2, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
-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 (101, 3, 'message', '要望等', 3, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
-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 (102, 3, 'order_name01', 'お名前(姓)', 4, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK');
-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 (103, 3, 'order_name02', 'お名前(名)', 5, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK');
-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 (104, 3, 'order_kana01', 'お名前(フリガナ・姓)', 6, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVCa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
-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 (105, 3, 'order_kana02', 'お名前(フリガナ名)', 7, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVCa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
-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 (106, 3, 'order_email', 'メールアドレス', 8, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'a', 'null', 'NO_SPTAB,EMAIL_CHECK,EMAIL_CHAR_CHECK');
-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 (107, 3, 'order_tel01', '電話番号1', 9, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (108, 3, 'order_tel02', '電話番号2', 10, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (109, 3, 'order_tel03', '電話番号3', 11, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (110, 3, 'order_fax01', 'FAX1', 12, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (111, 3, 'order_fax02', 'FAX2', 13, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (112, 3, 'order_fax03', 'FAX3', 14, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (113, 3, 'order_zip01', '郵便番号1', 15, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'ZIP01_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK,NUM_COUNT_CHECK');
-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 (114, 3, 'order_zip02', '郵便番号2', 16, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'ZIP02_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK,NUM_COUNT_CHECK');
-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 (115, 3, '(SELECT name FROM mtb_pref WHERE mtb_pref.id = dtb_order.order_pref) as pref', '都道府県', 17, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (116, 3, 'order_addr01', '住所1', 18, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'MTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,NUM_CHECK');
-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 (117, 3, 'order_addr02', '住所2', 19, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'MTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,NUM_CHECK');
-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 (118, 3, 'order_sex', '性別', 20, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (119, 3, 'order_birth', '生年月日', 21, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (120, 3, 'order_job', '職種', 22, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (121, 3, 'subtotal', '小計', 38, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (122, 3, 'discount', '値引き', 39, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (123, 3, 'deliv_fee', '送料', 40, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (124, 3, 'charge', '手数料', 41, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (125, 3, 'use_point', '使用ポイント', 42, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (126, 3, 'add_point', '加算ポイント', 43, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (127, 3, 'tax', '税金', 44, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (128, 3, 'total', '合計', 45, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (129, 3, 'payment_total', 'お支払い合計', 46, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
-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 (130, 3, 'deliv_id', '配送業者ID', 47, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
-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 (131, 3, 'payment_method', '支払い方法', 48, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
-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 (132, 3, 'note', 'SHOPメモ', 50, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LLTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
-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 (133, 3, 'status', '対応状況', 51, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
-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 (134, 3, 'create_date', '注文日時', 52, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'a', '', 'CHECK_DATE');
-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 (135, 3, 'update_date', '更新日時', 53, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'a', '', 'CHECK_DATE');
-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 (136, 3, 'commit_date', '発送完了日時', 54, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'a', '', 'CHECK_DATE');
-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 (137, 3, 'device_type_id', '端末種別ID', 55, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
-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 (138, 3, '(SELECT COUNT(shipping_id) as shipping_target_num FROM dtb_shipping WHERE dtb_shipping.order_id = dtb_order.order_id) as shipping_num', '配送先数', 56, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
-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 (139, 3, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT shipping_id FROM dtb_shipping WHERE dtb_shipping.order_id = dtb_order.order_id), '','')) as shipping_ids', '配送情報ID', 57, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
-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 (140, 4, 'B.name', '商品名', 1, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
-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 (141, 4, '(SELECT name FROM mtb_disp WHERE mtb_disp.id = A.status) as status', 'レビュー表示', 2, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
-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 (142, 4, 'A.create_date', '投稿日', 3, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'a', '', 'CHECK_DATE,EXIST_CHECK');
-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 (143, 4, 'A.reviewer_name', '投稿者名', 4, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
-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 (144, 4, 'A.reviewer_url', '投稿者URL', 5, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVas', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
-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 (145, 4, '(SELECT name FROM mtb_sex WHERE mtb_sex.id = A.sex) as sex', '性別', 6, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
-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 (146, 4, '(SELECT name FROM mtb_recommend WHERE mtb_recommend.id = A.recommend_level) as recommend_level', 'おすすめレベル', 7, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
-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 (147, 4, 'A.title', 'タイトル', 8, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
-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 (148, 4, 'A.comment', 'コメント', 9, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LTEXT_LEN', 'MAX_LENGTH_CHECK');
-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 (149, 5, 'category_id', 'カテゴリID', 1, 3, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
-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 (150, 5, 'category_name', 'カテゴリ名', 2, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK');
-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 (151, 5, 'parent_category_id', '親カテゴリID', 3, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
-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 (152, 5, 'level', '階層', NULL, 2, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
-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 (153, 5, 'rank', '表示ランク', NULL, 2, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
-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 (154, 5, 'del_flg', '削除フラグ', NULL, 1, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date, mb_convert_kana_option) VALUES (77, 2, 'company_name', '会社名', 6, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa');
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (78, 2, 'zip01', '郵便番号1', 7, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (79, 2, 'zip02', '郵便番号2', 8, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (80, 2, '(SELECT name FROM mtb_pref WHERE mtb_pref.id = dtb_customer.pref) as pref', '都道府県', 9, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (81, 2, 'addr01', '住所1', 10, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (82, 2, 'addr02', '住所2', 11, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (83, 2, 'email', 'E-MAIL', 12, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (84, 2, 'tel01', 'TEL1', 13, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (85, 2, 'tel02', 'TEL2', 14, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (86, 2, 'tel03', 'TEL3', 15, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (87, 2, 'fax01', 'FAX1', 16, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (88, 2, 'fax02', 'FAX2', 17, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (89, 2, 'fax03', 'FAX3', 18, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (90, 2, '(SELECT name FROM mtb_sex WHERE mtb_sex.id = dtb_customer.sex) as sex', '性別', 19, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (91, 2, '(SELECT name FROM mtb_job WHERE mtb_job.id = dtb_customer.job) as job', '職業', 20, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (92, 2, 'birth', '誕生日', 21, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (93, 2, 'first_buy_date', '初回購入日', 22, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (94, 2, 'last_buy_date', '最終購入日', 23, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (95, 2, 'buy_times', '購入回数', 24, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (96, 2, 'point', 'ポイント残高', 25, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (97, 2, 'note', '備考', 26, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (98, 2, 'create_date', '登録日', 27, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, status, create_date, update_date) VALUES (99, 2, 'update_date', '更新日', 28, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
+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 (100, 3, 'order_id', '注文番号', 1, 3, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+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 (101, 3, 'customer_id', '会員ID', 2, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+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 (102, 3, 'message', '要望等', 3, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
+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 (103, 3, 'order_name01', 'お名前(姓)', 4, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK');
+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 (104, 3, 'order_name02', 'お名前(名)', 5, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK');
+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 (105, 3, 'order_kana01', 'お名前(フリガナ・姓)', 6, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVCa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
+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 (106, 3, 'order_kana02', 'お名前(フリガナ名)', 7, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVCa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
+INSERT INTO dtb_csv (no, csv_id, col, disp_name, rank, rw_flg, status, create_date, update_date, mb_convert_kana_option) VALUES (107, 3, 'order_company_name', '会社名', 8, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa');
+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 (108, 3, 'order_email', 'メールアドレス', 9, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'a', 'null', 'NO_SPTAB,EMAIL_CHECK,EMAIL_CHAR_CHECK');
+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 (109, 3, 'order_tel01', '電話番号1', 10, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (110, 3, 'order_tel02', '電話番号2', 11, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (111, 3, 'order_tel03', '電話番号3', 12, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (112, 3, 'order_fax01', 'FAX1', 13, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (113, 3, 'order_fax02', 'FAX2', 14, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (114, 3, 'order_fax03', 'FAX3', 15, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'TEL_ITEM_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (115, 3, 'order_zip01', '郵便番号1', 16, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'ZIP01_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK,NUM_COUNT_CHECK');
+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 (116, 3, 'order_zip02', '郵便番号2', 17, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'ZIP02_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK,NUM_COUNT_CHECK');
+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 (117, 3, '(SELECT name FROM mtb_pref WHERE mtb_pref.id = dtb_order.order_pref) as pref', '都道府県', 18, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (118, 3, 'order_addr01', '住所1', 19, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'MTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,NUM_CHECK');
+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 (119, 3, 'order_addr02', '住所2', 20, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'MTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,NUM_CHECK');
+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 (120, 3, 'order_sex', '性別', 21, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (121, 3, 'order_birth', '生年月日', 22, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (122, 3, 'order_job', '職種', 23, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (123, 3, 'subtotal', '小計', 38, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (124, 3, 'discount', '値引き', 39, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (125, 3, 'deliv_fee', '送料', 40, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (126, 3, 'charge', '手数料', 41, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (127, 3, 'use_point', '使用ポイント', 42, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (128, 3, 'add_point', '加算ポイント', 43, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (129, 3, 'tax', '税金', 44, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (130, 3, 'total', '合計', 45, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (131, 3, 'payment_total', 'お支払い合計', 46, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'PRICE_LEN', 'MAX_LENGTH_CHECK,NUM_CHECK');
+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 (132, 3, 'deliv_id', '配送業者ID', 47, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+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 (133, 3, 'payment_method', '支払い方法', 48, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
+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 (134, 3, 'note', 'SHOPメモ', 50, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LLTEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
+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 (135, 3, 'status', '対応状況', 51, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+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 (136, 3, 'create_date', '注文日時', 52, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'a', '', 'CHECK_DATE');
+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 (137, 3, 'update_date', '更新日時', 53, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'a', '', 'CHECK_DATE');
+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 (138, 3, 'commit_date', '発送完了日時', 54, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'a', '', 'CHECK_DATE');
+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 (139, 3, 'device_type_id', '端末種別ID', 55, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+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 (140, 3, '(SELECT COUNT(shipping_id) as shipping_target_num FROM dtb_shipping WHERE dtb_shipping.order_id = dtb_order.order_id) as shipping_num', '配送先数', 56, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
+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 (141, 3, '(SELECT ARRAY_TO_STRING(ARRAY(SELECT shipping_id FROM dtb_shipping WHERE dtb_shipping.order_id = dtb_order.order_id), '','')) as shipping_ids', '配送情報ID', 57, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK');
+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 (142, 4, 'B.name', '商品名', 1, 2, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
+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 (143, 4, '(SELECT name FROM mtb_disp WHERE mtb_disp.id = A.status) as status', 'レビュー表示', 2, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
+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 (144, 4, 'A.create_date', '投稿日', 3, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'a', '', 'CHECK_DATE,EXIST_CHECK');
+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 (145, 4, 'A.reviewer_name', '投稿者名', 4, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
+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 (146, 4, 'A.reviewer_url', '投稿者URL', 5, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVas', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
+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 (147, 4, '(SELECT name FROM mtb_sex WHERE mtb_sex.id = A.sex) as sex', '性別', 6, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
+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 (148, 4, '(SELECT name FROM mtb_recommend WHERE mtb_recommend.id = A.recommend_level) as recommend_level', 'おすすめレベル', 7, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+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 (149, 4, 'A.title', 'タイトル', 8, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'MAX_LENGTH_CHECK');
+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 (150, 4, 'A.comment', 'コメント', 9, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'LTEXT_LEN', 'MAX_LENGTH_CHECK');
+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 (151, 5, 'category_id', 'カテゴリID', 1, 3, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+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 (152, 5, 'category_name', 'カテゴリ名', 2, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'KVa', 'STEXT_LEN', 'SPTAB_CHECK,MAX_LENGTH_CHECK,EXIST_CHECK');
+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 (153, 5, 'parent_category_id', '親カテゴリID', 3, 1, 1, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+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 (154, 5, 'level', '階層', NULL, 2, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+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 (155, 5, 'rank', '表示ランク', NULL, 2, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
+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 (156, 5, 'del_flg', '削除フラグ', NULL, 1, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP, 'n', 'INT_LEN', 'NUM_CHECK,MAX_LENGTH_CHECK');
INSERT INTO dtb_deliv (deliv_id, product_type_id, name, service_name, confirm_url, rank, status, del_flg, creator_id, create_date, update_date) VALUES (1, 1, 'サンプル業者', 'サンプル業者', NULL, 2, 1, 0, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
INSERT INTO dtb_deliv (deliv_id, product_type_id, name, service_name, confirm_url, rank, status, del_flg, creator_id, create_date, update_date) VALUES (2, 2, '配送無し(ダウンロード商品用)', 'なし', NULL, 1, 1, 0, 2, CURRENT_TIMESTAMP, CURRENT_TIMESTAMP);
@@ -1263,6 +1265,8 @@
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('OPTION_PRODUCT_TAX_RULE', '0', 1415, '商品ごとの税率設定(軽減税率対応 有効:1 無効:0) ');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('TAX_RULE_PRIORITY', '"product_id,product_class_id,pref_id,country_id"', 1416, '複数箇所の税率設定時における優先度設定。カンマ区切りスペース不可で記述。後に書いてあるキーに一致するほど優先される。デフォルト：''product_id,product_class_id,pref_id,country_id''（国＞地域（県）＞規格単位＞商品単位）');
INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PENDING_ORDER_CANCEL_TIME', '900', 1417, '決済処理中ステータスのロールバックを行う時間の設定(秒) ');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('PENDING_ORDER_CANCEL_FLAG', 'true', 1418, '決済処理中ステータスのロールバックをするか(true:する false:しない)');
+INSERT INTO mtb_constants (id, name, rank, remarks) VALUES ('API_ENABLE_FLAG', 'false', 1419, 'API機能を有効にする(true:する false:しない)');
INSERT INTO dtb_index_list (table_name, column_name, recommend_flg, recommend_comment) VALUES ('dtb_customer', 'email_mobile', 0, '会員数増加時のログイン処理速度を向上させたいときに試してみてください');
INSERT INTO dtb_index_list (table_name, column_name, recommend_flg, recommend_comment) VALUES ('dtb_products', 'name', 2, '商品名検索速度を向上させたいときに試してみてください');
変更: branches/version-2_13-dev/html/user_data/packages/admin/js/eccube.admin.js
===================================================================
--- branches/version-2_13-dev/html/user_data/packages/admin/js/eccube.admin.js 2013-09-18 02:50:34 UTC (rev 23229)
+++ branches/version-2_13-dev/html/user_data/packages/admin/js/eccube.admin.js 2013-09-19 02:49:03 UTC (rev 23230)
@@ -158,7 +158,7 @@
// フォームに代入してからサブミットする。
eccube.insertValueAndSubmit = function(fm, ele, val, msg){
var ret;
- if (msg !== undefined){
+ if (msg){
ret = window.confirm(msg);
} else {
ret = true;
Svn-src-all メーリングリストの案内