[Svn-src-all:4287] [version-2_13_0 23201] #2116 仮登録メール再送で会員登録完了メールが送信されます

[michael_nelson]

Subversion committed to /home/svn/open 23201
http://svn.ec-cube.net/open_trac/changeset/23201
┌────────────────────────────┐
│更新者　:  michael_nelson                               │
│更新日時:  2013-09-09 16:38:31 +0900 (月, 09  9月 2013)│
└────────────────────────────┘

Log:
--------------------------------------------------------
#2116 仮登録メール再送で会員登録完了メールが送信されます

Changed:                      [U:修正，A:追加，D:削除]
--------------------------------------------------------
U   branches/version-2_13_0/data/class/helper/SC_Helper_Mail.php
U   branches/version-2_13_0/data/class/pages/admin/customer/LC_Page_Admin_Customer.php

変更: branches/version-2_13_0/data/class/helper/SC_Helper_Mail.php
===================================================================
--- branches/version-2_13_0/data/class/helper/SC_Helper_Mail.php	2013-09-09 06:52:13 UTC (rev 23200)
+++ branches/version-2_13_0/data/class/helper/SC_Helper_Mail.php	2013-09-09 07:38:31 UTC (rev 23201)
@@ -319,7 +319,7 @@
      * @param  boolean $is_mobile   false(default):PCアドレスにメールを送る 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)) {
@@ -344,13 +344,14 @@
 
         $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_0/data/class/pages/admin/customer/LC_Page_Admin_Customer.php
===================================================================
--- branches/version-2_13_0/data/class/pages/admin/customer/LC_Page_Admin_Customer.php	2013-09-09 06:52:13 UTC (rev 23200)
+++ branches/version-2_13_0/data/class/pages/admin/customer/LC_Page_Admin_Customer.php	2013-09-09 07:38:31 UTC (rev 23201)
@@ -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, $resend_flg);
         return true;
     }