Ignore:
Timestamp:
2010/07/20 13:25:33 (16 years ago)
Author:
kajiwara
Message:

EC-CUBE Ver2.4.4 分コミット。詳細はこちら（ http://www.ec-cube.net/release/detail.php?release_id=223）

Location:
trunk/data/class/pages/shopping
Files:
6 edited

Legend:

Unmodified
Added
Removed

  • trunk/data/class/pages/shopping/LC_Page_Shopping.php

    r18562 r18758  
    33 * This file is part of EC-CUBE 
    44 * 
    5  * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved. 
     5 * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved. 
    66 * 
    77 * http://www.lockon.co.jp/ 
    … …  
    340340        $this->objFormParam->addParam("住所1", "order_addr01", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    341341        $this->objFormParam->addParam("住所2", "order_addr02", MTEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    342         $this->objFormParam->addParam("電話番号1", "order_tel01", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
    343         $this->objFormParam->addParam("電話番号2", "order_tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
    344         $this->objFormParam->addParam("電話番号3", "order_tel03", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
    345         $this->objFormParam->addParam("FAX番号1", "order_fax01", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
    346         $this->objFormParam->addParam("FAX番号2", "order_fax02", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
    347         $this->objFormParam->addParam("FAX番号3", "order_fax03", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
     342        $this->objFormParam->addParam("電話番号1", "order_tel01", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK")); 
     343        $this->objFormParam->addParam("電話番号2", "order_tel02", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK")); 
     344        $this->objFormParam->addParam("電話番号3", "order_tel03", TEL_ITEM_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK")); 
     345        $this->objFormParam->addParam("FAX番号1", "order_fax01", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK")); 
     346        $this->objFormParam->addParam("FAX番号2", "order_fax02", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK")); 
     347        $this->objFormParam->addParam("FAX番号3", "order_fax03", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK")); 
    348348        $this->objFormParam->addParam("メールアドレス", "order_email", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "NO_SPTAB", "MAX_LENGTH_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK")); 
    349349        $this->objFormParam->addParam("メールアドレス（確認）", "order_email_check", STEXT_LEN, "KVa", array("EXIST_CHECK", "SPTAB_CHECK", "NO_SPTAB", "MAX_LENGTH_CHECK", "EMAIL_CHECK", "EMAIL_CHAR_CHECK"), "", false); 
    … …  
    363363        $this->objFormParam->addParam("住所1", "deliv_addr01", MTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    364364        $this->objFormParam->addParam("住所2", "deliv_addr02", MTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 
    365         $this->objFormParam->addParam("電話番号1", "deliv_tel01", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
    366         $this->objFormParam->addParam("電話番号2", "deliv_tel02", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
    367         $this->objFormParam->addParam("電話番号3", "deliv_tel03", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK" ,"NUM_CHECK")); 
     365        $this->objFormParam->addParam("電話番号1", "deliv_tel01", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK")); 
     366        $this->objFormParam->addParam("電話番号2", "deliv_tel02", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK")); 
     367        $this->objFormParam->addParam("電話番号3", "deliv_tel03", TEL_ITEM_LEN, "n", array("MAX_LENGTH_CHECK")); 
    368368        $this->objFormParam->addParam("メールマガジン", "mail_flag", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), 1); 
    369369    } 

  • trunk/data/class/pages/shopping/LC_Page_Shopping_Complete.php

    r18562 r18758  
    33 * This file is part of EC-CUBE 
    44 * 
    5  * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved. 
     5 * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved. 
    66 * 
    77 * http://www.lockon.co.jp/ 
    … …  
    9494 
    9595            // その他情報の取得 
    96             $arrResults = $objQuery->getall("SELECT memo02, memo05 FROM dtb_order WHERE order_id = ? ", array($order_id)); 
     96            $arrResults = $objQuery->getAll("SELECT memo02, memo05 FROM dtb_order WHERE order_id = ? ", array($order_id)); 
    9797 
    9898            if (count($arrResults) > 0) { 
    … …  
    260260        $arrEbis['o4id'] = $arrRet[0]['order_job']; 
    261261 
    262         $objQuery->setgroupby("product_id"); 
     262        $objQuery->setGroupBy("product_id"); 
    263263        $arrRet = $objQuery->select("product_id", "dtb_order_detail", "order_id = ?", array($order_id)); 
    264264        $arrProducts = sfSwapArray($arrRet); 

  • trunk/data/class/pages/shopping/LC_Page_Shopping_Confirm.php

    r18432 r18758  
    33 * This file is part of EC-CUBE 
    44 * 
    5  * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved. 
     5 * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved. 
    66 * 
    77 * http://www.lockon.co.jp/ 
    … …  
    116116            // MEMO03に値が入っている場合には、モジュール追加されたものとみなす 
    117117            $sql = "SELECT memo03 FROM dtb_payment WHERE payment_id = ?"; 
    118             $arrPayment = $objQuery->getall($sql, array($arrData['payment_id'])); 
     118            $arrPayment = $objQuery->getAll($sql, array($arrData['payment_id'])); 
    119119            $payment_type = $arrPayment[0]["memo03"]; 
    120120        } 
    … …  
    222222            // MEMO03に値が入っている場合には、モジュール追加されたものとみなす 
    223223            $sql = "SELECT memo03 FROM dtb_payment WHERE payment_id = ?"; 
    224             $arrPayment = $objQuery->getall($sql, array($arrData['payment_id'])); 
     224            $arrPayment = $objQuery->getAll($sql, array($arrData['payment_id'])); 
    225225            $payment_type = $arrPayment[0]["memo03"]; 
    226226        } 

  • trunk/data/class/pages/shopping/LC_Page_Shopping_Deliv.php

    r18562 r18758  
    33 * This file is part of EC-CUBE 
    44 * 
    5  * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved. 
     5 * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved. 
    66 * 
    77 * http://www.lockon.co.jp/ 
    … …  
    201201        // 別のお届け先住所の取得 
    202202        $col = "other_deliv_id, name01, name02, pref, addr01, addr02"; 
    203         $objQuery->setorder("other_deliv_id DESC"); 
     203        $objQuery->setOrder("other_deliv_id DESC"); 
    204204        $objOtherAddr = $objQuery->select($col, "dtb_other_deliv", $where, array($_SESSION['customer']['customer_id'])); 
    205205        $this->arrAddr = $arrCustomerAddr; 
    … …  
    389389        // 別のお届け先住所の取得 
    390390        $col = "other_deliv_id, name01, name02, pref, addr01, addr02, zip01, zip02"; 
    391         $objQuery->setorder("other_deliv_id DESC"); 
     391        $objQuery->setOrder("other_deliv_id DESC"); 
    392392        $objOtherAddr = $objQuery->select($col, "dtb_other_deliv", $where, array($_SESSION['customer']['customer_id'])); 
    393393        $this->arrAddr = $arrCustomerAddr; 

  • trunk/data/class/pages/shopping/LC_Page_Shopping_DelivAddr.php

    r18562 r18758  
    33 * This file is part of EC-CUBE 
    44 * 
    5  * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved. 
     5 * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved. 
    66 * 
    77 * http://www.lockon.co.jp/ 
    … …  
    235235        $objErr->doFunc(array("市区町村", "addr01", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK")); 
    236236        $objErr->doFunc(array("番地", "addr02", MTEXT_LEN), array("EXIST_CHECK","SPTAB_CHECK","MAX_LENGTH_CHECK")); 
    237         $objErr->doFunc(array("電話番号1", 'tel01'), array("EXIST_CHECK","NUM_CHECK")); 
    238         $objErr->doFunc(array("電話番号2", 'tel02'), array("EXIST_CHECK","NUM_CHECK")); 
    239         $objErr->doFunc(array("電話番号3", 'tel03'), array("EXIST_CHECK","NUM_CHECK")); 
     237        $objErr->doFunc(array("電話番号1", 'tel01'), array("EXIST_CHECK")); 
     238        $objErr->doFunc(array("電話番号2", 'tel02'), array("EXIST_CHECK")); 
     239        $objErr->doFunc(array("電話番号3", 'tel03'), array("EXIST_CHECK")); 
    240240        $objErr->doFunc(array("電話番号", "tel01", "tel02", "tel03", TEL_LEN) ,array("TEL_CHECK")); 
    241241        return $objErr->arrErr; 

  • trunk/data/class/pages/shopping/LC_Page_Shopping_Payment.php

    r18562 r18758  
    33 * This file is part of EC-CUBE 
    44 * 
    5  * Copyright(c) 2000-2007 LOCKON CO.,LTD. All Rights Reserved. 
     5 * Copyright(c) 2000-2010 LOCKON CO.,LTD. All Rights Reserved. 
    66 * 
    77 * http://www.lockon.co.jp/ 
    … …  
    351351    function lfGetPayment($total_pretax) { 
    352352        $objQuery = new SC_Query(); 
    353         $objQuery->setorder("rank DESC"); 
     353        $objQuery->setOrder("rank DESC"); 
    354354        //削除されていない支払方法を取得 
    355355        $arrRet = $objQuery->select("payment_id, payment_method, rule, upper_rule, note, payment_image", "dtb_payment", "del_flg = 0 AND deliv_id IN (SELECT deliv_id FROM dtb_deliv WHERE del_flg = 0) "); 
Note: See TracChangeset for help on using the changeset viewer.