Changeset 21205


Ignore:
Timestamp:
2011/08/20 18:14:54 (9 years ago)
Author:
Ringo
Message:

#1440 (ステータス管理のポップアップで複数のお届け先が正しく表示されない) 修正もれ

Location:
branches/version-2_11-dev/data
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_11-dev/data/Smarty/templates/admin/order/disp.tpl

    r21201 r21205  
    194194        <!--{assign var=key value="shipping_id"}--> 
    195195        <!--{if $arrForm.shipping_quantity.value > 1}--> 
    196             <!--{assign var=product_quantity value="shipping_product_quantity"}--> 
    197             <!--{if $arrForm[$product_quantity].value[$shipping_index] > 0}--> 
     196 
     197            <!--{if count($arrShipping.shipment_product_class_id) > 0}--> 
    198198                <table class="list" id="order-edit-products"> 
    199199                    <tr> 
     
    299299        </table> 
    300300    <!--{/foreach}--> 
     301    <!--{/if}--> 
    301302    <!--▲お届け先情報ここまで--> 
    302     <!--{/if}--> 
    303          
     303 
    304304        <a name="deliv"></a> 
    305305        <table class="form"> 
  • branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php

    r21201 r21205  
    9292 
    9393        // 配送業者の取得 
    94         $this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList("dtb_deliv", "deliv_id", 'name');   
     94        $this->arrDeliv = SC_Helper_DB_Ex::sfGetIDValueList("dtb_deliv", "deliv_id", 'name'); 
    9595    } 
    9696 
     
    126126        $this->arrAllShipping = $objFormParam->getSwapArray(array_merge($this->arrShippingKeys, $this->arrShipmentItemKeys)); 
    127127        $this->arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id')); 
    128         $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();         
     128        $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData(); 
    129129 
    130130        $this->setTemplate($this->tpl_mainpage); 
     
    318318    } 
    319319 
    320     /** 
    321      * 顧客情報をフォームに設定する. 
    322      * 
    323      * @param integer $customer_id 顧客ID 
    324      * @param SC_FormParam $objFormParam SC_FormParam インスタンス 
    325      * @return void 
    326      */ 
    327     function setCustomerTo($customer_id, &$objFormParam) { 
    328         $arrCustomer = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($customer_id); 
    329         foreach ($arrCustomer as $key => $val) { 
    330             $objFormParam->setValue('order_' . $key, $val); 
    331         } 
    332         $objFormParam->setValue('customer_id', $customer_id); 
    333         $objFormParam->setValue('customer_point', $arrCustomer['point']); 
    334     } 
    335  
    336320} 
    337321?> 
Note: See TracChangeset for help on using the changeset viewer.