Changeset 14117 for branches/rel

Timestamp:

2007/06/01 16:48:18 (17 years ago)

Author:

kakinaka

Message:

 

Location:

branches/rel

Files:

• data/class/SC_CartSession.php (modified) (4 diffs)
• html/install/user_data/include/campaign/default/src/index.php (modified) (1 diff)
• html/shopping/complete.php (modified) (1 diff)

branches/rel/data/class/SC_CartSession.php

@@ -173 +173 @@
     
     // ¥«¡¼¥È¤Ø¤Î¾¦ÉÊÄɲÃ
-    function addProduct($id, $quantity, $is_campaign) {
+    function addProduct($id, $quantity, $campaign_id = "") {
         $find = false;
         $max = $this->getMax();
@@ -182 +182 @@
                 if(strlen($val) <= INT_LEN) {
                     $_SESSION[$this->key][$i]['quantity']+= $quantity;
-                    if($is_campaign) $_SESSION[$this->key][$i]['is_campaign'] = $is_campaign;
+                    if(!empty($campaign_id)){
+                        $_SESSION[$this->key][$i]['campaign_id'] = $campaign_id;
+                        $_SESSION[$this->key][$i]['is_campaign'] = true;
+                    }
                 }
                 $find = true;
@@ -191 +194 @@
             $_SESSION[$this->key][$max+1]['quantity'] = $quantity;
             $_SESSION[$this->key][$max+1]['cart_no'] = $this->getNextCartID();
-            if($is_campaign) $_SESSION[$this->key][$max+1]['is_campaign'] = $is_campaign;
+            if(!empty($campaign_id)){
+                $_SESSION[$this->key][$max+1]['campaign_id'] = $campaign_id;
+                $_SESSION[$this->key][$max+1]['is_campaign'] = true;
+            }
         }
     }
@@ -327 +333 @@
     /**
      * ¥«¡¼¥È¤ÎÃæ¤Î¥­¥ã¥ó¥Ú¡¼¥ó¾¦ÉʤΥÁ¥§¥Ã¥¯
-     * @param void
+     * @param integer $campaign_id ¥­¥ã¥ó¥Ú¡¼¥óID
      * @return boolean True:¥­¥ã¥ó¥Ú¡¼¥ó¾¦ÉÊÍ­¤ê False:¥­¥ã¥ó¥Ú¡¼¥ó¾¦ÉÊ̵¤·
      */
-    function chkCampaign(){
-        $max = $this->getMax();
-        for($i = 0; $i <= $max; $i++) {
-            if($_SESSION[$this->key][$i]['is_campaign']) return true;
+    function chkCampaign($campaign_id){
+        $max = $this->getMax();
+        for($i = 0; $i <= $max; $i++) {
+            if($_SESSION[$this->key][$i]['is_campaign'] and $_SESSION[$this->key][$i]['campaign_id'] == $campaign_id) return true;
         }
         

branches/rel/html/install/user_data/include/campaign/default/src/index.php

@@ -73 +73 @@
         }
         $objCartSess->setPrevURL($_SERVER['REQUEST_URI']);
-        $objCartSess->addProduct(array($_POST['product_id'], $classcategory_id1, $classcategory_id2), $_POST[$quantity], true);
+        $objCartSess->addProduct(array($_POST['product_id'], $classcategory_id1, $classcategory_id2), $_POST[$quantity], $campaign_id);
         header("Location: " . URL_CART_TOP);
         exit;

branches/rel/html/shopping/complete.php

@@ -200 +200 @@
     lfDeleteTempOrder($objQuery, $uniqid);
     // ¥­¥ã¥ó¥Ú¡¼¥ó¤«¤é¤ÎÁ«°Ü¤Î¾ì¹çÅÐÏ¿¤¹¤ë¡£
-    if($objCampaignSess->getIsCampaign() and $objCartSess->chkCampaign()) {
+    if($objCampaignSess->getIsCampaign() and $objCartSess->chkCampaign($objCampaignSess->getCampaignId())) {
         lfRegistCampaignOrder($objQuery, $objCampaignSess, $order_id);
     }