Changeset 22554 for branches/version-2_12-dev/data/class/pages

Timestamp:

2013/02/15 21:45:14 (13 years ago)

Author:

pineray

Message:

#2136 dtb_deliv の処理を SC_Helper_Delivery クラスに集める.

Location:

branches/version-2_12-dev/data/class/pages

Files:

• admin/basis/LC_Page_Admin_Basis_DeliveryInput.php (modified) (1 diff)
• admin/order/LC_Page_Admin_Order_Disp.php (modified) (1 diff)
• admin/order/LC_Page_Admin_Order_Edit.php (modified) (2 diffs)
• shopping/LC_Page_Shopping_Payment.php (modified) (1 diff)

branches/version-2_12-dev/data/class/pages/admin/basis/LC_Page_Admin_Basis_DeliveryInput.php

@@ -216 +216 @@
 
         // お届け時間
-        $objFormParam->setParamList($arrDeliv['deliv_time'], 'deliv_time');
+        $deliv_times = array();
+        foreach ($arrDeliv['deliv_time'] as $value) {
+            $deliv_times[]['deliv_time'] = $value;
+        }
+        $objFormParam->setParamList($deliv_times, 'deliv_time');
         unset($arrDeliv['deliv_time']);
         // 配送料金
-        $objFormParam->setParamList($arrDeliv['fee'], 'fee');
+        $deliv_fee = array();
+        foreach ($arrDeliv['fee'] as $value) {
+            $deliv_fee[]['fee'] = $value;
+        }
+        $objFormParam->setParamList($deliv_fee, 'fee');
         unset($arrDeliv['fee']);
         // 支払方法

branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php

@@ -126 +126 @@
         $this->arrForm = $objFormParam->getFormParamList();
         $this->arrAllShipping = $objFormParam->getSwapArray(array_merge($this->arrShippingKeys, $this->arrShipmentItemKeys));
-        $this->arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
+        $this->arrDelivTime = SC_Helper_Delivery_Ex::getDelivTime($objFormParam->getValue('deliv_id'));
         $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData();
 

branches/version-2_12-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php

@@ -301 +301 @@
         $this->arrAllShipping = $objFormParam->getSwapArray(array_merge($this->arrShippingKeys, $this->arrShipmentItemKeys));
         $this->top_shipping_id      = array_shift((array_keys($this->arrAllShipping)));
-        $this->arrDelivTime   = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
+        $this->arrDelivTime   = SC_Helper_Delivery_Ex::getDelivTime($objFormParam->getValue('deliv_id'));
         $this->tpl_onload .= $this->getAnchorKey($objFormParam);
         if ($arrValuesBefore['payment_id'])
@@ -770 +770 @@
         $arrAllShipmentItem = $objFormParam->getSwapArray($this->arrShipmentItemKeys);
 
-        $arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id'));
+        $arrDelivTime = SC_Helper_Delivery_Ex::getDelivTime($objFormParam->getValue('deliv_id'));
         //商品単価を複数配送にも適応
         $arrShippingValues = array();

branches/version-2_12-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php

@@ -403 +403 @@
     function getSelectedDeliv(&$objPurchase, &$objCartSess, $deliv_id) {
         $arrResults = array();
-        $arrResults['arrDelivTime'] = $objPurchase->getDelivTime($deliv_id);
+        $arrResults['arrDelivTime'] = SC_Helper_Delivery_Ex::getDelivTime($deliv_id);
         $total = $objCartSess->getAllProductsTotal($objCartSess->getKey());
         $arrResults['arrPayment'] = $objPurchase->getPaymentsByPrice($total, $deliv_id);