Changeset 19890


Ignore:
Timestamp:
2011/01/12 17:44:52 (10 years ago)
Author:
nanasess
bzr:base-revision:
svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19889
bzr:committer:
Kentaro Ohkouchi <ohkouchi@loop-az.jp>
bzr:file-ids:

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/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
docs/eccube-diagram.jude eccubediagram.jude-20101102081620-jpq1fqmox6ocmuj3-2
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
bzr:mapping-version:
v4
bzr:merge:

ohkouchi@loop-az.jp-20110112084354-2s1nq0o6zc2lz2cd
bzr:repository-uuid:
1e3b908f-19a9-db11-a64c-001125224ba8
bzr:revision-id:
ohkouchi@loop-az.jp-20110112084449-61556v4whzcw36g3
bzr:revno:
2619
bzr:revprop:branch-nick:
branches/version-2_5-dev
bzr:root:
branches/version-2_5-dev
bzr:text-revisions:

data/class/pages/shopping/LC_Page_Shopping.php ohkouchi@loop-az.jp-20110112084354-2s1nq0o6zc2lz2cd
docs/eccube-diagram.jude ohkouchi@loop-az.jp-20110112084354-2s1nq0o6zc2lz2cd
html/install/sql/create_table_mysql.sql ohkouchi@loop-az.jp-20110112084354-2s1nq0o6zc2lz2cd
html/install/sql/create_table_pgsql.sql ohkouchi@loop-az.jp-20110112084354-2s1nq0o6zc2lz2cd
bzr:timestamp:
2011-01-12 17:44:49.048000097 +0900
bzr:user-agent:
bzr2.2.1+bzr-svn1.0.4
svn:original-date:
2011-01-12T08:44:49.048000Z
Message:

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

  • 非会員購入時, 別のお届け先を指定した場合に複数配送扱いになってしまうのを修正
  • 非会員購入時, お届け先住所が保存されないのを修正
  • ER図を修正
Location:
branches/version-2_5-dev
Files:
4 edited

Legend:

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

    r19872 r19890  
    162162            if(count($this->arrErr) == 0) { 
    163163                // DBへのデータ登録 
    164                 $this->lfRegistData($uniqid, $objPurchase, $objCustomer, $this->cartKey); 
     164                $this->lfRegistData($uniqid, $objPurchase, $objCustomer, $this->cartKey, true); 
    165165                // 正常に登録されたことを記録しておく 
    166166                $objSiteSess->setRegistFlag(); 
     
    181181            // ※breakなし 
    182182        default: 
    183             $objPurchase->unsetShippingTemp(); 
    184183            if(isset($_GET['from']) && $_GET['from'] == 'nonmember') { 
    185184                $this->tpl_mainpage = 'shopping/nonmember_input.tpl'; 
     
    189188            if (empty($arrOrderTemp)) $arrOrderTemp = array('order_email' => "", 
    190189                                                            'order_birth' => ""); 
    191  
     190            $arrShippingTemp = $objPurchase->getShippingTemp(); 
    192191            // DB値の取得 
    193192            $this->objFormParam->setParam($arrOrderTemp); 
     193            /* 
     194             * count($arrShippingTemp) > 1 は複数配送であり, 
     195             * $arrShippingTemp[0] は注文者が格納されている 
     196             */ 
     197            if (count($arrShippingTemp) > 1) { 
     198                $this->objFormParam->setParam($arrShippingTemp[1]); 
     199            } else { 
     200                $this->objFormParam->setParam($arrShippingTemp[0]); 
     201            } 
    194202            $this->objFormParam->setValue('order_email02', $arrOrderTemp['order_email']); 
    195203            $this->objFormParam->setDBDate($arrOrderTemp['order_birth']); 
     204            $objPurchase->unsetShippingTemp(); 
    196205        } 
    197206 
     
    304313        $this->objFormParam->addParam("性別", "order_sex", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); 
    305314        $this->objFormParam->addParam("職業", "order_job", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
    306         $this->objFormParam->addParam("別のお届け先", "deliv_check", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), "", false); 
     315        $this->objFormParam->addParam("別のお届け先", "deliv_check", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 
    307316        $this->objFormParam->addParam("お名前(姓)", "shipping_name01", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    308317        $this->objFormParam->addParam("お名前(名)", "shipping_name02", STEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
     
    321330 
    322331    /* DBへデータの登録 */ 
    323     function lfRegistData($uniqid, &$objPurchase, &$objCustomer, $productTypeId) { 
     332    function lfRegistData($uniqid, &$objPurchase, &$objCustomer, $productTypeId, $isMultiple = false) { 
    324333        $params = $this->objFormParam->getHashArray(); 
    325334        $sqlval = $this->objFormParam->getDbArray(); 
     
    349358            } 
    350359        } 
    351         $objPurchase->saveShippingTemp($order_val, 0); 
    352         if ($params['deliv_check'] == '1') { 
    353             $objPurchase->saveShippingTemp($shipping_val, 1); 
     360        if ($isMultiple) { 
     361            $objPurchase->saveShippingTemp($order_val, 0); 
     362            if ($params['deliv_check'] == '1') { 
     363                $objPurchase->saveShippingTemp($shipping_val, 1); 
     364            } 
     365        } else { 
     366            if ($params['deliv_check'] == '1') { 
     367                $objPurchase->saveShippingTemp($shipping_val, 0); 
     368            } else { 
     369                $objPurchase->saveShippingTemp($order_val, 0); 
     370            } 
    354371        } 
    355372        $objPurchase->saveOrderTemp($uniqid, $sqlval, $objCustomer); 
  • branches/version-2_5-dev/html/install/sql/create_table_mysql.sql

    r19861 r19890  
    657657    mail_flag smallint, 
    658658    status smallint, 
     659    deliv_check smallint, 
    659660    point_check smallint, 
    660661    create_date timestamp NOT NULL DEFAULT CURRENT_TIMESTAMP, 
  • branches/version-2_5-dev/html/install/sql/create_table_pgsql.sql

    r19861 r19890  
    659659    mail_flag smallint, 
    660660    status smallint, 
     661    deliv_check smallint, 
    661662    point_check smallint, 
    662663    create_date timestamp NOT NULL DEFAULT now(), 
Note: See TracChangeset for help on using the changeset viewer.