Index: branches/version-2_5-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php
===================================================================
--- branches/version-2_5-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php	(revision 19829)
+++ branches/version-2_5-dev/data/class_extends/page_extends/admin/customer/LC_Page_Admin_Customer_Customer_Ex.php	(revision 19829)
@@ -0,0 +1,68 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+// {{{ requires
+require_once(CLASS_REALDIR . "pages/admin/customer/LC_Page_Admin_Customer_Customer.php");
+
+/**
+ * 顧客情報登録 のページクラス(拡張).
+ *
+ * LC_Page_Admin_Customer_Customer をカスタマイズする場合はこのクラスを編集する.
+ *
+ * @package Page
+ * @author LOCKON CO.,LTD.
+ * @version $Id$
+ */
+class LC_Page_Admin_Customer_Customer_Ex extends LC_Page_Admin_Customer_Customer {
+
+    // }}}
+    // {{{ functions
+
+    /**
+     * Page を初期化する.
+     *
+     * @return void
+     */
+    function init() {
+        parent::init();
+    }
+
+    /**
+     * Page のプロセス.
+     *
+     * @return void
+     */
+    function process() {
+        parent::process();
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+}
+?>
Index: branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Customer.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Customer.php	(revision 19829)
+++ branches/version-2_5-dev/data/class/pages/admin/customer/LC_Page_Admin_Customer_Customer.php	(revision 19829)
@@ -0,0 +1,300 @@
+<?php
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+
+// {{{ requires
+require_once(CLASS_REALDIR . "pages/admin/LC_Page_Admin.php");
+
+/**
+ * 顧客登録 のページクラス
+ *
+ * @package Page
+ * @author LOCKON CO.,LTD.
+ * @version $Id$
+ */
+class LC_Page_Admin_Customer_Customer extends LC_Page_Admin {
+
+    // }}}
+    // {{{ functions
+
+    /**
+     * Page を初期化する.
+     *
+     * @return void
+     */
+    function init() {
+        parent::init();
+        $this->tpl_mainpage = 'customer/customer.tpl';
+        $this->tpl_mainno = 'customer';
+        $this->tpl_subnavi = 'customer/subnavi.tpl';
+        $this->tpl_subno = 'index';
+        $this->tpl_pager = TEMPLATE_REALDIR . 'admin/pager.tpl';
+        $this->tpl_subtitle = '顧客登録';
+        
+        $masterData = new SC_DB_MasterData_Ex();
+        $this->arrPref = $masterData->getMasterData('mtb_pref');
+        $this->arrJob = $masterData->getMasterData("mtb_job");
+        $this->arrSex = $masterData->getMasterData("mtb_sex");
+        $this->arrReminder = $masterData->getMasterData("mtb_reminder");        
+    }
+
+    /**
+     * Page のプロセス.
+     * 
+     * @return void
+     */
+    function process() {
+        $this->action();
+        $this->sendResponse();
+    }
+
+    /**
+     * Page のアクション.
+     *
+     * @return void
+     */
+    function action() {
+        // 認証可否の判定
+        $objSess = new SC_Session();
+        SC_Utils_Ex::sfIsSuccess($objSess);
+        
+        $this->objQuery = new SC_Query();
+        $objDate = new SC_Date(1901);
+        $this->arrYear = $objDate->getYear();    //　日付プルダウン設定
+        $this->arrMonth = $objDate->getMonth();
+        $this->arrDay = $objDate->getDay();
+
+        //---- 登録用カラム配列
+        $arrRegistColumn = array(
+                                 array(  "column" => "name01",        "convert" => "aKV" ),
+                                 array(  "column" => "name02",        "convert" => "aKV" ),
+                                 array(  "column" => "kana01",        "convert" => "CKV" ),
+                                 array(  "column" => "kana02",        "convert" => "CKV" ),
+                                 array(  "column" => "zip01",        "convert" => "n" ),
+                                 array(  "column" => "zip02",        "convert" => "n" ),
+                                 array(  "column" => "pref",        "convert" => "n" ),
+                                 array(  "column" => "addr01",        "convert" => "aKV" ),
+                                 array(  "column" => "addr02",        "convert" => "aKV" ),
+                                 array(  "column" => "email",        "convert" => "a" ),
+                                 array(  "column" => "email_mobile",    "convert" => "a" ),
+                                 array(  "column" => "tel01",        "convert" => "n" ),
+                                 array(  "column" => "tel02",        "convert" => "n" ),
+                                 array(  "column" => "tel03",        "convert" => "n" ),
+                                 array(  "column" => "fax01",        "convert" => "n" ),
+                                 array(  "column" => "fax02",        "convert" => "n" ),
+                                 array(  "column" => "fax03",        "convert" => "n" ),
+                                 array(  "column" => "sex",            "convert" => "n" ),
+                                 array(  "column" => "job",            "convert" => "n" ),
+                                 array(  "column" => "birth",        "convert" => "n" ),
+                                 array(  "column" => "password",    "convert" => "a" ),
+                                 array(  "column" => "reminder",    "convert" => "n" ),
+                                 array(  "column" => "reminder_answer", "convert" => "aKV" ),
+                                 array(  "column" => "mailmaga_flg", "convert" => "n" ),
+                                 array(  "column" => "note",        "convert" => "aKV" ),
+                                 array(  "column" => "point",        "convert" => "n" ),
+                                 array(  "column" => "status",        "convert" => "n" )
+                                 );
+
+        //---- 登録除外用カラム配列
+        $arrRejectRegistColumn = array("year", "month", "day");
+
+        //----　顧客情報編集
+        if ($_POST["mode"] == "confirm" || $_POST["mode"] == "complete" || $_POST["mode"] == "return") {
+
+            //-- POSTデータの引き継ぎ
+            $this->arrForm = $_POST;
+            $this->arrForm['email'] = strtolower($this->arrForm['email']);        // emailはすべて小文字で処理
+
+            //-- 入力データの変換
+            $this->arrForm = $this->lfConvertParam($this->arrForm, $arrRegistColumn);
+            //-- 入力チェック
+            $this->arrErr = $this->lfErrorCheck($this->arrForm);
+
+            //-- 入力エラー発生 or リターン時
+            if ($this->arrErr  || $_POST["mode"] == "return") {
+                foreach($this->arrForm as $key => $val) {
+                    $this->list_data[ $key ] = $val;
+                }
+
+            } else {
+                //-- 確認
+                if ($_POST["mode"] == "confirm") {
+                    $this->tpl_mainpage = 'customer/customer_confirm.tpl';
+                    $passlen = strlen($this->arrForm['password']);
+                    $this->passlen = $this->lfPassLen($passlen);
+
+                }
+                //--　登録
+                if($_POST["mode"] == "complete") {
+                    $this->tpl_mainpage = 'customer/customer_complete.tpl';
+
+                    // シークレット№も登録する。
+                    $secret = SC_Utils_Ex::sfGetUniqRandomId("r");
+                    $this->arrForm['secret_key'] = $secret;
+                    array_push($arrRegistColumn, array('column' => 'secret_key', 'convert' => 'n'));
+                        
+                    //-- 登録
+                    $this->lfRegisData($this->arrForm, $arrRegistColumn);
+                }
+            }
+        }
+    }
+
+    /**
+     * デストラクタ.
+     *
+     * @return void
+     */
+    function destroy() {
+        parent::destroy();
+    }
+
+    // 編集登録
+    function lfRegisData($array, $arrRegistColumn) {
+
+        foreach ($arrRegistColumn as $data) {
+            if($array[$data["column"]] != "") {
+                $arrRegist[$data["column"]] = $array[$data["column"]];
+            } else {
+                $arrRegist[$data["column"]] = NULL;
+            }
+        }
+        if (strlen($array["year"]) > 0) {
+            $arrRegist["birth"] = $array["year"] ."/". $array["month"] ."/". $array["day"] ." 00:00:00";
+        }
+
+        //-- パスワードの更新がある場合は暗号化。（更新がない場合はUPDATE文を構成しない）
+        if ($array["password"] != DEFAULT_PASSWORD) {
+            $arrRegist["password"] = sha1($array["password"] . ":" . AUTH_MAGIC);
+        } else {
+            unset($arrRegist['password']);
+        }
+
+        $arrRegist["update_date"] = "Now()";
+
+        //-- 編集登録実行
+        $this->objQuery->begin();
+        $arrRegist['customer_id'] = $this->objQuery->nextVal('dtb_customer_customer_id');
+        $this->objQuery->Insert("dtb_customer", $arrRegist);
+        $this->objQuery->commit();
+    }
+
+
+    //----　取得文字列の変換
+    function lfConvertParam($array, $arrRegistColumn) {
+        /*
+         *    文字列の変換
+         *    K :  「半角(ﾊﾝｶｸ)片仮名」を「全角片仮名」に変換
+         *    C :  「全角ひら仮名」を「全角かた仮名」に変換
+         *    V :  濁点付きの文字を一文字に変換。"K","H"と共に使用します
+         *    n :  「全角」数字を「半角(ﾊﾝｶｸ)」に変換
+         *  a :  全角英数字を半角英数字に変換する
+         */
+        // カラム名とコンバート情報
+        foreach ($arrRegistColumn as $data) {
+            $arrConvList[ $data["column"] ] = $data["convert"];
+        }
+        // 文字変換
+        foreach ($arrConvList as $key => $val) {
+            // POSTされてきた値のみ変換する。
+            if(strlen(($array[$key])) > 0) {
+                $array[$key] = mb_convert_kana($array[$key] ,$val);
+            }
+        }
+        return $array;
+    }
+
+    //---- 入力エラーチェック
+    function lfErrorCheck($array) {
+
+        $objErr = new SC_CheckError($array);
+
+        $objErr->doFunc(array("会員状態", 'status'), array("EXIST_CHECK"));
+        $objErr->doFunc(array("お名前(姓)", 'name01', STEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $objErr->doFunc(array("お名前(名)", 'name02', STEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $objErr->doFunc(array("お名前(フリガナ・姓)", 'kana01', STEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
+        $objErr->doFunc(array("お名前(フリガナ・名)", 'kana02', STEXT_LEN), array("EXIST_CHECK", "MAX_LENGTH_CHECK", "KANA_CHECK"));
+        $objErr->doFunc(array("郵便番号1", "zip01", ZIP01_LEN ) ,array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
+        $objErr->doFunc(array("郵便番号2", "zip02", ZIP02_LEN ) ,array("EXIST_CHECK", "NUM_CHECK", "NUM_COUNT_CHECK"));
+        $objErr->doFunc(array("郵便番号", "zip01", "zip02"), array("ALL_EXIST_CHECK"));
+        $objErr->doFunc(array("都道府県", 'pref'), array("SELECT_CHECK","NUM_CHECK"));
+        $objErr->doFunc(array("住所（1）", "addr01", MTEXT_LEN), array("EXIST_CHECK","MAX_LENGTH_CHECK"));
+        $objErr->doFunc(array("住所（2）", "addr02", MTEXT_LEN), array("EXIST_CHECK","MAX_LENGTH_CHECK"));
+        $objErr->doFunc(array('メールアドレス', "email", MTEXT_LEN) ,array("EXIST_CHECK", "NO_SPTAB", "EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
+
+        //現会員の判定 →　現会員もしくは仮登録中は、メアド一意が前提になってるので同じメアドで登録不可
+        if (strlen($array["email"]) > 0) {
+            $array['email'] = strtolower($array['email']);
+            $sql = "SELECT customer_id FROM dtb_customer WHERE (email ILIKE ? escape '#' OR email_mobile ILIKE ? escape '#') AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?";
+            $checkMail = ereg_replace( "_", "#_", $array["email"]);
+            $result = $this->objQuery->getAll($sql, array($checkMail, $checkMail, $array["customer_id"]));
+            if (count($result) > 0) {
+                $objErr->arrErr["email"] .= "※ すでに登録されているメールアドレスです。<br />";
+            }
+        }
+
+        $objErr->doFunc(array('メールアドレス(モバイル)', "email_mobile", MTEXT_LEN) ,array("EMAIL_CHECK", "EMAIL_CHAR_CHECK", "MAX_LENGTH_CHECK"));
+        //現会員の判定 →　現会員もしくは仮登録中は、メアド一意が前提になってるので同じメアドで登録不可
+        if (strlen($array["email_mobile"]) > 0) {
+            $array['email_mobile'] = strtolower($array['email_mobile']);
+            $sql = "SELECT customer_id FROM dtb_customer WHERE (email ILIKE ? escape '#' OR email_mobile ILIKE ? escape '#') AND (status = 1 OR status = 2) AND del_flg = 0 AND customer_id <> ?";
+            $checkMail = ereg_replace( "_", "#_", $array["email_mobile"]);
+            $result = $this->objQuery->getAll($sql, array($checkMail, $checkMail, $array["customer_id"]));
+            if (count($result) > 0) {
+                $objErr->arrErr["email_mobile"] .= "※ すでに登録されているメールアドレス(モバイル)です。<br />";
+            }
+        }
+
+
+        $objErr->doFunc(array("お電話番号1", 'tel01'), array("EXIST_CHECK"));
+        $objErr->doFunc(array("お電話番号2", 'tel02'), array("EXIST_CHECK"));
+        $objErr->doFunc(array("お電話番号3", 'tel03'), array("EXIST_CHECK"));
+        $objErr->doFunc(array("お電話番号", "tel01", "tel02", "tel03") ,array("TEL_CHECK"));
+        $objErr->doFunc(array("FAX番号", "fax01", "fax02", "fax03") ,array("TEL_CHECK"));
+        $objErr->doFunc(array("ご性別", "sex") ,array("SELECT_CHECK", "NUM_CHECK"));
+        $objErr->doFunc(array("ご職業", "job") ,array("NUM_CHECK"));
+        if ($array["password"] != DEFAULT_PASSWORD) {
+            $objErr->doFunc(array("パスワード", 'password', PASSWORD_LEN1, PASSWORD_LEN2), array("EXIST_CHECK", "ALNUM_CHECK", "NUM_RANGE_CHECK"));
+        }
+        $objErr->doFunc(array("パスワードを忘れたときのヒント 質問", "reminder") ,array("SELECT_CHECK", "NUM_CHECK"));
+        $objErr->doFunc(array("パスワードを忘れたときのヒント 答え", "reminder_answer", STEXT_LEN) ,array("EXIST_CHECK", "MAX_LENGTH_CHECK"));
+        $objErr->doFunc(array("メールマガジン", "mailmaga_flg") ,array("SELECT_CHECK", "NUM_CHECK"));
+        $objErr->doFunc(array("生年月日", "year", "month", "day"), array("CHECK_DATE"));
+        $objErr->doFunc(array("SHOP用メモ", 'note', LTEXT_LEN), array("MAX_LENGTH_CHECK"));
+        $objErr->doFunc(array("所持ポイント", "point", TEL_LEN) ,array("MAX_LENGTH_CHECK", "NUM_CHECK"));
+        return $objErr->arrErr;
+
+    }
+
+
+    //確認ページ用パスワード表示用
+    function lfPassLen($passlen){
+        $ret = "";
+        for ($i=0;$i<$passlen;true){
+            $ret.="*";
+            $i++;
+        }
+        return $ret;
+    }
+
+}
+?>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_confirm.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_confirm.tpl	(revision 19829)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_confirm.tpl	(revision 19829)
@@ -0,0 +1,133 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<script type="text/javascript">
+<!--
+
+function func_return(){
+    document.form1.mode.value = "return";
+    document.form1.submit();
+}
+
+//-->
+</script>
+
+
+<form name="form1" id="form1" method="post" action="?">
+    <input type="hidden" name="mode" value="complete" />
+    <!--{foreach from=$arrForm key=key item=item}-->
+        <!--{if $key ne "mode" && $key ne "subm"}-->
+            <input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->" />
+        <!--{/if}-->
+    <!--{/foreach}-->
+    <!-- 検索条件の保持 -->
+    <!--{foreach from=$arrSearchData key="key" item="item"}-->
+        <!--{if $key ne "job" && $key ne "sex"}--><input type="hidden" name="search_data[<!--{$key|h}-->]" value="<!--{$item|h}-->"><!--{/if}-->
+    <!--{/foreach}-->
+    <!--{foreach from=$arrSearchData.job key="key" item="item"}-->
+        <input type="hidden" name="search_data[job][]" value=<!--{$item}--> />
+    <!--{/foreach}-->
+    <!--{foreach from=$arrSearchData.sex key="key" item="item"}-->
+        <input type="hidden" name="search_data[sex][]" value=<!--{$item}--> />
+    <!--{/foreach}-->
+    <div id="customer" class="contents-main">
+        <h2>顧客編集</h2>
+        <table class="form">
+            <tr>
+                <th>会員状態<span class="attention"> *</span></th>
+                <td><!--{if $arrForm.status == 1}-->仮会員<!--{else}-->本会員<!--{/if}--></td>
+            </tr>
+            <tr>
+                <th>お名前<span class="attention"> *</span></th>
+                <td><!--{$arrForm.name01|h}--><!--{$arrForm.name02|h}-->　様</td>
+            </tr>
+            <tr>
+                <th>お名前(フリガナ)<span class="attention"> *</span></th>
+                <td><!--{$arrForm.kana01|h}--><!--{$arrForm.kana02|h}-->　様</td>
+            </tr>
+            <tr>
+                <th>郵便番号<span class="attention"> *</span></th>
+                <td>〒 <!--{$arrForm.zip01|h}--> - <!--{$arrForm.zip02|h}--></td>
+            </tr>
+            <tr>
+                <th>住所<span class="attention"> *</span></td>
+                <td><!--{$arrPref[$arrForm.pref]|h}--><!--{$arrForm.addr01|h}--><!--{$arrForm.addr02|h}--></td>
+            </tr>
+            <tr>
+                <th>メールアドレス<span class="attention"> *</span></th>
+                <td><!--{$arrForm.email|h}--></td>
+            </tr>
+            <tr>
+                <th>携帯メールアドレス</th>
+                <td><!--{$arrForm.email_mobile|h}--></td>
+            </tr>
+            <tr>
+                <th>お電話番号<span class="attention"> *</span></th>
+                <td><!--{$arrForm.tel01|h}--> - <!--{$arrForm.tel02|h}--> - <!--{$arrForm.tel03|h}--></td>
+            </tr>
+            <tr>
+                <th>FAX</th>
+                <td><!--{if strlen($arrForm.fax01) > 0}--><!--{$arrForm.fax01|h}--> - <!--{$arrForm.fax02|h}--> - <!--{$arrForm.fax03|h}--><!--{else}-->未登録<!--{/if}--></td>
+            </tr>
+            <tr>
+                <th>ご性別<span class="attention"> *</span></th>
+                <td><!--{$arrSex[$arrForm.sex]|h}--></td>
+            </tr>
+            <tr>
+                <th>ご職業</th>
+                <td><!--{$arrJob[$arrForm.job]|default:"未登録"|h}--></td>
+            </tr>
+            <tr>
+                <th>生年月日</th>
+                <td><!--{if strlen($arrForm.year) > 0 && strlen($arrForm.month) > 0 && strlen($arrForm.day) > 0}--><!--{$arrForm.year|h}-->年<!--{$arrForm.month|h}-->月<!--{$arrForm.day|h}-->日<!--{else}-->未登録<!--{/if}--></td>
+            </tr>
+            <tr>
+                <th>パスワード<span class="attention"> *</span></th>
+                <td><!--{$passlen}--></td>
+            </tr>
+            <tr>
+                <th>パスワードを忘れたときのヒント<span class="attention"> *</span></th>
+                <td>
+                    質問： <!--{$arrReminder[$arrForm.reminder]|h}--><br />
+                    答え： <!--{$arrForm.reminder_answer|h}-->
+                </td>
+            </tr>
+            <tr>
+                <th>メールマガジン<span class="attention"> *</span></th>
+                <td><!--{if $arrForm.mailmaga_flg eq 1}-->HTML<!--{elseif $arrForm.mailmaga_flg eq 2}-->テキスト<!--{else}-->希望しない<!--{/if}--></td>
+            </tr>
+            <tr>
+                <th>SHOP用メモ</th>
+                <td><!--{$arrForm.note|h|nl2br|default:"未登録"}--></td>
+            </tr>
+            <tr>
+                <th>所持ポイント</td>
+                <td><!--{$arrForm.point|default:"0"|h}--> pt</td>
+            </tr>
+        </table>
+        <div class="btn">
+            <a class="btn-normal" href="javascript:;" onclick="func_return(); return false;"><span>編集画面に戻る</span></a>
+            <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'complete', '', '');"><span>この内容で登録する</span></a>
+        </div>
+    </div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl	(revision 19829)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer.tpl	(revision 19829)
@@ -0,0 +1,187 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+    <input type="hidden" name="mode" value="confirm" />
+    <div id="customer" class="contents-main">
+        <h2>顧客登録</h2>
+        <table class="form">
+            <tr>
+                <th>会員状態<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.status}--></span>
+                    <input type="radio" name="status"value=1 id="no_mem" <!--{if $list_data.status == 1}--> checked="checked" <!--{/if}--> <!--{if $list_data.status == 2}-->disabled<!--{/if}-->><label for="no_mem">仮会員</label>
+                    <input type="radio" name="status"value=2 id="mem"<!--{if $list_data.status == 2}--> checked="checked" <!--{/if}-->><label for="mem">本会員</label>
+                </td>
+            </tr>
+            <tr>
+                <th>お名前<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.name01}--><!--{$arrErr.name02}--></span>
+                    <input type="text" name="name01" value="<!--{$list_data.name01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.name01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;&nbsp;<input type="text" name="name02" value="<!--{$list_data.name02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.name02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>お名前(フリガナ)<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.kana01}--><!--{$arrErr.kana02}--></span>
+                    <input type="text" name="kana01" value="<!--{$list_data.kana01|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.kana01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />&nbsp;&nbsp;<input type="text" name="kana02" value="<!--{$list_data.kana02|h}-->" maxlength="<!--{$smarty.const.STEXT_LEN}-->" size="30" class="box30" <!--{if $arrErr.kana02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>郵便番号<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.zip01}--><!--{$arrErr.zip02}--></span>
+                    〒 <input type="text" name="zip01" value="<!--{$list_data.zip01|h}-->" maxlength="<!--{$smarty.const.ZIP01_LEN}-->" size="6" class="box6" maxlength="3" <!--{if $arrErr.zip01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="zip02" value="<!--{$list_data.zip02|h}-->" maxlength="<!--{$smarty.const.ZIP02_LEN}-->" size="6" class="box6" maxlength="4" <!--{if $arrErr.zip02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                    <a class="btn-normal" href="javascript:;" name="address_input" onclick="fnCallAddress('<!--{$smarty.const.URL_INPUT_ZIP}-->', 'zip01', 'zip02', 'pref', 'addr01');">住所入力</a>
+                </td>
+            </tr>
+            <tr>
+                <th>住所<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.pref}--><!--{$arrErr.addr01}--><!--{$arrErr.addr02}--></span>
+                    <select name="pref" <!--{if $arrErr.pref != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                        <option value="" selected="selected">都道府県を選択</option>
+                        <!--{html_options options=$arrPref selected=$list_data.pref}-->
+                    </select>
+                    <input type="text" name="addr01" value="<!--{$list_data.addr01|h}-->" size="60" class="box60" <!--{if $arrErr.addr01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
+                    <!--{$smarty.const.SAMPLE_ADDRESS1}--><br />
+                    <input type="text" name="addr02" value="<!--{$list_data.addr02|h}-->" size="60" class="box60" <!--{if $arrErr.addr02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /><br />
+                    <!--{$smarty.const.SAMPLE_ADDRESS2}-->
+                </td>
+            </tr>
+            <tr>
+                <th>メールアドレス<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.email}--></span>
+                    <input type="text" name="email" value="<!--{$list_data.email|h}-->" size="60" class="box60" <!--{if $arrErr.email != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>携帯メールアドレス</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.email_mobile}--></span>
+                    <input type="text" name="email_mobile" value="<!--{$list_data.email_mobile|h}-->" size="60" class="box60" <!--{if $arrErr.email_mobile != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>電話番号<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.tel01}--><!--{$arrErr.tel02}--><!--{$arrErr.tel03}--></span>
+                    <input type="text" name="tel01" value="<!--{$list_data.tel01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="tel02" value="<!--{$list_data.tel02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01 != "" || $arrErr.tel02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="tel03" value="<!--{$list_data.tel03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.tel01 != "" || $arrErr.tel03 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>FAX</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.fax01}--><!--{$arrErr.fax02}--><!--{$arrErr.fax03}--></span>
+                    <input type="text" name="fax01" value="<!--{$list_data.fax01|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.fax01 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="fax02" value="<!--{$list_data.fax02|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.fax01 != "" || $arrErr.tel02 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> - <input type="text" name="fax03" value="<!--{$list_data.fax03|h}-->" maxlength="<!--{$smarty.const.TEL_ITEM_LEN}-->" size="6" class="box6" <!--{if $arrErr.fax01 != "" || $arrErr.fax03 != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>ご性別<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.sex}--></span>
+                    <span <!--{if $arrErr.sex != ""}--><!--{sfSetErrorStyle}--><!--{/if}-->>
+                        <!--{html_radios name="sex" options=$arrSex separator=" " selected=$list_data.sex}-->
+                    </span>
+                </td>
+            </tr>
+            <tr>
+                <th>ご職業</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.job}--></span>
+                    <select name="job" <!--{if $arrErr.job != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                    <option value="" selected="selected">選択してください</option>
+                    <!--{html_options options=$arrJob selected=$list_data.job}-->
+                    </select>
+                </td>
+            </tr>
+            <tr>
+                <th>生年月日</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.year}--></span>
+                    <select name="year" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                        <option value="" selected="selected">------</option>
+                        <!--{html_options options=$arrYear selected=$list_data.year}-->
+                    </select>年
+                    <select name="month" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                        <option value="" selected="selected">----</option>
+                        <!--{html_options options=$arrMonth selected=$list_data.month}-->
+                    </select>月
+                    <select name="day" <!--{if $arrErr.year != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                        <option value="" selected="selected">----</option>
+                        <!--{html_options options=$arrDay selected=$list_data.day"}-->
+                    </select>日
+                </td>
+            </tr>
+            <tr>
+                <th>パスワード<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.password}--></span>
+                    <input type="password" name="password" value="<!--{$list_data.password|h}-->" size="30" class="box30" <!--{if $arrErr.password != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />　半角英数小文字<!--{$smarty.const.PASSWORD_LEN1}-->～<!--{$smarty.const.PASSWORD_LEN2}-->文字（記号不可）
+                </td>
+            </tr>
+            <tr>
+                <th>パスワードを忘れたときのヒント<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.reminder}--><!--{$arrErr.reminder_answer}--></span>
+                    質問： 
+                    <select name="reminder" <!--{if $arrErr.reminder != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> >
+                        <option value="" selected="selected">選択してください</option>
+                        <!--{html_options options=$arrReminder selected=$list_data.reminder}-->
+                    </select><br />
+                    答え： 
+                    <input type="text" name="reminder_answer" value="<!--{$list_data.reminder_answer|h}-->" size="30" class="box30" <!--{if $arrErr.reminder_answer != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> />
+                </td>
+            </tr>
+            <tr>
+                <th>メールマガジン<span class="attention"> *</span></th>
+                <td>
+                    <span class="attention"><!--{$arrErr.mailmaga_flg}--></span>
+                    <input type="radio" name="mailmaga_flg" value="1" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq 1 or $list_data.mailmaga_flg eq 4}-->checked<!--{/if}--> />HTML　
+                    <input type="radio" name="mailmaga_flg" value="2" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq 2 or $list_data.mailmaga_flg eq 5}-->checked<!--{/if}--> />テキスト　
+                    <input type="radio" name="mailmaga_flg" value="3" <!--{if $arrErr.mailmaga_flg != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> <!--{if $list_data.mailmaga_flg eq "" or $list_data.mailmaga_flg eq 3 or $list_data.mailmaga_flg eq 6}-->checked<!--{/if}--> />希望しない
+                </td>
+            </tr>
+            <tr>
+                <th>SHOP用メモ</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.note}--></span>
+                    <textarea name="note" maxlength="<!--{$smarty.const.LTEXT_LEN}-->" <!--{if $arrErr.note != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> cols="60" rows="8" class="area60"><!--{$list_data.note|h}--></textarea>
+                </td>
+            </tr>
+            <tr>
+                <th>所持ポイント</th>
+                <td>
+                    <span class="attention"><!--{$arrErr.point}--></span>
+                    <input type="text" name="point" value="<!--{$list_data.point|h}-->" maxlength="<!--{$smarty.const.TEL_LEN}-->" <!--{if $arrErr.point != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> size="6" class="box6" <!--{if $arrErr.point != ""}--><!--{sfSetErrorStyle}--><!--{/if}--> /> pt
+                </td>
+            </tr>
+        </table>
+
+        <div class="btn">
+            <a class="btn-normal" href="javascript:;" onclick="fnFormModeSubmit('form1', 'confirm', '', '');"><span>確認ページへ</span></a>
+        </div>
+    </div>
+</form>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl	(revision 19802)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/subnavi.tpl	(revision 19829)
@@ -24,3 +24,4 @@
 <ul class="level1">
 <li<!--{if $tpl_subno == 'index'}--> class="on"<!--{/if}--> id="navi-customer-index"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->customer/<!--{$smarty.const.DIR_INDEX_URL}-->"><span>顧客マスタ</span></a></li>
+<li<!--{if $tpl_subno == 'customer'}--> class="on"<!--{/if}--> id="navi-customer-customer"><a href="<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->customer/customer.php"><span>顧客登録</span></a></li>
 </ul>
Index: branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_complete.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_complete.tpl	(revision 19829)
+++ branches/version-2_5-dev/data/Smarty/templates/admin/customer/customer_complete.tpl	(revision 19829)
@@ -0,0 +1,35 @@
+<!--{*
+/*
+ * This file is part of EC-CUBE
+ *
+ * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved.
+ *
+ * http://www.lockon.co.jp/
+ *
+ * This program is free software; you can redistribute it and/or
+ * modify it under the terms of the GNU General Public License
+ * as published by the Free Software Foundation; either version 2
+ * of the License, or (at your option) any later version.
+ *
+ * This program is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU General Public License
+ * along with this program; if not, write to the Free Software
+ * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA  02111-1307, USA.
+ */
+*}-->
+<form name="form1" id="form1" method="post" action="?">
+<input type="hidden" name="mode" value="complete" />
+<!--{foreach from=$arrForm key=key item=item}-->
+<!--{if $key ne "mode" && $key ne "subm"}-->
+<input type="hidden" name="<!--{$key|h}-->" value="<!--{$item|h}-->" />
+<!--{/if}-->
+<!--{/foreach}-->
+<div id="customer" class="contents-main">
+  <h2>顧客登録</h2>
+  <div class="message">登録が完了致しました。</div>
+</div>
+</form>
