Ignore:
Timestamp:
2011/01/10 13:59:23 (12 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19859
bzr:committer:
Kentaro Ohkouchi <nanasess@fsm.ne.jp>
bzr:file-ids:

data/Smarty/templates/default/shopping/deliv.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fdeliv.tpl
data/Smarty/templates/default/shopping/multiple.tpl multiple.tpl-20110109122547-u3fq5xmi1b4jn5n4-1
data/Smarty/templates/default/shopping/nonmember_input.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fnonmember_input.tpl
data/Smarty/templates/default/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fpayment.tpl
data/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/SC_Customer.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_Customer.php
data/class/helper/SC_Helper_DB.php 15176@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fhelper%2FSC_Helper_DB.php
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/error/LC_Page_Error.php 15141@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Ferror%2FLC_Page_Error.php
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.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping.php
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.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/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
data/class/util/SC_Utils.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Futil%2FSC_Utils.php
data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-3
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
html/install/sql/create_table_mysql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_mysql.sql
html/install/sql/create_table_pgsql.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fcreate_table_pgsql.sql
html/install/sql/drop_table.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Fdrop_table.sql
html/install/sql/insert_data.sql 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Finstall%2Fsql%2Finsert_data.sql
html/js/site.js site.js-20101208110316-7ungq6kj49bhw4d1-7
html/shopping/multiple.php multiple.php-20110109122547-u3fq5xmi1b4jn5n4-4
html/user_data/packages/default/css/under02.css 16708@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fhtml%2Fuser_data%2Fpackages%2Fdefault%2Fcss%2Funder02.css
bzr:mapping-version:
v4
bzr:merge:

nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
nanasess@fsm.ne.jp-20110110045915-6b02oxleldtyw7ee
bzr:revno:
2589
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/Smarty/templates/default/shopping/deliv.tpl nanasess@fsm.ne.jp-20110109122851-7ox5o3sn0yp5rjpn
data/Smarty/templates/default/shopping/multiple.tpl nanasess@fsm.ne.jp-20110109122851-7ox5o3sn0yp5rjpn
data/Smarty/templates/default/shopping/nonmember_input.tpl nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/Smarty/templates/default/shopping/payment.tpl nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/SC_CartSession.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/SC_Customer.php nanasess@fsm.ne.jp-20110109122851-7ox5o3sn0yp5rjpn
data/class/helper/SC_Helper_DB.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/pages/error/LC_Page_Error.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php nanasess@fsm.ne.jp-20110109122851-7ox5o3sn0yp5rjpn
data/class/pages/shopping/LC_Page_Shopping.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/pages/shopping/LC_Page_Shopping_Confirm.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/pages/shopping/LC_Page_Shopping_Deliv.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/pages/shopping/LC_Page_Shopping_Multiple.php nanasess@fsm.ne.jp-20110109122851-7ox5o3sn0yp5rjpn
data/class/pages/shopping/LC_Page_Shopping_Payment.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class/util/SC_Utils.php nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
data/class_extends/page_extends/shopping/LC_Page_Shopping_Multiple_Ex.php nanasess@fsm.ne.jp-20110109122604-8059rgcurt250q06
html/install/sql/create_table_mysql.sql nanasess@fsm.ne.jp-20110109121902-2oqes35heyjm5nlc
html/install/sql/create_table_pgsql.sql nanasess@fsm.ne.jp-20110109121902-2oqes35heyjm5nlc
html/install/sql/drop_table.sql nanasess@fsm.ne.jp-20110109121902-2oqes35heyjm5nlc
html/install/sql/insert_data.sql nanasess@fsm.ne.jp-20110109122604-8059rgcurt250q06
html/js/site.js nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
html/shopping/multiple.php nanasess@fsm.ne.jp-20110109122604-8059rgcurt250q06
html/user_data/packages/default/css/under02.css nanasess@fsm.ne.jp-20110110045555-wppbrefvyq7ccz18
bzr:timestamp:
2011-01-10 13:59:15.388999939 +0900
bzr:user-agent:
bzr2.2.2+bzr-svn1.0.4
svn:original-date:
2011-01-10T04:59:15.389000Z
Message:

#843(複数配送先の指定)

  • とりあえず通常配送が通るように修正
File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php

    r19833 r19860  
    197197            exit; 
    198198            break; 
     199        // お届け先複数指定 
     200        case 'multiple': 
     201            $this->objDisplay->redirect($this->getLocation('./multiple.php', array(), true)); 
     202            exit; 
     203            break; 
     204 
    199205        default: 
    200206            $objQuery = new SC_Query(); 
     
    206212        } 
    207213 
    208         /** 表示処理 **/ 
    209  
    210         // 会員登録住所の取得 
    211         $col = "name01, name02, pref, addr01, addr02"; 
    212         $where = "customer_id = ?"; 
    213         $objQuery = new SC_Query(); 
    214         $arrCustomerAddr = $objQuery->select($col, "dtb_customer", $where, array($_SESSION['customer']['customer_id'])); 
    215         // 別のお届け先住所の取得 
    216         $col = "other_deliv_id, name01, name02, pref, addr01, addr02"; 
    217         $objQuery->setOrder("other_deliv_id DESC"); 
    218         $objOtherAddr = $objQuery->select($col, "dtb_other_deliv", $where, array($_SESSION['customer']['customer_id'])); 
    219         $this->arrAddr = $arrCustomerAddr; 
    220         $this->tpl_addrmax = count($objOtherAddr); 
    221         $cnt = 1; 
    222         foreach($objOtherAddr as $val) { 
    223             $this->arrAddr[$cnt] = $val; 
    224             $cnt++; 
    225         } 
    226  
     214        // 登録済み住所を取得 
     215        $this->arrAddr = $objCustomer->getCustomerAddress($_SESSION['customer']['customer_id']); 
    227216        // 入力値の取得 
    228217        if (!isset($arrErr)) $arrErr = array(); 
     
    509498        $sqlval['order_birth'] = $objCustomer->getValue('birth'); 
    510499        $sqlval['order_email'] = $objCustomer->getValue('email'); 
    511  
     500        /* 
    512501        $sqlval['deliv_check'] = '-1'; 
    513502        $sqlval['deliv_name01'] = $objCustomer->getValue('name01'); 
     
    526515        $sqlval['deliv_fax02'] = $objCustomer->getValue('fax02'); 
    527516        $sqlval['deliv_fax03'] = $objCustomer->getValue('fax03'); 
    528  
     517        */ 
    529518        $objDb = new SC_Helper_DB_Ex(); 
    530519        $objDb->sfRegistTempOrder($uniqid, $sqlval); 
     
    556545        $sqlval['order_email'] = $objCustomer->getValue('email'); 
    557546 
     547 
    558548        $objQuery = new SC_Query(); 
    559549        $where = "other_deliv_id = ?"; 
    560550        $arrRet = $objQuery->select("*", "dtb_other_deliv", $where, array($other_deliv_id)); 
    561  
     551        $_SESSION['shipping'] = $arrRet; 
     552        /* 
    562553        $sqlval['deliv_check'] = $other_deliv_id; 
    563554        $sqlval['deliv_name01'] = $arrRet[0]['name01']; 
     
    573564        $sqlval['deliv_tel02'] = $arrRet[0]['tel02']; 
    574565        $sqlval['deliv_tel03'] = $arrRet[0]['tel03']; 
    575  
     566        */ 
    576567        $objDb = new SC_Helper_DB_Ex(); 
    577568        $objDb->sfRegistTempOrder($uniqid, $sqlval); 
Note: See TracChangeset for help on using the changeset viewer.