Changeset 18648 for branches/comu-ver2

Timestamp:

2010/05/09 01:51:02 (13 years ago)

Author:

Seasoft

Message:

merge r18541

• 取得元: version-2_4
• 未テスト

【取得元のログメッセージ】
merged r18537

• 重複申込チェックのついたキャンペーンに申し込みできなくなる不具合 を修正(#576)

Location:

branches/comu-ver2

Files:

• . (modified) (1 prop)
• data/class/pages/campaign/LC_Page_CampaignApplication.php (modified) (2 diffs)

branches/comu-ver2/data/class/pages/campaign/LC_Page_CampaignApplication.php

@@ -119 +119 @@
 
                     if($orverlapping_flg) {
-                        if($this->lfOverlappingCheck($objCustomer->getValue('customer_id'), $objQuery)) {
+                        if($this->lfOverlappingCheck($objCustomer->getValue('customer_id'), $objCampaignSess->getCampaignId(), $objQuery)) {
                             $this->arrErr['login_email'] = "※ 複数回ご応募することは出来ません。";
                         }
@@ -252 +252 @@
      * 戻り値：フラグ (重複があったら true 重複がなかったら false)
      */
-    function lfOverlappingCheck($customer_id, &$objQuery) {
-        $count = $objQuery->count("dtb_campaign_order", "customer_id = ?", array($customer_id));
+    function lfOverlappingCheck($customer_id, $campaign_id, &$objQuery) {
+        $count = $objQuery->count("dtb_campaign_order", "customer_id = ? AND campaign_id = ?", array($customer_id, $campaign_id));
         if($count > 0) {
             return true;