Index: branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/multiple.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/multiple.tpl (revision 20614)
+++ branches/version-2_5-dev/data/Smarty/templates/mobile/shopping/multiple.tpl (revision 20670)
@@ -26,25 +26,48 @@
+
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-◎
-：
-：
+◎
+：
+：
-円
-
-数量：
+円
+
+
+
+
+
+数量：
-
+
+
お届け先：
-
+
-
+
Index: branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/multiple.tpl
===================================================================
--- branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/multiple.tpl (revision 20614)
+++ branches/version-2_5-dev/data/Smarty/templates/sphone/shopping/multiple.tpl (revision 20670)
@@ -48,6 +48,10 @@
+
-
+
+
+
+
-
+
Index: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php (revision 20538)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php (revision 20670)
@@ -74,14 +74,15 @@
$this->addrs = $this->getDelivAddrs($objCustomer, $objPurchase,
$this->tpl_uniqid);
- $this->items = $this->splitItems($objCartSess);
-
- $this->lfInitParam($this->items, $objFormParam);
- $objFormParam->setParam($_POST);
+ $this->lfInitParam($objFormParam);
+
$objPurchase->verifyChangeCart($this->tpl_uniqid, $objCartSess);
switch ($this->getMode()) {
case 'confirm':
+ $objFormParam->setParam($_POST);
$this->arrErr = $this->lfCheckError($objFormParam);
if (SC_Utils_Ex::isBlank($this->arrErr)) {
+ // フォームの情報を一時保存しておく
+ $_SESSION['multiple_temp'] = $objFormParam->getHashArray();
$this->saveMultipleShippings($this->tpl_uniqid, $objFormParam,
$objCustomer, $objPurchase,
@@ -94,4 +95,10 @@
default:
+ $this->setParamToSplitItems($objFormParam, $objCartSess);
+ }
+
+ // 前のページから戻ってきた場合
+ if ($_GET['from'] == 'multiple') {
+ $objFormParam->setParam($_SESSION['multiple_temp']);
}
@@ -111,31 +118,47 @@
* フォームを初期化する.
*
- * @param array $arrItems 数量ごとに分割した, カートの商品情報の配列
- * @param SC_FormParam $objFormParam SC_FormParam インスタンス
- * @return void
- */
- function lfInitParam($arrItems, $objFormParam) {
- for ($i = 0; $i < count($arrItems); $i++) {
- $objFormParam->addParam("商品規格ID", "product_class_id" . $i, INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
- $objFormParam->addParam("数量", 'quantity' . $i, INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"), 1);
- $objFormParam->addParam("配送先住所", 'shipping' . $i, INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
- $objFormParam->addParam("カート番号", "cart_no" . $i, INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
- }
- }
-
- /**
- * カートの商品を数量ごとに分割する
- *
+ * @param SC_FormParam $objFormParam SC_FormParam インスタンス
+ * @return void
+ */
+ function lfInitParam(&$objFormParam) {
+ $objFormParam->addParam("商品規格ID", "product_class_id", INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
+ $objFormParam->addParam("商品名", "name");
+ $objFormParam->addParam("規格1", "class_name1");
+ $objFormParam->addParam("規格2", "class_name2");
+ $objFormParam->addParam("規格分類1", "classcategory_name1");
+ $objFormParam->addParam("規格分類2", "classcategory_name2");
+ $objFormParam->addParam("メイン画像", "main_image");
+ $objFormParam->addParam("メイン一覧画像", "main_list_image");
+ $objFormParam->addParam("販売価格", "price02");
+ $objFormParam->addParam("数量", 'quantity', INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"), 1);
+ $objFormParam->addParam("配送先住所", 'shipping', INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
+ $objFormParam->addParam("カート番号", "cart_no", INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
+ $objFormParam->addParam("行数", "line_of_num", INT_LEN, 'n', array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK"));
+ }
+
+ /**
+ * カートの商品を数量ごとに分割し, フォームに設定する.
+ *
+ * @param SC_FormParam $objFormParam SC_FormParam インスタンス
* @param SC_CartSession $objCartSess SC_CartSession インスタンス
- * @return array 数量ごとに分割した, カートの商品情報の配列
- */
- function splitItems(&$objCartSess) {
+ * @return void
+ */
+ function setParamToSplitItems(&$objFormParam, &$objCartSess) {
$cartLists =& $objCartSess->getCartList($objCartSess->getKey());
+ $arrItems = array();
+ $index = 0;
foreach (array_keys($cartLists) as $key) {
- for ($i = 0; $i < $cartLists[$key]['quantity']; $i++) {
- $items[] =& $cartLists[$key]['productsClass'];
- }
- }
- return $items;
+ $arrProductsClass = $cartLists[$key]['productsClass'];
+ $quantity = (int) $cartLists[$key]['quantity'];
+ for ($i = 0; $i < $quantity; $i++) {
+ foreach ($arrProductsClass as $key => $val) {
+ $arrItems[$key][$index] = $val;
+ }
+ $arrItems['quantity'][$index] = 1;
+ $index++;
+ }
+ }
+ $objFormParam->setParam($arrItems);
+ $objFormParam->setValue('line_of_num', $index);
}
@@ -205,7 +228,8 @@
$arrParams = $objFormParam->getHashArray();
- $i = 0;
- while ($arrParams['cart_no' . $i] != null) {
- $other_deliv_id = $arrParams['shipping' . $i];
+ $total = $arrParams['line_of_num'];
+
+ for ($index = 0; $index < $total; $index++) {
+ $other_deliv_id = $arrParams['shipping'][$index];
if ($objCustomer->isLoginSuccess(true)) {
@@ -222,9 +246,13 @@
}
}
-
- $objPurchase->setShipmentItemTemp($other_deliv_id,
- $arrParams['product_class_id' . $i],
- $arrParams['quantity' . $i]);
- $i++;
+ $arrItemTemp[$other_deliv_id][$arrParams['product_class_id'][$index]] += $arrParams['quantity'][$index];
+ }
+
+ foreach ($arrItemTemp as $other_deliv_id => $arrProductClassIds) {
+ foreach ($arrProductClassIds as $product_class_id => $quantity) {
+ $objPurchase->setShipmentItemTemp($other_deliv_id,
+ $product_class_id,
+ $quantity);
+ }
}
Index: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
===================================================================
--- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php (revision 20655)
+++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php (revision 20670)
@@ -102,5 +102,5 @@
// 戻り URL の設定
- $this->tpl_back_url = $this->getPreviousURL($objCustomer->isLoginSuccess(true), $cart_key);
+ $this->tpl_back_url = $this->getPreviousURL($objCustomer->isLoginSuccess(true), $cart_key, $this->is_multiple);
$arrOrderTemp = $objPurchase->getOrderTemp($this->tpl_uniqid);
@@ -408,8 +408,12 @@
*
* @param boolean $is_login ユーザーがログインしている場合 true
- * @param $product_type_id 商品種別ID
+ * @param integer $product_type_id 商品種別ID
+ * @param boolean $is_multiple 複数配送の場合 true
* @return string 前に戻るボタンの URL
*/
- function getPreviousURL($is_login = false, $product_type_id) {
+ function getPreviousURL($is_login = false, $product_type_id, $is_multiple) {
+ if ($is_multiple) {
+ return MULTIPLE_URLPATH . '?from=multiple';
+ }
if ($is_login) {
if ($product_type_id == PRODUCT_TYPE_DOWNLOAD) {
Index: branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
===================================================================
--- branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php (revision 20662)
+++ branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php (revision 20670)
@@ -204,5 +204,5 @@
$arrItems[$product_class_id]['shipping_id'] = $shipping_id;
$arrItems[$product_class_id]['product_class_id'] = $product_class_id;
- $arrItems[$product_class_id]['quantity'] += $quantity;
+ $arrItems[$product_class_id]['quantity'] = $quantity;
$objProduct = new SC_Product_Ex();
@@ -222,5 +222,4 @@
function shippingItemTempToCart(&$objCartSession) {
$arrShipmentItems = array();
-
foreach (array_keys($_SESSION['shipping']) as $shipping_id) {
foreach (array_keys($_SESSION['shipping'][$shipping_id]['shipment_item']) as $product_class_id) {
@@ -276,4 +275,5 @@
function unsetShippingTemp() {
unset($_SESSION['shipping']);
+ unset($_SESSION['multiple_temp']);
}