Changeset 18385 for branches/version-2_4

Timestamp:

2009/11/16 15:38:09 (14 years ago)

Author:

kajiwara

Message:

#521 仮会員確認メール送信がオフにならない 不具合を修正

File:

• branches/version-2_4/data/class/pages/shopping/LC_Page_Shopping_Complete.php (modified) (6 diffs)

branches/version-2_4/data/class/pages/shopping/LC_Page_Shopping_Complete.php

@@ -306 +306 @@
                 // 購入時会員登録
                 if(isset($arrData['member_check']) && $arrData['member_check'] == '1') {
-                    // 仮会員登録
-                    $customer_id = $this->lfRegistPreCustomer($arrData, $this->arrInfo);
+                    // 会員登録
+                    $customer_id = $this->lfRegistCustomer($arrData, $this->arrInfo);
                     // 購入集計を顧客テーブルに反映
                     $this->lfSetCustomerPurchase($customer_id, $arrData, $objQuery);
@@ -314 +314 @@
             //有効
             case '1':
-                // 仮会員登録
-                $customer_id = $this->lfRegistPreCustomer($arrData, $this->arrInfo);
+                // 会員登録
+                $customer_id = $this->lfRegistCustomer($arrData, $this->arrInfo);
                 // 購入集計を顧客テーブルに反映
                 $this->lfSetCustomerPurchase($customer_id, $arrData, $objQuery);
@@ -347 +347 @@
     }
 
-    // 会員登録（仮登録）
-    function lfRegistPreCustomer($arrData, $arrInfo) {
+    // 会員登録
+    function lfRegistCustomer($arrData, $arrInfo) {
+        $objQuery = new SC_Query();
+
+        //会員登録時に仮会員確認用のメールを送付するか
+        $confirm_flg = CUSTOMER_CONFIRM_MAIL;
+
         // 購入時の会員登録
         $sqlval['name01'] = $arrData['order_name01'];
@@ -371 +376 @@
         $sqlval['reminder_answer'] = $arrData['reminder_answer'];
 
-        // メルマガ配信用フラグの判定
-        switch($arrData['mail_flag']) {
-        case '1':   // HTMLメール
-            $mail_flag = 4;
-            break;
-        case '2':   // TEXTメール
-            $mail_flag = 5;
-            break;
-        case '3':   // 希望なし
-            $mail_flag = 6;
-            break;
-        default:
-            $mail_flag = 6;
-            break;
-        }
+        // 仮会員登録の場合
+        if($confirm_flg == true) {
+            // 重複しない会員登録キーを発行する。
+            $count = 1;
+            while ($count != 0) {
+                $uniqid = SC_Utils_Ex::sfGetUniqRandomId("t");
+                $count = $objQuery->count("dtb_customer", "secret_key = ?", array($uniqid));
+            }
+            $sqlval["status"] = "1";    // 仮会員
+        //本会員登録
+        } else {
+            // 重複しない会員登録キーを発行する。
+            $count = 1;
+            while ($count != 0) {
+                $uniqid = SC_Utils_Ex::sfGetUniqRandomId("r");
+                $count = $objQuery->count("dtb_customer", "secret_key = ?", array($uniqid));
+            }
+            $sqlval["status"] = "2";    // 本会員
+        }
+
         // メルマガフラグ
+        switch($arrData["mailmaga_flg"]) {
+            case 1:
+                $mail_flag = 4;
+                break;
+            case 2:
+                $mail_flag = 5;
+                break;
+            default:
+                $mail_flag = 6;
+                break;
+        }
         $sqlval['mailmaga_flg'] = $mail_flag;
 
-        // 会員仮登録
-        $sqlval['status'] = 1;
         // URL判定用キー
         $sqlval['secret_key'] = SC_Utils_Ex::sfGetUniqRandomId("t");
 
-        $objQuery = new SC_Query();
         $sqlval['create_date'] = "now()";
         $sqlval['update_date'] = "now()";
@@ -403 +421 @@
         $customer_id = $arrRet[0]['customer_id'];
 
-        //　仮登録完了メール送信
+        //　登録完了メール送信
         $objMailPage = $this;
-        $objMailPage->to_name01 = $arrData['order_name01'];
-        $objMailPage->to_name02 = $arrData['order_name02'];
+        $objMailPage->name01 = $arrData['order_name01'];
+        $objMailPage->name02 = $arrData['order_name02'];
         $objMailPage->CONF = $arrInfo;
         $objMailPage->uniqid = $sqlval['secret_key'];
@@ -415 +433 @@
         $mailHelper = new SC_Helper_Mail_Ex();
 
+        //仮会員メール
+        if($confirm_flg == true) {
+            $subject = $mailHelper->sfMakeSubject($objQuery,$objMailView,$objMailPage,"会員登録のご確認");
+            $body = $objMailView->fetch("mail_templates/customer_mail.tpl");
+        //本会員メール
+        }else{
+            $subject = $mailHelper->sfMakeSubject($objQuery,$objMailView,$objMailPage,'会員登録のご完了');
+            $body = $objMailView->fetch("mail_templates/customer_regist_mail.tpl");
+            // ログイン状態にする
+            $this->objCustomer->setLogin($arrData['order_email']);
+        }
+
         $objMail = new SC_SendMail();
         $objMail->setItem(
                             ''                                      //　宛先
-                            , $mailHelper->sfMakeSubject($objQuery,$objMailView,$objMailPage,"会員登録のご確認")        //　サブジェクト
+                            , $subject                              //　サブジェクト
                             , $body                                 //　本文
                             , $arrInfo['email03']                   //　配送元アドレス