Changeset 17768

Timestamp:

2009/02/13 21:47:04 (15 years ago)

Author:

zeniya

Message:

EC-CUBE2.4改修 #309

Location:

branches/version-2_4/data

Files:

• Smarty/templates/default/admin/customer/index.tpl (modified) (6 diffs)
• class/SC_CustomerList.php (modified) (5 diffs)
• class/pages/admin/customer/LC_Page_Admin_Customer.php (modified) (3 diffs)

branches/version-2_4/data/Smarty/templates/default/admin/customer/index.tpl

@@ -55 +55 @@
     }
 
+    function fnReSendMail(customer_id) {
+        if (confirm('仮登録メールを再送しても宜しいですか？')) {
+            document.form1.mode.value = "resend_mail"
+            document.form1['edit_customer_id'].value = customer_id;
+            document.form1.submit();
+            return false;
+        }
+    }
+
     function fnSubmit() {
         document.form1.submit();
@@ -132 +141 @@
                             </tr>
                             <tr class="fs12n">
+                                <td bgcolor="#f2f1ec" width="110">会員状態</td>
+                                <td bgcolor="#ffffff" width="499" colspan="3"><!--{html_checkboxes name="status" options=$arrStatus separator="&nbsp;" selected=$arrForm.status}--></td>
+                            </tr>
+                            <tr class="fs12n">
                                 <td bgcolor="#f2f1ec" width="110">誕生日</td>
                                 <td bgcolor="#ffffff" width="499" colspan="3">
@@ -314 +327 @@
 <!--★★メインコンテンツ★★-->
 
-<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete') }-->
+<!--{if count($arrErr) == 0 and ($smarty.post.mode == 'search' or $smarty.post.mode == 'delete' or $smarty.post.mode == 'resend_mail') }-->
 
 <!--★★検索結果一覧★★-->
@@ -320 +333 @@
 <form name="form1" id="form1" method="post" action="<!--{$smarty.server.PHP_SELF|escape}-->">
 <!--{foreach from=$smarty.post key="key" item="item"}-->
-<!--{if $key ne "mode" && $key ne "del_mode" && $key ne "edit_customer_id" && $key ne "del_customer_id" && $key ne "search_pageno" && $key ne "csv_mode" && $key ne "job" && $key ne "sex"}--><input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->"><!--{/if}-->
+<!--{if $key ne "mode" && $key ne "del_mode" && $key ne "edit_customer_id" && $key ne "del_customer_id" && $key ne "search_pageno" && $key ne "csv_mode" && $key ne "job" && $key ne "sex" && $key ne "status"}--><input type="hidden" name="<!--{$key|escape}-->" value="<!--{$item|escape}-->"><!--{/if}-->
 <!--{/foreach}-->
 <!--{foreach from=$smarty.post.job key="key" item="item"}-->
@@ -327 +340 @@
 <!--{foreach from=$smarty.post.sex key="key" item="item"}-->
 <input type="hidden" name="sex[]" value=<!--{$item}-->>
+<!--{/foreach}-->
+<!--{foreach from=$smarty.post.status key="key" item="item"}-->
+<input type="hidden" name="status[]" value=<!--{$item}-->>
 <!--{/foreach}-->
 <input type="hidden" name="mode" value="search">
@@ -417 +433 @@
                             <tr bgcolor="#ffffff" class="fs12n">
                                 <td width=""><!--{assign var=pref value=$search_data[data].pref}--><!--{$arrPref[$pref]}--></td>
-                                <td width=""><!--{mailto address=$search_data[data].email encode="javascript"}--></a></td>
+                                <td width=""><!--{mailto address=$search_data[data].email encode="javascript"}--><!--{if $search_data[data].status eq 1}--><br /><a href="#" onclick="return fnReSendMail('<!--{$search_data[data].customer_id|escape}-->');"> 仮登録メール再送</a><!--{/if}--></td>
                             </tr>
                             <!--顧客<!--{$smarty.section.data.iteration}-->-->

branches/version-2_4/data/class/SC_CustomerList.php

@@ -28 +28 @@
 
     var $arrColumnCSV;
-            
+
     function SC_CustomerList($array, $mode = '') {
         parent::SC_SelectSql($array);
-        
+
         $masterData = new SC_DB_MasterData_Ex();
         $arrMobileDomain = $masterData->getMasterData("mtb_mobile_domain");
-        
+
         $objDb = new SC_Helper_DB_Ex();
 
@@ -46 +46 @@
         if($mode == "customer") {
             // 管理者ページ顧客検索の場合仮登録会員も検索
-            $this->setWhere( "(status = 1 OR status = 2) AND del_flg = 0 ");
+            //$this->setWhere( "(status = 1 OR status = 2) AND del_flg = 0 ");
+            $this->setWhere( " del_flg = 0 ");
             // 登録日を示すカラム
             $regdate_col = 'dtb_customer.update_date';
@@ -164 +165 @@
         //　E-MAIL(mobile)
         if (!isset($this->arrSql['email_mobile'])) $this->arrSql['email_mobile'] = "";
-        
+
         if (strlen($this->arrSql['email_mobile']) > 0) {
             //カンマ区切りで複数の条件指定可能に
@@ -196 +197 @@
             // PCサイトメールが指定されている場合
             if ( strlen($this->arrSql['mail_type']) > 0 && $this->arrSql['mail_type'] == 1) {
-                // 携帯ドメインを外す。
-                foreach($arrMobileDomain as $mobile_domain) {
-                    $this->setWhere(" dtb_customer.email NOT ILIKE '%$mobile_domain' ");                    
-                }
+                // 携帯ドメインを外す。
+                foreach($arrMobileDomain as $mobile_domain) {
+                    $this->setWhere(" dtb_customer.email NOT ILIKE '%$mobile_domain' ");
+                }
             // 携帯サイトメールが指定されている場合
             } else if( strlen($this->arrSql['mail_type']) > 0 && $this->arrSql['mail_type'] == 2) {
-                $this->setWhere( " dtb_customer.email_mobile <> ''  ");
+                $this->setWhere( " dtb_customer.email_mobile <> ''  ");
             }
         }
@@ -344 +345 @@
         }
 
+        //会員状態
+        if (!isset($this->arrSql['status'])) $this->arrSql['status'] = "";
+        if ( is_array( $this->arrSql['status'] ) ){
+            $arrStatusVal = $this->setItemTerm( $this->arrSql['status'] ,"status" );
+            foreach ($arrStatusVal as $data) {
+                $this->arrVal[] = $data;
+            }
+        }
         $this->setOrder( "customer_id DESC" );
     }

branches/version-2_4/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

@@ -63 +63 @@
         $this->arrHtmlmail[1] = $this->arrMAILMAGATYPE[1];
         $this->arrHtmlmail[2] = $this->arrMAILMAGATYPE[2];
+
+        $this->arrStatus[1] = "仮会員";
+        $this->arrStatus[2] = "本会員";
 
         //---- CSVダウンロード用
@@ -182 +185 @@
             switch($key) {
             case 'sex':
+            case 'status':
                 $this->arrHidden[$key] = SC_Utils_Ex::sfMergeParamCheckBoxes($val);
                 if(!is_array($val)) {
@@ -208 +212 @@
             }
         }
-        if ($_POST['mode'] == "search" || $_POST['mode'] == "csv"  || $_POST['mode'] == "delete" || $_POST['mode'] == "delete_all") {
+        //if ($_POST['mode'] == "search" || $_POST['mode'] == "csv"  || $_POST['mode'] == "delete" || $_POST['mode'] == "delete_all") {
+        // 登録メール再送
+        if ($_POST['mode'] == "resend_mail") {
+            $CONF = $objDb->sf_getBasisData();
+            $this->CONF = $CONF;
+            $objMailText = new SC_SiteView();
+            $objMailText->assignobj($this);
+            $mailHelper = new SC_Helper_Mail_Ex();
+
+            $arrRet = $objQuery->select("name01, name02, secret_key, email", "dtb_customer","customer_id = ? AND del_flg <> 1 AND status = 1", array($_POST["edit_customer_id"]));
+
+            $this->name01 = $arrRet[0]['name01'];
+            $this->name02 = $arrRet[0]['name02'];
+            $this->uniqid = $arrRet[0]['secret_key'];
+
+            $subject = $mailHelper->sfMakesubject($objQuery, $objMailText, $this, '会員登録のご確認');
+            $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl");
+
+            $objMail = new SC_SendMail();
+            $objMail->setItem(
+                                ''                  //　宛先
+                                , $subject          //　サブジェクト
+                                , $toCustomerMail   //　本文
+                                , $CONF["email03"]  //　配送元アドレス
+                                , $CONF["shop_name"]//　配送元　名前
+                                , $CONF["email03"]  //　reply_to
+                                , $CONF["email04"]  //　return_path
+                                , $CONF["email04"]  //  Errors_to
+                             );
+            // 宛先の設定
+            $name = $this->name01 . $this->name02 ." 様";
+            $objMail->setTo($arrRet[0]["email"], $name);
+            $objMail->sendMail();
+
+        }
+        if ($_POST['mode'] == "search" || $_POST['mode'] == "csv"  || $_POST['mode'] == "delete" || $_POST['mode'] == "delete_all" || $_POST['mode'] == "resend_mail") {
+
             // 入力文字の強制変換
             $this->lfConvertParam();