Changeset 23123


Ignore:
Timestamp:
2013/08/24 21:18:41 (7 years ago)
Author:
undertree
Message:

IssueID #2229 受注関連修正

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

Legend:

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

    r23101 r23123  
    354354                        <a class="btn-normal" href="javascript:;" name="change" onclick="eccube.openWindow('<!--{$smarty.const.ROOT_URLPATH}--><!--{$smarty.const.ADMIN_DIR}-->order/product_select.php?no=<!--{$product_index}-->&amp;order_id=<!--{$arrForm.order_id.value|h}-->&amp;shipping_id=<!--{$top_shipping_id}-->', 'search', '615', '500', {menubar:'no'}); return false;">変更</a> 
    355355                        <!--{if count($arrForm.quantity.value) > 1}--> 
    356                             <a class="btn-normal" href="javascript:;" name="delete" onclick="eccube.setValue('delete_no', <!--{$product_index}-->, 'form1'); eccube.setValue(select_shipping_id', '<!--{$top_shipping_id}-->', 'form1'); eccube.setModeAndSubmit('delete_product','anchor_key','order_products'); return false;">削除</a> 
     356                            <a class="btn-normal" href="javascript:;" name="delete" onclick="eccube.setValue('delete_no', <!--{$product_index}-->, 'form1'); eccube.setValue('select_shipping_id', '<!--{$top_shipping_id}-->', 'form1'); eccube.setModeAndSubmit('delete_product','anchor_key','order_products'); return false;">削除</a> 
    357357                        <!--{/if}--> 
    358358                    <!--{/if}--> 
  • branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

    r23053 r23123  
    953953        $arrShipmentProducts = $this->getShipmentProducts($objFormParam); 
    954954 
    955         if(in_array($add_product_class_id, $arrShipmentProducts['shipment_product_class_id'][$select_shipping_id])){ 
     955        if($arrShipmentProducts['shipment_product_class_id'] && in_array($add_product_class_id, $arrShipmentProducts['shipment_product_class_id'][$select_shipping_id])){ 
    956956            foreach ($arrShipmentProducts['shipment_product_class_id'][$select_shipping_id] as $relation_index => $shipment_product_class_id) { 
    957957                if($shipment_product_class_id == $add_product_class_id){ 
     
    11681168    function checkInsertOrderProducts(&$objFormParam, $arrProductClassIds, $insert_product_class_id, $arrAddProductInfo) 
    11691169    { 
    1170         if(is_array($arrProductClassIds) && !in_array($insert_product_class_id, $arrProductClassIds)){ 
     1170        if(!$arrProductClassIds || !in_array($insert_product_class_id, $arrProductClassIds)){ 
    11711171            $arrAddProducts = array(); 
    11721172 
Note: See TracChangeset for help on using the changeset viewer.