Index: temp/trunk/data/class/SC_View.php
===================================================================
--- temp/trunk/data/class/SC_View.php	(revision 6709)
+++ temp/trunk/data/class/SC_View.php	(revision 6913)
@@ -42,4 +42,5 @@
 		$this->_smarty->register_function("str_replace","str_replace");
 		$this->_smarty->register_function("sfPrintEbisTag","sfPrintEbisTag");
+		$this->_smarty->register_function("sfPrintAffTag","sfPrintAffTag");
 		
 		if(ADMIN_MODE == '1') {		
Index: temp/trunk/html/shopping/complete.php
===================================================================
--- temp/trunk/html/shopping/complete.php	(revision 6649)
+++ temp/trunk/html/shopping/complete.php	(revision 6913)
@@ -13,6 +13,4 @@
 		$this->tpl_css = '/css/layout/shopping/complete.css';
 		$this->tpl_title = "¤´Ãíʸ´°Î»";
-		// ¥³¥ó¥Ð¡¼¥¸¥ç¥ó¥¿¥°¤Îɽ¼¨
-		$this->conversion_tag = true;
 		global $arrCONVENIENCE;
 		$this->arrCONVENIENCE = $arrCONVENIENCE;
@@ -42,34 +40,32 @@
 $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;		
 }