Index: /branches/version-2_11-dev/data/class/util/SC_Utils.php
===================================================================
--- /branches/version-2_11-dev/data/class/util/SC_Utils.php (revision 20863)
+++ /branches/version-2_11-dev/data/class/util/SC_Utils.php (revision 20943)
@@ -771,12 +771,11 @@
function sfSwapArray($array, $isColumnName = true) {
$arrRet = array();
- $max = count($array);
- for($i = 0; $i < $max; $i++) {
- $j = 0;
- foreach($array[$i] as $key => $val) {
+ foreach($array as $key1 => $arr1) {
+ $i = 0;
+ foreach($arr1 as $key2 => $val) {
if ($isColumnName) {
- $arrRet[$key][] = $val;
+ $arrRet[$key2][$key1] = $val;
} else {
- $arrRet[$j][] = $val;
+ $arrRet[$i][$i] = $val;
}
$j++;
Index: /branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
===================================================================
--- /branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 20911)
+++ /branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php (revision 20943)
@@ -34,4 +34,37 @@
class LC_Page_Admin_Order_Edit extends LC_Page_Admin_Order_Ex {
+ var $arrShippingKeys = array(
+ 'shipping_id',
+ 'shipping_name01',
+ 'shipping_name02',
+ 'shipping_kana01',
+ 'shipping_kana02',
+ 'shipping_tel01',
+ 'shipping_tel02',
+ 'shipping_tel03',
+ 'shipping_fax01',
+ 'shipping_fax02',
+ 'shipping_fax03',
+ 'shipping_pref',
+ 'shipping_zip01',
+ 'shipping_zip02',
+ 'shipping_addr01',
+ 'shipping_addr02',
+ 'shipping_date_year',
+ 'shipping_date_month',
+ 'shipping_date_day',
+ 'time_id',
+ );
+
+ var $arrShipmentItemKeys = array(
+ 'shipment_product_class_id',
+ 'shipment_product_code',
+ 'shipment_product_name',
+ 'shipment_classcategory_name1',
+ 'shipment_classcategory_name2',
+ 'shipment_price',
+ 'shipment_quantity',
+ );
+
// }}}
// {{{ functions
@@ -205,4 +238,5 @@
$this->arrForm = $objFormParam->getFormParamList();
+ $this->arrAllShipping = $objFormParam->getSwapArray(array_merge($this->arrShippingKeys, $this->arrShipmentItemKeys));
$this->arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
$this->tpl_onload .= $this->getAnchorKey($objFormParam);
@@ -384,15 +418,15 @@
* フォームの配送先ごとの配列を生成
*
- * $arrShipmentForm['(key)'][$shipping_index][$item_index] = 値
- * $arrProductQuantity[$shipping_index] = 配送先ごとの配送商品数量
+ * $arrShipmentForm['(key)'][$shipping_id][$item_index] = 値
+ * $arrProductQuantity[$shipping_id] = 配送先ごとの配送商品数量
*/
$arrShipmentForm = array();
$arrProductQuantity = array();
$arrShippingIds = $objFormParam->getValue('shipping_id');
- foreach ($arrShippingIds as $shipping_index => $shipping_id) {
+ foreach ($arrShippingIds as $shipping_id) {
$item_index = 0;
foreach ($arrShipmentItem[$shipping_id] as $product_class_id => $shipment_item) {
foreach ($shipment_item as $key => $val) {
- $arrShipmentForm[$key][$shipping_index][$item_index] = $val;
+ $arrShipmentForm[$key][$shipping_id][$item_index] = $val;
}
// 受注商品の数量を設定
@@ -401,5 +435,5 @@
}
// 配送先ごとの配送商品数量を設定
- $arrProductQuantity[$shipping_index] = count($arrShipmentItem[$shipping_id]);
+ $arrProductQuantity[$shipping_id] = count($arrShipmentItem[$shipping_id]);
}
@@ -433,14 +467,15 @@
$objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrOrderDetail));
- $arrShippings = $objPurchase->getShippings($order_id);
- // お届け日の処理
- foreach (array_keys($arrShippings) as $key) {
- $shipping =& $arrShippings[$key];
- if (!SC_Utils_Ex::isBlank($shipping["shipping_date"])) {
- $ts = strtotime($shipping["shipping_date"]);
- $arrShippings[$key]['shipping_date_year'] = date('Y', $ts);
- $arrShippings[$key]['shipping_date_month'] = date('n', $ts);
- $arrShippings[$key]['shipping_date_day'] = date('j', $ts);
- }
+ $arrShippingsTmp = $objPurchase->getShippings($order_id);
+ $arrShippings = array();
+ foreach ($arrShippingsTmp as $row) {
+ // お届け日の処理
+ if (!SC_Utils_Ex::isBlank($row["shipping_date"])) {
+ $ts = strtotime($row["shipping_date"]);
+ $row['shipping_date_year'] = date('Y', $ts);
+ $row['shipping_date_month'] = date('n', $ts);
+ $row['shipping_date_day'] = date('j', $ts);
+ }
+ $arrShippings[$row['shipping_id']] = $row;
}
$objFormParam->setValue('shipping_quantity', count($arrShippings));
@@ -450,14 +485,14 @@
* 配送商品を設定
*
- * $arrShipmentItem['shipment_(key)'][$shipping_index][$item_index] = 値
- * $arrProductQuantity[$shipping_index] = 配送先ごとの配送商品数量
+ * $arrShipmentItem['shipment_(key)'][$shipping_id][$item_index] = 値
+ * $arrProductQuantity[$shipping_id] = 配送先ごとの配送商品数量
*/
$arrProductQuantity = array();
$arrShipmentItem = array();
- foreach ($arrShippings as $shipping_index => $arrShipping) {
- $arrProductQuantity[$shipping_index] = count($arrShipping['shipment_item']);
+ foreach ($arrShippings as $shipping_id => $arrShipping) {
+ $arrProductQuantity[$shipping_id] = count($arrShipping['shipment_item']);
foreach ($arrShipping['shipment_item'] as $item_index => $arrItem) {
foreach ($arrItem as $item_key => $item_val) {
- $arrShipmentItem['shipment_' . $item_key][$shipping_index][$item_index] = $item_val;
+ $arrShipmentItem['shipment_' . $item_key][$shipping_id][$item_index] = $item_val;
}
}
@@ -641,33 +676,6 @@
}
- $arrAllShipping = $objFormParam->getSwapArray(array('shipping_id',
- 'shipping_name01',
- 'shipping_name02',
- 'shipping_kana01',
- 'shipping_kana02',
- 'shipping_tel01',
- 'shipping_tel02',
- 'shipping_tel03',
- 'shipping_fax01',
- 'shipping_fax02',
- 'shipping_fax03',
- 'shipping_pref',
- 'shipping_zip01',
- 'shipping_zip02',
- 'shipping_addr01',
- 'shipping_addr02',
- 'shipping_date_year',
- 'shipping_date_month',
- 'shipping_date_day',
- 'time_id'));
-
- $arrAllShipmentItem =
- $objFormParam->getSwapArray(array('shipment_product_class_id',
- 'shipment_product_code',
- 'shipment_product_name',
- 'shipment_classcategory_name1',
- 'shipment_classcategory_name2',
- 'shipment_price',
- 'shipment_quantity'));
+ $arrAllShipping = $objFormParam->getSwapArray($this->arrShippingKeys);
+ $arrAllShipmentItem = $objFormParam->getSwapArray($this->arrShipmentItemKeys);
$arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
Index: /branches/version-2_11-dev/data/class/SC_FormParam.php
===================================================================
--- /branches/version-2_11-dev/data/class/SC_FormParam.php (revision 20830)
+++ /branches/version-2_11-dev/data/class/SC_FormParam.php (revision 20943)
@@ -350,12 +350,9 @@
// 配列の縦横を入れ替えて返す
function getSwapArray($arrKey) {
- foreach($arrKey as $keyname) {
- $arrVal = $this->getValue($keyname);
- $max = count($arrVal);
- for($i = 0; $i < $max; $i++) {
- $arrRet[$i][$keyname] = $arrVal[$i];
- }
- }
- return $arrRet;
+ $arrRet = array();
+ foreach ($arrKey as $keyname) {
+ $arrRet[$keyname] = $this->getValue($keyname);
+ }
+ return SC_Utils_Ex::sfSwapArray($arrRet);
}
Index: /branches/version-2_11-dev/data/Smarty/templates/admin/order/edit.tpl
===================================================================
--- /branches/version-2_11-dev/data/Smarty/templates/admin/order/edit.tpl (revision 20764)
+++ /branches/version-2_11-dev/data/Smarty/templates/admin/order/edit.tpl (revision 20943)
@@ -387,17 +387,15 @@
-
-
-
+
- お届け先
+ お届け先
- " id="_" />
+ " id="_" />
-
-
-
+
+
+
@@ -407,5 +405,5 @@
| 数量 |
-
+
@@ -413,8 +411,8 @@
-
+
-
-
+
+
|
@@ -422,18 +420,18 @@
-
-
-
- //
+
+
+
+ //
|
- 円
-
+ 円
+
|
-
-
+
+
|
@@ -450,6 +448,6 @@
-
-
+
+
@@ -460,6 +458,6 @@
-
-
+
+
@@ -473,7 +471,7 @@
- -
- -
-
+ -
+ -
+
@@ -485,7 +483,7 @@
〒
-
+
-
-
+
住所入力
@@ -493,12 +491,12 @@
-
+
-
+
@@ -510,5 +508,5 @@
@@ -524,11 +522,11 @@
年
月
日
@@ -536,5 +534,5 @@
-
+