- Timestamp:
- 2011/01/11 01:06:14 (13 years ago)
- bzr:base-revision:
- nanasess@fsm.ne.jp-20110110075706-tq0uswsfrsetr0rq
- bzr:committer:
- Kentaro Ohkouchi <nanasess@fsm.ne.jp>
- bzr:file-ids:
data/Smarty/templates/default/shopping/multiple.tpl multiple.tpl-20110109122547-u3fq5xmi1b4jn5n4-1
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php 16093@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_DeliveryAddr.php
data/class/pages/shopping/LC_Page_Shopping_Deliv.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Deliv.php
data/class/pages/shopping/LC_Page_Shopping_Multiple.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-2
data/mtb_constants_init.php 16505@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fmtb_constants_init.php
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql- bzr:mapping-version:
- v4
- bzr:merge:
nanasess@fsm.ne.jp-20110110160316-nohmzw2i9u84chmz- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- nanasess@fsm.ne.jp-20110110160608-f5e40kzi21icyxjp
- bzr:revno:
- 2591
- bzr:revprop:branch-nick:
- branches/version-2_5-dev
- bzr:root:
- branches/version-2_5-dev
- bzr:text-revisions:
data/Smarty/templates/default/shopping/multiple.tpl nanasess@fsm.ne.jp-20110110160316-nohmzw2i9u84chmz
data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110110160316-nohmzw2i9u84chmz
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php nanasess@fsm.ne.jp-20110110160316-nohmzw2i9u84chmz
data/class/pages/shopping/LC_Page_Shopping_Deliv.php nanasess@fsm.ne.jp-20110110160316-nohmzw2i9u84chmz
data/class/pages/shopping/LC_Page_Shopping_Multiple.php nanasess@fsm.ne.jp-20110110160316-nohmzw2i9u84chmz
data/mtb_constants_init.php nanasess@fsm.ne.jp-20110110160316-nohmzw2i9u84chmz
html/install/sql/insert_data.sql nanasess@fsm.ne.jp-20110110160316-nohmzw2i9u84chmz- bzr:timestamp:
- 2011-01-11 01:06:08.532999992 +0900
- bzr:user-agent:
- bzr2.2.2+bzr-svn1.0.4
- svn:original-date:
- 2011-01-10T16:06:08.533000Z
- File:
-
- 1 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
r19861 r19862 80 80 $objDb = new SC_Helper_DB_Ex(); 81 81 $objPurchase = new SC_Helper_Purchase_Ex(); 82 $objQuery = SC_Query::getSingletonInstance();; 82 83 // クッキー管理クラス 83 84 $objCookie = new SC_Cookie(COOKIE_EXPIRE); … … 97 98 98 99 // ユーザユニークIDの取得と購入状態の正当性をチェック 99 $uniqid = SC_Utils_Ex::sfCheckNormalAccess($objSiteSess, $objCartSess); 100 $uniqid = $objSiteSess->getUniqId(); 101 $objPurchase->verifyChangeCart($uniqid, $objCartSess); 102 100 103 $this->tpl_uniqid = $uniqid; 101 104 … … 128 131 if(!$objCustomer->getCustomerDataFromEmailPass($arrForm['login_pass'], $arrForm['login_email'])) { 129 132 // 仮登録の判定 130 $objQuery = new SC_Query; 133 131 134 $where = "email = ? AND status = 1 AND del_flg = 0"; 132 135 $ret = $objQuery->count("dtb_customer", $where, array($arrForm['login_email'])); … … 141 144 if($this->cartKey == PRODUCT_TYPE_DOWNLOAD){ 142 145 // 会員情報の住所を受注一時テーブルに書き込む 143 $objDb->sfRegistDelivData($uniqid, $objCustomer); 146 $objPurchase->copyFromCustomer($sqlval, $objCustomer, 'shipping'); 147 $sqlval['deliv_id'] = $objPurchase->getDeliv($this->cartKey); 148 $objPurchase->saveShippingTemp($sqlval); 149 $objPurchase->saveOrderTemp($uniqid, $sqlval, $objCustomer); 144 150 // 正常に登録されたことを記録しておく 145 151 $objSiteSess->setRegistFlag(); … … 152 158 case 'delete': 153 159 if (SC_Utils_Ex::sfIsInt($_POST['other_deliv_id'])) { 154 $objQuery = new SC_Query();155 160 $where = "other_deliv_id = ?"; 156 161 $arrRet = $objQuery->delete("dtb_other_deliv", $where, array($_POST['other_deliv_id'])); … … 168 173 $objPurchase->saveShippingTemp($sqlval); 169 174 $objPurchase->saveOrderTemp($uniqid, $sqlval, $objCustomer); 170 //$this->lfRegistDelivData($uniqid, $objCustomer); 175 171 176 // 正常に登録されたことを記録しておく 172 177 $objSiteSess->setRegistFlag(); 173 178 // お支払い方法選択ページへ移動 174 $this->objDisplay->redirect($this->getLocation(SHOPPING_PAYMENT_URL_PATH, array(), true));179 SC_Response_Ex::sendRedirect(SHOPPING_PAYMENT_URL_PATH); 175 180 exit; 176 181 // 別のお届け先がチェックされている場合 177 182 } elseif($_POST['deliv_check'] >= 1) { 178 183 if (SC_Utils_Ex::sfIsInt($_POST['deliv_check'])) { 179 $objQuery = new SC_Query();180 184 $deliv_count = $objQuery->count("dtb_other_deliv","customer_id=? and other_deliv_id = ?" ,array($objCustomer->getValue('customer_id'), $_POST['deliv_check'])); 181 185 if ($deliv_count != 1) { … … 183 187 } 184 188 185 // 登録済みの別のお届け先を受注一時テーブルに書き込む 186 $this->lfRegistOtherDelivData($uniqid, $objCustomer, $_POST['deliv_check']); 189 $otherDeliv = $objQuery->select("*", "dtb_other_deliv", 190 "other_deliv_id = ?", 191 array($other_deliv_id)); 192 $sqlval = $otherDeliv[0]; 193 $sqlval['deliv_id'] = $objPurchase->getDeliv($this->cartKey); 194 $objPurchase->saveShippingTemp($sqlval, $other_deliv_id); 195 $objPurchase->saveOrderTemp($uniqid, $sqlval, $objCustomer); 196 187 197 // 正常に登録されたことを記録しておく 188 198 $objSiteSess->setRegistFlag(); 189 199 // お支払い方法選択ページへ移動 190 $this->objDisplay->redirect($this->getLocation(SHOPPING_PAYMENT_URL_PATH, array(), true));200 SC_Response_Ex::sendRedirect(SHOPPING_PAYMENT_URL_PATH); 191 201 exit; 192 202 } … … 199 209 case 'return': 200 210 // 確認ページへ移動 201 $this->objDisplay->redirect($this->getLocation(CART_URL_PATH, array(), true));211 SC_Response_Ex::sendRedirect(CART_URL_PATH); 202 212 exit; 203 213 break; 204 214 // お届け先複数指定 205 215 case 'multiple': 206 $this->objDisplay->redirect($this->getLocation('./multiple.php', array(), true));216 SC_Response_Ex::sendRedirect('multiple.php'); 207 217 exit; 208 218 break; 209 219 210 220 default: 211 $objQuery = new SC_Query(); 212 $where = "order_temp_id = ?"; 213 $arrRet = $objQuery->select("*", "dtb_order_temp", $where, array($uniqid)); 214 if (empty($arrRet)) $arrRet = array(""); 215 $this->objFormParam->setParam($arrRet[0]); 221 $arrOrderTemp = $objPurchase->getOrderTemp($uniqid); 222 if (empty($arrOrderTemp)) $arrOrderTemp = array(""); 223 $this->objFormParam->setParam($arrOrderTemp); 216 224 break; 217 225 } … … 480 488 } 481 489 482 /* 会員情報の住所を一時受注テーブルへ */483 function lfRegistDelivData($uniqid, $objCustomer) {484 // 登録データの作成485 $sqlval['order_temp_id'] = $uniqid;486 $sqlval['update_date'] = 'Now()';487 $sqlval['customer_id'] = $objCustomer->getValue('customer_id');488 $sqlval['order_name01'] = $objCustomer->getValue('name01');489 $sqlval['order_name02'] = $objCustomer->getValue('name02');490 $sqlval['order_kana01'] = $objCustomer->getValue('kana01');491 $sqlval['order_kana02'] = $objCustomer->getValue('kana02');492 $sqlval['order_zip01'] = $objCustomer->getValue('zip01');493 $sqlval['order_zip02'] = $objCustomer->getValue('zip02');494 $sqlval['order_pref'] = $objCustomer->getValue('pref');495 $sqlval['order_addr01'] = $objCustomer->getValue('addr01');496 $sqlval['order_addr02'] = $objCustomer->getValue('addr02');497 $sqlval['order_tel01'] = $objCustomer->getValue('tel01');498 $sqlval['order_tel02'] = $objCustomer->getValue('tel02');499 $sqlval['order_tel03'] = $objCustomer->getValue('tel03');500 $sqlval['order_fax01'] = $objCustomer->getValue('fax01');501 $sqlval['order_fax02'] = $objCustomer->getValue('fax02');502 $sqlval['order_fax03'] = $objCustomer->getValue('fax03');503 $sqlval['order_birth'] = $objCustomer->getValue('birth');504 $sqlval['order_email'] = $objCustomer->getValue('email');505 /*506 $sqlval['deliv_check'] = '-1';507 $sqlval['deliv_name01'] = $objCustomer->getValue('name01');508 $sqlval['deliv_name02'] = $objCustomer->getValue('name02');509 $sqlval['deliv_kana01'] = $objCustomer->getValue('kana01');510 $sqlval['deliv_kana02'] = $objCustomer->getValue('kana02');511 $sqlval['deliv_zip01'] = $objCustomer->getValue('zip01');512 $sqlval['deliv_zip02'] = $objCustomer->getValue('zip02');513 $sqlval['deliv_pref'] = $objCustomer->getValue('pref');514 $sqlval['deliv_addr01'] = $objCustomer->getValue('addr01');515 $sqlval['deliv_addr02'] = $objCustomer->getValue('addr02');516 $sqlval['deliv_tel01'] = $objCustomer->getValue('tel01');517 $sqlval['deliv_tel02'] = $objCustomer->getValue('tel02');518 $sqlval['deliv_tel03'] = $objCustomer->getValue('tel03');519 $sqlval['deliv_fax01'] = $objCustomer->getValue('fax01');520 $sqlval['deliv_fax02'] = $objCustomer->getValue('fax02');521 $sqlval['deliv_fax03'] = $objCustomer->getValue('fax03');522 */523 $objDb = new SC_Helper_DB_Ex();524 $objDb->sfRegistTempOrder($uniqid, $sqlval);525 }526 527 /* 別のお届け先住所を一時受注テーブルへ */528 function lfRegistOtherDelivData($uniqid, $objCustomer, $other_deliv_id) {529 // 登録データの作成530 $sqlval['order_temp_id'] = $uniqid;531 $sqlval['update_date'] = 'Now()';532 $sqlval['customer_id'] = $objCustomer->getValue('customer_id');533 534 $sqlval['order_name01'] = $objCustomer->getValue('name01');535 $sqlval['order_name02'] = $objCustomer->getValue('name02');536 $sqlval['order_kana01'] = $objCustomer->getValue('kana01');537 $sqlval['order_kana02'] = $objCustomer->getValue('kana02');538 $sqlval['order_zip01'] = $objCustomer->getValue('zip01');539 $sqlval['order_zip02'] = $objCustomer->getValue('zip02');540 $sqlval['order_pref'] = $objCustomer->getValue('pref');541 $sqlval['order_addr01'] = $objCustomer->getValue('addr01');542 $sqlval['order_addr02'] = $objCustomer->getValue('addr02');543 $sqlval['order_tel01'] = $objCustomer->getValue('tel01');544 $sqlval['order_tel02'] = $objCustomer->getValue('tel02');545 $sqlval['order_tel03'] = $objCustomer->getValue('tel03');546 $sqlval['order_fax01'] = $objCustomer->getValue('fax01');547 $sqlval['order_fax02'] = $objCustomer->getValue('fax02');548 $sqlval['order_fax03'] = $objCustomer->getValue('fax03');549 $sqlval['order_birth'] = $objCustomer->getValue('birth');550 $sqlval['order_email'] = $objCustomer->getValue('email');551 552 553 $objQuery = new SC_Query();554 $where = "other_deliv_id = ?";555 $arrRet = $objQuery->select("*", "dtb_other_deliv", $where, array($other_deliv_id));556 $_SESSION['shipping'] = $arrRet;557 /*558 $sqlval['deliv_check'] = $other_deliv_id;559 $sqlval['deliv_name01'] = $arrRet[0]['name01'];560 $sqlval['deliv_name02'] = $arrRet[0]['name02'];561 $sqlval['deliv_kana01'] = $arrRet[0]['kana01'];562 $sqlval['deliv_kana02'] = $arrRet[0]['kana02'];563 $sqlval['deliv_zip01'] = $arrRet[0]['zip01'];564 $sqlval['deliv_zip02'] = $arrRet[0]['zip02'];565 $sqlval['deliv_pref'] = $arrRet[0]['pref'];566 $sqlval['deliv_addr01'] = $arrRet[0]['addr01'];567 $sqlval['deliv_addr02'] = $arrRet[0]['addr02'];568 $sqlval['deliv_tel01'] = $arrRet[0]['tel01'];569 $sqlval['deliv_tel02'] = $arrRet[0]['tel02'];570 $sqlval['deliv_tel03'] = $arrRet[0]['tel03'];571 */572 $objDb = new SC_Helper_DB_Ex();573 $objDb->sfRegistTempOrder($uniqid, $sqlval);574 }575 576 490 /* 入力内容のチェック */ 577 491 function lfCheckError() {
Note: See TracChangeset
for help on using the changeset viewer.