Index: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php =================================================================== --- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php (revision 18893) +++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Complete.php (revision 19628) @@ -243,10 +243,4 @@ // 受注一時テーブルの情報を削除する。 $this->lfDeleteTempOrder($objQuery, $uniqid); - // キャンペーンからの遷移の場合登録する。 - if (!defined("MOBILE_SITE")) { - if($this->objCampaignSess->getIsCampaign() and $this->objCartSess->chkCampaign($this->objCampaignSess->getCampaignId())) { - $this->lfRegistCampaignOrder($objQuery, $objCampaignSess, $order_id); - } - } // セッションカート内の商品を削除する。 @@ -489,32 +483,4 @@ } - // キャンペーン受注テーブルへ登録 - function lfRegistCampaignOrder(&$objQuery, &$objCampaignSess, $order_id) { - - // 受注データを取得 - $cols = "order_id, campaign_id, customer_id, message, order_name01, order_name02,". - "order_kana01, order_kana02, order_email, order_tel01, order_tel02, order_tel03,". - "order_fax01, order_fax02, order_fax03, order_zip01, order_zip02, order_pref, order_addr01,". - "order_addr02, order_sex, order_birth, order_job, deliv_name01, deliv_name02, deliv_kana01,". - "deliv_kana02, deliv_tel01, deliv_tel02, deliv_tel03, deliv_fax01, deliv_fax02, deliv_fax03,". - "deliv_zip01, deliv_zip02, deliv_pref, deliv_addr01, deliv_addr02, payment_total"; - - $arrOrder = $objQuery->select($cols, "dtb_order", "order_id = ?", array($order_id)); - - $sqlval = $arrOrder[0]; - $sqlval['create_date'] = 'Now()'; - - // INSERTの実行 - $objQuery->insert("dtb_campaign_order", $sqlval); - - // 申し込み数の更新 - $total_count = $objQuery->get("dtb_campaign", "total_count", "campaign_id = ?", array($sqlval['campaign_id'])); - $arrCampaign['total_count'] = $total_count += 1; - $objQuery->update("dtb_campaign", $arrCampaign, "campaign_id = ?", array($sqlval['campaign_id'])); - - } - - - /* 受注一時テーブルの削除 */ function lfDeleteTempOrder(&$objQuery, $uniqid) { Index: branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 18820) +++ branches/version-2_5-dev/data/class/pages/admin/mail/LC_Page_Admin_Mail.php (revision 19628) @@ -202,6 +202,5 @@ $this->list_data = $list_data; - $this->arrCampaignList = $this->lfGetCampaignList($objQuery); - + $objView->assignobj($this); $objView->display($tpl_path); @@ -386,6 +385,4 @@ $this->arrCatList = $objDb->sfGetCategoryList(); - $this->arrCampaignList = $this->lfGetCampaignList($objQuery); - // ページ表示 $objView->assignobj($this); @@ -494,17 +491,4 @@ } - // キャンペーン一覧 - function lfGetCampaignList(&$objQuery) { - $arrCampaign = null; - $sql = "SELECT campaign_id, campaign_name FROM dtb_campaign ORDER BY update_date DESC"; - $arrResult = $objQuery->getAll($sql); - - foreach($arrResult as $arrVal) { - $arrCampaign[$arrVal['campaign_id']] = $arrVal['campaign_name']; - } - - return $arrCampaign; - } - function lfGetIsMobile($mail_type) { // 検索結果の取得 Index: branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 18820) +++ branches/version-2_5-dev/data/class/pages/admin/products/LC_Page_Admin_Products.php (revision 19628) @@ -86,15 +86,4 @@ if (!isset($_POST['mode'])) $_POST['mode'] = ""; - - //キャンペーンの編集時 - if(isset($_POST['campaign_id']) && SC_Utils_Ex::sfIsInt($_POST['campaign_id']) - && $_POST['mode'] == "camp_search") { - $objQuery = new SC_Query(); - $search_data = $objQuery->get("dtb_campaign", "search_condition", "campaign_id = ? ", array($_POST['campaign_id'])); - $arrSearch = unserialize($search_data); - foreach ($arrSearch as $key => $val) { - $_POST[$key] = $val; - } - } // POST値の引き継ぎ Index: branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php =================================================================== --- branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php (revision 18701) +++ branches/version-2_5-dev/data/class/pages/admin/design/LC_Page_Admin_Design_Template.php (revision 19628) @@ -117,8 +117,5 @@ // common.cssの内容を更新 $this->lfChangeCommonCss($template_code); - - // テンプレートのコピー - $this->lfCopyTemplate($template_code); - + // ブロック位置を更新 $this->lfChangeBloc($template_code); @@ -312,26 +309,5 @@ return $arrRet; } - - /** - * テンプレート変更時に既に存在するキャンペーンのテンプレートがない場合はテンプレートを生成する - * - */ - function lfCopyTemplate($template_code){ - //すべてのキャンペーンのテンプレートファイルを確認 - $objQuery = new SC_Query(); - $sql = "SELECT directory_name,cart_flg FROM dtb_campaign WHERE del_flg = 0"; - $result = $objQuery->getAll( $sql ); - //デザインテンプレートディレクトリにファイルが存在するか確認 - foreach( $result as $key => $val ){ - //index.phpが存在すればキャンペーンのテンプレートがあると判定 - //全部チェックした方がいいか？ - $campaign_template_file_path = SMARTY_TEMPLATES_DIR.$template_code ."/". CAMPAIGN_TEMPLATE_DIR . $val['directory_name'] . "/" .CAMPAIGN_TEMPLATE_ACTIVE . "site_frame.tpl"; - if(!file_exists($campaign_template_file_path)){ - //ファイルがなければコピーして作成 - $this->lfCreateTemplate(SMARTY_TEMPLATES_DIR.$template_code ."/" . CAMPAIGN_TEMPLATE_DIR , $val['directory_name'],$val['cart_flg'] ); - } - } - } - + /* * 関数名：lfCreateTemplate() Index: branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist_Complete.php =================================================================== --- branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist_Complete.php (revision 18701) +++ branches/version-2_5-dev/data/class/pages/regist/LC_Page_Regist_Complete.php (revision 19628) @@ -61,13 +61,4 @@ $objCampaignSess = new SC_CampaignSession(); - // キャンペーンからの登録の場合の処理 - if($_GET["cp"] != "") { - $arrCampaign= $objQuery->select("directory_name", "dtb_campaign", "campaign_id = ?", array($_GET["cp"])); - // キャンペーンディレクトリ名を保持 - $dir_name = $arrCampaign[0]['directory_name']; - } else { - $dir_name = ""; - } - // レイアウトデザインを取得 $helper = new SC_Helper_PageLayout_Ex(); @@ -75,11 +66,5 @@ $objView->assignobj($this); - // フレームを選択(キャンペーンページから遷移なら変更) - if($this->dir_name != "") { - $objView->display(CAMPAIGN_TEMPLATE_PATH . $dir_name . "/active/site_frame.tpl"); - $objCampaignSess->delCampaign(); - } else { - $objView->display(SITE_FRAME); - } + $objView->display(SITE_FRAME); } Index: branches/version-2_5-dev/data/class/SC_CustomerList.php =================================================================== --- branches/version-2_5-dev/data/class/SC_CustomerList.php (revision 18853) +++ branches/version-2_5-dev/data/class/SC_CustomerList.php (revision 19628) @@ -335,11 +335,4 @@ } - // キャンペーン - if (!isset($this->arrSql['campaign_id'])) $this->arrSql['campaign_id'] = ""; - if ( is_numeric( $this->arrSql['campaign_id'] ) ) { - $this->setWhere( " customer_id IN (SELECT distinct customer_id FROM dtb_campaign_order WHERE campaign_id = ?)" ); - $this->arrVal[] = $this->arrSql['campaign_id']; - } - // 会員状態 if (!isset($this->arrSql['status'])) $this->arrSql['status'] = ""; Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl (revision 18873) +++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/query.tpl (revision 19628) @@ -132,8 +132,4 @@ - - キャンペーン - - Index: branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl (revision 18873) +++ branches/version-2_5-dev/data/Smarty/templates/admin/mail/index.tpl (revision 19628) @@ -257,13 +257,4 @@ - - - - - キャンペーン - -