Ignore:
Timestamp:
2013/02/14 15:17:30 (11 years ago)
Author:
h_yoshimoto
Message:

#1958 r22497 の内容をマージ

Location:
branches/version-2_12-dev/data/class
Files:
5 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_12-dev/data/class/helper/SC_Helper_Address.php

    r22206 r22546  
    3737     * @return array() 
    3838     */ 
    39     function save($sqlval) { 
     39    function registAddress($sqlval) { 
    4040        $objQuery =& SC_Query_Ex::getSingletonInstance(); 
    4141        $customer_id = $sqlval['customer_id']; 
     
    7777     * @return array() 
    7878     */ 
    79     function get($other_deliv_id) { 
     79    function getAddress($other_deliv_id) { 
    8080        $objQuery =& SC_Query_Ex::getSingletonInstance(); 
    8181        $address = $objQuery->select('*', 'dtb_other_deliv', 'other_deliv_id = ?', array($other_deliv_id)); 
     
    106106     * @return void 
    107107     */ 
    108     function delete($other_deliv_id) { 
     108    function deleteAddress($other_deliv_id) { 
    109109        $where      = 'other_deliv_id = ?'; 
    110110        $objQuery   =& SC_Query_Ex::getSingletonInstance(); 
  • branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_Delivery.php

    r22206 r22546  
    8585                } 
    8686 
    87                 $objAddress->delete($objFormParam->getValue('other_deliv_id')); 
     87                $objAddress->deleteAddress($objFormParam->getValue('other_deliv_id')); 
    8888                break; 
    8989 
  • branches/version-2_12-dev/data/class/pages/mypage/LC_Page_Mypage_DeliveryAddr.php

    r22206 r22546  
    136136 
    137137                if ($_GET['other_deliv_id'] != '') { 
    138                     $arrOtherDeliv = $objAddress->get($_SESSION['other_deliv_id']); 
     138                    $arrOtherDeliv = $objAddress->getAddress($_SESSION['other_deliv_id']); 
    139139 
    140140                    //不正アクセス判定 
     
    174174        $sqlval['customer_id'] = $customer_id; 
    175175 
    176         $objAddress->save($sqlval); 
     176        $objAddress->registAddress($sqlval); 
    177177    } 
    178178 
  • branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php

    r22206 r22546  
    110110            // 削除 
    111111            case 'delete': 
    112                 $objAddress->delete($arrForm['other_deliv_id']); 
     112                $objAddress->deleteAddress($arrForm['other_deliv_id']); 
    113113                break; 
    114114 
     
    228228        // 別のお届け先がチェックされている場合 
    229229        else { 
    230             $arrOtherDeliv = $objAddress->get($other_deliv_id); 
     230            $arrOtherDeliv = $objAddress->getAddress($other_deliv_id); 
    231231            if (!$arrOtherDeliv) { 
    232232                return false; 
  • branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php

    r22494 r22546  
    306306            if ($objCustomer->isLoginSuccess(true)) { 
    307307                if ($other_deliv_id != 0) { 
    308                     $otherDeliv = $objAddress->get($other_deliv_id); 
     308                    $otherDeliv = $objAddress->getAddress($other_deliv_id); 
    309309                    foreach ($otherDeliv as $key => $val) { 
    310310                        $arrValues[$other_deliv_id]['shipping_' . $key] = $val; 
Note: See TracChangeset for help on using the changeset viewer.