Changeset 16972 for branches

Timestamp:

2008/01/11 12:54:22 (15 years ago)

Author:

satou

Message:

#160 会員登録時付与ポイントが反映されない不具合を改修

Location:

branches/beta

Files:

• data/lib/slib.php (modified) (1 diff)
• html/entry/index.php (modified) (2 diffs)
• html/mobile/entry/index.php (modified) (1 diff)
• html/mobile/regist/index.php (modified) (2 diffs)
• html/regist/index.php (modified) (2 diffs)

branches/beta/data/lib/slib.php

@@ -1342 +1342 @@
     }
     return $ret;
+}
+
+/* ²ñ°÷ÅÐÏ¿¥Ý¥¤¥ó¥ÈÉÕÍ¿ */
+function sfSetWelcomePoint($secret_key, $CONF) {
+    $objQuery = new SC_Query();
+    
+    // ¥Ý¥¤¥ó¥ÈÉÕÍ¿
+    $col = "point";
+    $where = "secret_key = ? AND status = 2";
+    $arrRet = $objQuery->select($col, "dtb_customer", $where, array($secret_key));
+    $sqlval['point'] = $arrRet[0]['point'] + $CONF['welcome_point'];
+    
+    // ¥Ý¥¤¥ó¥È¤¬ÉÔ­¤·¤Æ¤¤¤ë¾ì¹ç
+    if($sqlval['point'] < 0) {
+        $objQuery->rollback();
+        sfDispSiteError(LACK_POINT);
+    }
+    
+    $objQuery->update("dtb_customer", $sqlval, $where, array($secret_key));
 }
 

branches/beta/html/entry/index.php

@@ -140 +140 @@
             // ²¾²ñ°÷¤¬Í­¸ú¤Î¾ì¹ç
             if(CUSTOMER_CONFIRM_MAIL == true) {
+                // ¥á¡¼¥ë¥Æ¥ó¥×¥ìÀßÄê
                 $subject = sfMakesubject('²ñ°÷ÅÐÏ¿¤Î¤´³Îǧ');
                 $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl");
+            // ²¾²ñ°÷¤¬Ìµ¸ú¤Î¾ì¹ç
             } else {
+                // ¥á¡¼¥ë¥Æ¥ó¥×¥ìÀßÄê
                 $subject = sfMakesubject('²ñ°÷ÅÐÏ¿¤Î¤´´°Î»');
                 $toCustomerMail = $objMailText->fetch("mail_templates/customer_regist_mail.tpl");
+                // ²ñ°÷ÅÐÏ¿¥Ý¥¤¥ó¥ÈÉÕÍ¿
+                sfSetWelcomePoint($objPage->uniqid, $CONF);
                 // ¥í¥°¥¤¥ó¾õÂ֤ˤ¹¤ë
                 $objCustomer->setLogin($_POST["email"]);
@@ -248 +253 @@
     $objQuery->insert("dtb_customer", $arrRegist);
 
-
 /* ¥á¥ë¥Þ¥¬²ñ°÷µ¡Ç½¤Ï¸½ºßÄä»ßÃæ¡¡2007/03/07
-
-
     //--¡¡Èó²ñ°÷¤Ç¥á¥ë¥Þ¥¬ÅÐÏ¿¤·¤Æ¤¤¤ë¤«¤ÎȽÄê
     $sql = "SELECT count(*) FROM dtb_customer_mail WHERE email = ?";

branches/beta/html/mobile/entry/index.php

@@ -263 +263 @@
             // ²¾²ñ°÷¤¬Í­¸ú¤Î¾ì¹ç
             if(CUSTOMER_CONFIRM_MAIL == true) {
+                // ¥á¡¼¥ë¥Æ¥ó¥×¥ìÀßÄê
                 $subject = sfMakesubject('²ñ°÷ÅÐÏ¿¤Î¤´³Îǧ');
                 $toCustomerMail = $objMailText->fetch("mail_templates/customer_mail.tpl");
+            // ²¾²ñ°÷¤¬Ìµ¸ú¤Î¾ì¹ç
             } else {
+                // ¥á¡¼¥ë¥Æ¥ó¥×¥ìÀßÄê
                 $subject = sfMakesubject('²ñ°÷ÅÐÏ¿¤Î¤´´°Î»');
                 $toCustomerMail = $objMailText->fetch("mail_templates/customer_regist_mail.tpl");
+                // ²ñ°÷ÅÐÏ¿¥Ý¥¤¥ó¥ÈÉÕÍ¿
+                sfSetWelcomePoint($objPage->uniqid, $CONF);
                 // ¥í¥°¥¤¥ó¾õÂ֤ˤ¹¤ë
                 $objCustomer->setLogin($_POST["email"]);

branches/beta/html/mobile/regist/index.php

@@ -39 +39 @@
 
     } else {
-        //$objPage->tpl_mainpage = 'regist/complete.tpl';
-        //$objPage->tpl_title = ' ²ñ°÷ÅÐÏ¿(´°Î»¥Ú¡¼¥¸)';
-        $registSecretKey = lfRegistData($_GET);         //Ëܲñ°÷ÅÐÏ¿¡Ê¥Õ¥é¥°Êѹ¹¡Ë
-        lfSendRegistMail($registSecretKey);             //Ëܲñ°÷ÅÐÏ¿´°Î»¥á¡¼¥ëÁ÷¿®
-
+        //Ëܲñ°÷ÅÐÏ¿¡Ê¥Õ¥é¥°Êѹ¹¡Ë
+        $registSecretKey = lfRegistData($_GET);
+        //Ëܲñ°÷ÅÐÏ¿´°Î»¥á¡¼¥ëÁ÷¿®
+        lfSendRegistMail($registSecretKey);
+        // ²ñ°÷ÅÐÏ¿¥Ý¥¤¥ó¥ÈÉÕÍ¿
+        sfSetWelcomePoint($registSecretKey, $CONF);
         // ¥í¥°¥¤¥óºÑ¤ß¤Î¾õÂ֤ˤ¹¤ë¡£
         $objQuery = new SC_Query();
@@ -84 +85 @@
     $objQuery = new SC_Query();
     $where = "secret_key = ? AND status = 1";
-    
-    $arrRet = $objQuery->select("point", "dtb_customer", $where, array($array["id"]));
-    // ²ñ°÷ÅÐÏ¿»þ¤Î²Ã»»¥Ý¥¤¥ó¥È(¹ØÆþ»þ²ñ°÷ÅÐÏ¿¤Î¾ì¹ç¤Ï¡¢¥Ý¥¤¥ó¥È²Ã»»¡Ë
-    $arrRegist['point'] = $arrRet[0]['point'] + addslashes($arrInfo['welcome_point']);
-    
     $objQuery->update("dtb_customer", $arrRegist, $where, array($array["id"]));
-
-    /* ¹ØÆþ»þ¤Î¼«Æ°²ñ°÷ÅÐÏ¿¤Ï¹Ô¤ï¤Ê¤¤¤¿¤áDEL
-    // ¹ØÆþ»þÅÐÏ¿¤Î¾ì¹ç¡¢¤½¤Î²ó¤Î¹ØÆþ¤ò²ñ°÷¹ØÆþ¤È¤ß¤Ê¤¹¡£
-    // ²ñ°÷¾ðÊó¤ÎÆɤ߹þ¤ß
-    $where1 = "secret_key = ? AND status = 2";
-    $customer = $objQuery->select("*", "dtb_customer", $where1, array($secret));
-    // ½é²ó¹ØÆþ¾ðÊó¤ÎÆɤ߹þ¤ß
-    $order_temp_id = $objQuery->get("dtb_order_temp", "order_temp_id");
-    // ¹ØÆþ¾ðÊó¤Î¹¹¿·
-    if ($order_temp_id != null) {
-        $arrCustomer['customer_id'] = $customer[0]['customer_id'];
-        $where3 = "order_temp_id = ?";
-        $objQuery->update("dtb_order_temp", $arrCustomer, $where3, array($order_temp_id));
-        $objQuery->update("dtb_order", $arrCustomer, $where3, array($order_temp_id));
-    }
-    */
 
     $sql = "SELECT mailmaga_flg FROM dtb_customer WHERE email = ?";

branches/beta/html/regist/index.php

@@ -45 +45 @@
 
     } else {
-        //$objPage->tpl_mainpage = 'regist/complete.tpl';
-        //$objPage->tpl_title = ' ²ñ°÷ÅÐÏ¿(´°Î»¥Ú¡¼¥¸)';
-        $registSecretKey = lfRegistData($_GET);         //Ëܲñ°÷ÅÐÏ¿¡Ê¥Õ¥é¥°Êѹ¹¡Ë
-        lfSendRegistMail($registSecretKey);             //Ëܲñ°÷ÅÐÏ¿´°Î»¥á¡¼¥ëÁ÷¿®
-
+        //Ëܲñ°÷ÅÐÏ¿¡Ê¥Õ¥é¥°Êѹ¹¡Ë
+        $registSecretKey = lfRegistData($_GET);
+        //Ëܲñ°÷ÅÐÏ¿´°Î»¥á¡¼¥ëÁ÷¿®
+        lfSendRegistMail($registSecretKey);
+        // ²ñ°÷ÅÐÏ¿¥Ý¥¤¥ó¥ÈÉÕÍ¿
+        sfSetWelcomePoint($registSecretKey, $CONF);
         // ¥í¥°¥¤¥óºÑ¤ß¤Î¾õÂ֤ˤ¹¤ë¡£
         $email = $objQuery->get("dtb_customer", "email", "secret_key = ?", array($registSecretKey));
         $objCustomer->setLogin($email);
+        
         header("Location: ./complete.php$etc_val");
         exit;
@@ -90 +92 @@
     $objQuery = new SC_Query();
     $where = "secret_key = ? AND status = 1";
-    
-    $arrRet = $objQuery->select("point", "dtb_customer", $where, array($array["id"]));
-    // ²ñ°÷ÅÐÏ¿»þ¤Î²Ã»»¥Ý¥¤¥ó¥È(¹ØÆþ»þ²ñ°÷ÅÐÏ¿¤Î¾ì¹ç¤Ï¡¢¥Ý¥¤¥ó¥È²Ã»»¡Ë
-    $arrRegist['point'] = $arrRet[0]['point'] + addslashes($arrInfo['welcome_point']);
-    
     $objQuery->update("dtb_customer", $arrRegist, $where, array($array["id"]));
-
-    /* ¹ØÆþ»þ¤Î¼«Æ°²ñ°÷ÅÐÏ¿¤Ï¹Ô¤ï¤Ê¤¤¤¿¤áDEL
-    // ¹ØÆþ»þÅÐÏ¿¤Î¾ì¹ç¡¢¤½¤Î²ó¤Î¹ØÆþ¤ò²ñ°÷¹ØÆþ¤È¤ß¤Ê¤¹¡£
-    // ²ñ°÷¾ðÊó¤ÎÆɤ߹þ¤ß
-    $where1 = "secret_key = ? AND status = 2";
-    $customer = $objQuery->select("*", "dtb_customer", $where1, array($secret));
-    // ½é²ó¹ØÆþ¾ðÊó¤ÎÆɤ߹þ¤ß
-    $order_temp_id = $objQuery->get("dtb_order_temp", "order_temp_id");
-    // ¹ØÆþ¾ðÊó¤Î¹¹¿·
-    if ($order_temp_id != null) {
-        $arrCustomer['customer_id'] = $customer[0]['customer_id'];
-        $where3 = "order_temp_id = ?";
-        $objQuery->update("dtb_order_temp", $arrCustomer, $where3, array($order_temp_id));
-        $objQuery->update("dtb_order", $arrCustomer, $where3, array($order_temp_id));
-    }
-    */
 
     $sql = "SELECT mailmaga_flg FROM dtb_customer WHERE email = ?";