Ignore:
Timestamp:
2013/09/19 11:49:03 (7 years ago)
Author:
m_uehara
Message:

#2363 r23177, r23181 - r23186, r23188 - r23191, r23194, r23197, r23199 - r23218, r23220, r23223 - r23225 をマージ

File:
1 edited

Legend:

Unmodified
Added
Removed
  • branches/version-2_13-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

    r23170 r23230  
    325325        $objFormParam->addParam('注文者 お名前(フリガナ・姓)', 'order_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB')); 
    326326        $objFormParam->addParam('注文者 お名前(フリガナ・名)', 'order_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB')); 
    327         $objFormParam->addParam('注文者 会社名', 'order_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB')); 
     327        $objFormParam->addParam('注文者 会社名', 'order_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); 
    328328        $objFormParam->addParam('メールアドレス', 'order_email', null, 'KVCa', array('NO_SPTAB', 'EMAIL_CHECK', 'EMAIL_CHAR_CHECK')); 
    329329        $objFormParam->addParam('国', 'order_country_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
     
    400400        $objFormParam->addParam('お名前(フリガナ・姓)', 'shipping_kana01', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB')); 
    401401        $objFormParam->addParam('お名前(フリガナ・名)', 'shipping_kana02', STEXT_LEN, 'KVCa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB')); 
    402         $objFormParam->addParam('会社名', 'shipping_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK', 'NO_SPTAB')); 
     402        $objFormParam->addParam('会社名', 'shipping_company_name', STEXT_LEN, 'KVa', array('SPTAB_CHECK', 'MAX_LENGTH_CHECK')); 
    403403        $objFormParam->addParam('国', 'shipping_country_id', INT_LEN, 'n', array('NUM_CHECK', 'MAX_LENGTH_CHECK')); 
    404404        $objFormParam->addParam('ZIPCODE', 'shipping_zipcode', STEXT_LEN, 'n', array('GRAPH_CHECK', 'MAX_LENGTH_CHECK')); 
     
    10891089    { 
    10901090        $arrShipmentsItems = $objFormParam->getSwapArray(array('shipment_product_class_id','shipment_quantity')); 
    1091         foreach ($arrShipmentsItems as $arritems) { 
    1092             foreach ($arritems['shipment_product_class_id'] as $relation_index => $shipment_product_class_id) { 
    1093                 $arrUpdateQuantity[$shipment_product_class_id] += $arritems['shipment_quantity'][$relation_index]; 
    1094             } 
    1095         } 
    1096  
    1097         $arrProductsClass = $objFormParam->getValue('product_class_id'); 
    1098         $arrProductsQuantity = $objFormParam->getValue('quantity'); 
    1099         foreach ($arrProductsClass as $relation_key => $product_class_id) { 
    1100             $arrQuantity['quantity'][$relation_key] = $arrUpdateQuantity[$product_class_id]; 
    1101         } 
    1102         $objFormParam->setParam($arrQuantity); 
     1091         
     1092        // 配送先が存在する時のみ、商品個数の再設定を行います 
     1093        if(!SC_Utils_Ex::isBlank($arrShipmentsItems)) { 
     1094            foreach ($arrShipmentsItems as $arritems) { 
     1095                foreach ($arritems['shipment_product_class_id'] as $relation_index => $shipment_product_class_id) { 
     1096                    $arrUpdateQuantity[$shipment_product_class_id] += $arritems['shipment_quantity'][$relation_index]; 
     1097                } 
     1098            } 
     1099 
     1100            $arrProductsClass = $objFormParam->getValue('product_class_id'); 
     1101            $arrProductsQuantity = $objFormParam->getValue('quantity'); 
     1102            foreach ($arrProductsClass as $relation_key => $product_class_id) { 
     1103                $arrQuantity['quantity'][$relation_key] = $arrUpdateQuantity[$product_class_id]; 
     1104            } 
     1105            $objFormParam->setParam($arrQuantity); 
     1106        } 
    11031107    } 
    11041108 
Note: See TracChangeset for help on using the changeset viewer.