Changeset 18562 for trunk/data/class/pages/campaign

Timestamp:

2010/02/12 18:46:50 (16 years ago)

Author:

kajiwara

Message:

EC-CUBE Ver2.4.3 分コミット。詳細はこちら（ http://www.ec-cube.net/release/detail.php?release_id=210）

Location:

trunk/data/class/pages/campaign

Files:

• LC_Page_CampaignApplication.php (modified) (2 diffs)
• LC_Page_CampaignEntry.php (modified) (1 diff)

trunk/data/class/pages/campaign/LC_Page_CampaignApplication.php

@@ -120 +120 @@
 
                     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'] = "※ 複数回ご応募することは出来ません。";
                         }
@@ -253 +253 @@
      * 戻り値：フラグ (重複があったら 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;

trunk/data/class/pages/campaign/LC_Page_CampaignEntry.php

@@ -129 +129 @@
 
             if ($this->arrErr || $_POST["mode"] == "return") {      // 入力エラーのチェック
-                foreach($this->arrForm as $key => $val) {
-                    $this->$key = $val;
+                foreach($arrRegistColumn as $key) {
+                    $this->$key['column'] = $arrForm[$key['column']];
                 }