Changeset 6913 for temp/trunk

Timestamp:

2006/10/26 18:40:10 (20 years ago)

Author:

naka

Message:

* empty log message *

Location:

temp/trunk

Files:

• data/class/SC_View.php (modified) (1 diff)
• data/include/module.inc (modified) (previous)
• html/shopping/complete.php (modified) (2 diffs)

temp/trunk/data/class/SC_View.php

@@ -42 +42 @@
         $this->_smarty->register_function("str_replace","str_replace");
         $this->_smarty->register_function("sfPrintEbisTag","sfPrintEbisTag");
+        $this->_smarty->register_function("sfPrintAffTag","sfPrintAffTag");
         
         if(ADMIN_MODE == '1') {     

temp/trunk/html/shopping/complete.php

@@ -13 +13 @@
         $this->tpl_css = '/css/layout/shopping/complete.css';
         $this->tpl_title = "¤´Ãíʸ´°Î»";
-        // ¥³¥ó¥Ð¡¼¥¸¥ç¥ó¥¿¥°¤Îɽ¼¨
-        $this->conversion_tag = true;
         global $arrCONVENIENCE;
         $this->arrCONVENIENCE = $arrCONVENIENCE;
@@ -42 +40 @@
 $objCustomer = new SC_Customer();
 
-if($_GET['mode'] != 'reload') {
-    // Á°¤Î¥Ú¡¼¥¸¤ÇÀµ¤·¤¯ÅÐÏ¿¼ê³¤­¤¬¹Ô¤ï¤ì¤¿¤«È½Äê
-    sfIsPrePage($objSiteSess);
-    // ¥æ¡¼¥¶¥æ¥Ë¡¼¥¯ID¤Î¼èÆÀ¤È¹ØÆþ¾õÂÖ¤ÎÀµÅöÀ­¤ò¥Á¥§¥Ã¥¯
-    $uniqid = sfCheckNormalAccess($objSiteSess, $objCartSess);
-    if ($uniqid != "") {
-
-        // ´°Î»½èÍý
-        $objQuery = new SC_Query();
-        $objQuery->begin();
-        $order_id = lfDoComplete($objQuery, $uniqid);
-        $objQuery->commit();
-        
-        // ¥»¥Ã¥·¥ç¥ó¤ËÊݴɤµ¤ì¤Æ¤¤¤ë¾ðÊó¤ò¹¹¿·¤¹¤ë
-        $objCustomer->updateSession();
-
-        // ´°Î»¥á¡¼¥ëÁ÷¿®
-        if($order_id != "") {
-            sfSendOrderMail($order_id, '1');
-        }
-
-        //¥³¥ó¥Ó¥Ë·èºÑ¾ðÊó¤Î¼èÆÀ
-        $conveni_data = $objQuery->get("dtb_order", "conveni_data", "order_id = ? ", array($order_id));
-        if($conveni_data != "") {
-            $objPage->arrConv = unserialize($conveni_data);
-        }
-        
-        // ¥ê¥í¡¼¥É¤Ë¤è¤ëÆó½ÅÅÐÏ¿ËÉ»ß
-        sfReload("mode=reload"); 
-    }
+// Á°¤Î¥Ú¡¼¥¸¤ÇÀµ¤·¤¯ÅÐÏ¿¼ê³¤­¤¬¹Ô¤ï¤ì¤¿¤«È½Äê
+sfIsPrePage($objSiteSess);
+// ¥æ¡¼¥¶¥æ¥Ë¡¼¥¯ID¤Î¼èÆÀ¤È¹ØÆþ¾õÂÖ¤ÎÀµÅöÀ­¤ò¥Á¥§¥Ã¥¯
+$uniqid = sfCheckNormalAccess($objSiteSess, $objCartSess);
+if ($uniqid != "") {
+
+    // ´°Î»½èÍý
+    $objQuery = new SC_Query();
+    $objQuery->begin();
+    $order_id = lfDoComplete($objQuery, $uniqid);
+    $objQuery->commit();
+    
+    // ¥»¥Ã¥·¥ç¥ó¤ËÊݴɤµ¤ì¤Æ¤¤¤ë¾ðÊó¤ò¹¹¿·¤¹¤ë
+    $objCustomer->updateSession();
+
+    // ´°Î»¥á¡¼¥ëÁ÷¿®
+    if($order_id != "") {
+        sfSendOrderMail($order_id, '1');
+    }
+
+    //¥³¥ó¥Ó¥Ë·èºÑ¾ðÊó¤Î¼èÆÀ
+    $conveni_data = $objQuery->get("dtb_order", "conveni_data", "order_id = ? ", array($order_id));
+    if($conveni_data != "") {
+        $objPage->arrConv = unserialize($conveni_data);
+    }
+    
+    // ¥³¥ó¥Ð¡¼¥¸¥ç¥ó¥Ú¡¼¥¸¤ÎÀßÄê
+    $objPage->tpl_conv_page = AFF_SHOPPING_COMPLETE;        
 }