Index: branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php =================================================================== --- branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php (revision 18820) +++ branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php (revision 18830) @@ -84,5 +84,6 @@ // カート集計処理 - $objDb->sfTotalCart($this, $objCartSess); + $this->cartKey = $_SESSION['cartKey']; + $objDb->sfTotalCart($this, $objCartSess, $this->cartKey); if (strlen($this->tpl_message) >= 1) { SC_Utils_Ex::sfDispSiteError(SOLD_OUT, '', true); Index: branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php =================================================================== --- branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php (revision 18829) +++ branches/version-2_5-dev/data/class/pages/cart/LC_Page_Cart.php (revision 18830) @@ -101,5 +101,6 @@ case 'confirm': // カート内情報の取得 - $arrRet = $objCartSess->getCartList(); + $cartKey = $_POST['cartKey']; // TODO + $arrRet = $objCartSess->getCartList($cartKey); $max = count($arrRet); $cnt = 0; @@ -128,5 +129,5 @@ } // カートを購入モードに設定 - $objCartSess->saveCurrentCart($uniqid); + $objCartSess->saveCurrentCart($uniqid, $cartKey); // 購入ページへ $this->sendRedirect(URL_SHOP_TOP); @@ -138,10 +139,17 @@ } - // カート集計処理 - $objDb->sfTotalCart($this, $objCartSess); - $this->arrData = $objDb->sfTotalConfirm($this->arrData, $this, $objCartSess, null, $objCustomer); - // 基本情報の取得 $this->arrInfo = $objSiteInfo->data; + + $this->cartKeys = $objCartSess->getKeys(); + foreach ($this->cartKeys as $key) { + // カート集計処理 + $objDb->sfTotalCart($this, $objCartSess, $key); + $this->arrData = $objDb->sfTotalConfirm($this->arrData, $this, $objCartSess, null, $objCustomer, $key); + // 送料無料までの金額を計算 + $this->tpl_deliv_free[$key] = $this->arrInfo['free_rule'] - $this->tpl_total_pretax[$key]; + + + } // ログイン判定 @@ -152,6 +160,4 @@ } - // 送料無料までの金額を計算 - $this->tpl_deliv_free = $this->arrInfo['free_rule'] - $this->tpl_total_pretax; // 前頁のURLを取得 Index: branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php =================================================================== --- branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 18829) +++ branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php (revision 18830) @@ -170,4 +170,5 @@ $this->tpl_stock_find = $objProduct->stock_find[$product_id]; $this->tpl_product_class_id = $objProduct->classCategories[$product_id]['']['']['product_class_id']; + $this->tpl_product_type = $objProduct->classCategories[$product_id]['']['']['product_type']; require_once DATA_PATH . 'module/Services/JSON.php'; @@ -193,4 +194,5 @@ $classcategory_id2 = $_POST['classcategory_id2']; $product_class_id = $_POST['product_class_id']; + $product_type = $_POST['product_type']; if (!empty($_POST['gmo_oneclick'])) { @@ -207,7 +209,5 @@ $classcategory_id2 = '0'; } - // 規格IDを取得 - $objProduct = new SC_Product(); - $objCartSess->addProduct($product_class_id, $this->objFormParam->getValue('quantity')); + $objCartSess->addProduct($product_class_id, $this->objFormParam->getValue('quantity'), $product_type); if (!empty($_POST['gmo_oneclick'])) { Index: branches/version-2_5-dev/data/class/SC_CartSession.php =================================================================== --- branches/version-2_5-dev/data/class/SC_CartSession.php (revision 18819) +++ branches/version-2_5-dev/data/class/SC_CartSession.php (revision 18830) @@ -36,16 +36,17 @@ // 商品購入処理中のロック - function saveCurrentCart($key_tmp) { + function saveCurrentCart($key_tmp, $key) { $this->key_tmp = "savecart_" . $key_tmp; // すでに情報がなければ現状のカート情報を記録しておく if(count($_SESSION[$this->key_tmp]) == 0) { - $_SESSION[$this->key_tmp] = $_SESSION[$this->key]; + $_SESSION[$this->key_tmp] = $_SESSION[$key]; } // 1世代古いコピー情報は、削除しておく - foreach($_SESSION as $key => $val) { - if($key != $this->key_tmp && ereg("^savecart_", $key)) { - unset($_SESSION[$key]); - } - } + foreach($_SESSION as $k => $val) { + if($k != $this->key_tmp && preg_match("/^savecart_/", $k)) { + unset($_SESSION[$key][$k]); + } + } + $this->registerKey($key); } @@ -362,4 +363,12 @@ } } + + function registerKey($key) { + $_SESSION['cartKey'] = $key; + } + + function unsetKey() { + unset($_SESSION['cartKey']); + } } ?> Index: branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php =================================================================== --- branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php (revision 18829) +++ branches/version-2_5-dev/data/class/helper/SC_Helper_DB.php (revision 18830) @@ -245,14 +245,9 @@ * @return LC_Page 集計処理後のページクラスインスタンス */ - function sfTotalCart(&$objPage, $objCartSess, $dummy1 = null) { - - // 規格名一覧 - $arrClassName = $this->sfGetIDValueList("dtb_class", "class_id", "name"); - // 規格分類名一覧 - $arrClassCatName = $this->sfGetIDValueList("dtb_classcategory", "classcategory_id", "name"); - - $objPage->tpl_total_pretax = 0; // 費用合計(税込み) - $objPage->tpl_total_tax = 0; // 消費税合計 - $objPage->tpl_total_point = 0; // ポイント合計 + function sfTotalCart(&$objPage, $objCartSess, $dummy1 = null, $key = "") { + + $objPage->tpl_total_pretax[$key] = 0; // 費用合計(税込み) + $objPage->tpl_total_tax[$key] = 0; // 消費税合計 + $objPage->tpl_total_point[$key] = 0; // ポイント合計 $objProduct = new SC_Product(); @@ -298,21 +293,21 @@ $arrQuantityInfo_by_product[$product_id]['name'] = $arrData['name']; - $objPage->arrProductsClass[$cnt] = $arrData; - $objPage->arrProductsClass[$cnt]['quantity'] = $quantity; - $objPage->arrProductsClass[$cnt]['cart_no'] = $arrCart['cart_no']; - $objPage->arrProductsClass[$cnt]['class_name1'] = + $objPage->arrProductsClass[$cnt][$key] = $arrData; + $objPage->arrProductsClass[$cnt]['quantity'][$key] = $quantity; + $objPage->arrProductsClass[$cnt]['cart_no'][$key] = $arrCart['cart_no']; + $objPage->arrProductsClass[$cnt]['class_name1'][$key] = isset($arrData['class_name1']) ? $arrData['class_name1'] : ""; - $objPage->arrProductsClass[$cnt]['class_name2'] = + $objPage->arrProductsClass[$cnt]['class_name2'][$key] = isset($arrData['class_name2']) ? $arrData['class_name2'] : ""; - $objPage->arrProductsClass[$cnt]['classcategory_name1'] = $arrData['name1']; - - $objPage->arrProductsClass[$cnt]['classcategory_name2'] = $arrData['name2']; + $objPage->arrProductsClass[$cnt]['classcategory_name1'][$key] = $arrData['name1']; + + $objPage->arrProductsClass[$cnt]['classcategory_name2'][$key] = $arrData['name2']; // 価格の登録 $objCartSess->setProductValue($arrCart['id'], 'price', $arrData['price02']); - $objPage->arrProductsClass[$cnt]['uniq_price'] = $arrData['price02']; + $objPage->arrProductsClass[$cnt]['uniq_price'][$key] = $arrData['price02']; // ポイント付与率の登録 if (USE_POINT !== false) { @@ -320,7 +315,7 @@ } // 商品ごとの合計金額 - $objPage->arrProductsClass[$cnt]['total_pretax'] = $objCartSess->getProductTotal($arrCart['id']); + $objPage->arrProductsClass[$cnt]['total_pretax'][$key] = $objCartSess->getProductTotal($arrCart['id']); // 送料の合計を計算する - $objPage->tpl_total_deliv_fee+= ($arrData['deliv_fee'] * $arrCart['quantity']); + $objPage->tpl_total_deliv_fee[$key] += ($arrData['deliv_fee'] * $arrCart['quantity']); $cnt++; } else { // DBに商品が見つからない場合、 @@ -335,6 +330,6 @@ $objPage->tpl_error = "※「{$quantityInfo['name']}」は数量「{$quantityInfo['sale_limit']}」以下に販売制限しております。一度にこれ以上の購入はできません。\n"; // 販売制限に引っかかった商品をマークする - foreach (array_keys($objPage->arrProductsClass) as $key) { - $ProductsClass =& $objPage->arrProductsClass[$key]; + foreach (array_keys($objPage->arrProductsClass) as $k) { + $ProductsClass =& $objPage->arrProductsClass[$k]; if ($ProductsClass['product_id'] == $product_id) { $ProductsClass['error'] = true; @@ -345,10 +340,10 @@ // 全商品合計金額(税込み) - $objPage->tpl_total_pretax = $objCartSess->getAllProductsTotal(); + $objPage->tpl_total_pretax[$key] = $objCartSess->getAllProductsTotal(); // 全商品合計消費税 - $objPage->tpl_total_tax = $objCartSess->getAllProductsTax(); + $objPage->tpl_total_tax[$key] = $objCartSess->getAllProductsTax(); // 全商品合計ポイント if (USE_POINT !== false) { - $objPage->tpl_total_point = $objCartSess->getAllProductsPoint(); + $objPage->tpl_total_point[$key] = $objCartSess->getAllProductsPoint(); } @@ -1447,5 +1442,5 @@ * @return array 最終計算後の配列 */ - function sfTotalConfirm($arrData, &$objPage, &$objCartSess, $dummy1 = null, $objCustomer = "") { + function sfTotalConfirm($arrData, &$objPage, &$objCartSess, $dummy1 = null, $objCustomer = "", $key = "") { // 店舗基本情報を取得する $arrInfo = SC_Helper_DB_Ex::sf_getBasisData(); @@ -1459,7 +1454,7 @@ // 税金の取得 - $arrData['tax'] = $objPage->tpl_total_tax; + $arrData['tax'] = $objPage->tpl_total_tax[$key]; // 小計の取得 - $arrData['subtotal'] = $objPage->tpl_total_pretax; + $arrData['subtotal'] = $objPage->tpl_total_pretax[$key]; // 合計送料の取得 @@ -1502,5 +1497,5 @@ // 合計の計算 - $arrData['total'] = $objPage->tpl_total_pretax; // 商品合計 + $arrData['total'] = $objPage->tpl_total_pretax[$key]; // 商品合計 $arrData['total']+= $arrData['deliv_fee']; // 送料 $arrData['total']+= $arrData['charge']; // 手数料 @@ -1509,5 +1504,5 @@ // 加算ポイントの計算 if (USE_POINT !== false) { - $arrData['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($objPage->tpl_total_point, $arrData['use_point']); + $arrData['add_point'] = SC_Helper_DB_Ex::sfGetAddPoint($objPage->tpl_total_point[$key], $arrData['use_point']); if($objCustomer != "") { Index: branches/version-2_5-dev/data/Smarty/templates/default/list.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/list.tpl (revision 18829) +++ branches/version-2_5-dev/data/Smarty/templates/default/list.tpl (revision 18830) @@ -121,4 +121,15 @@ eleDynamic.value = '' } + // 商品種別 + eleDynamic = document.getElementById('product_type' + product_id); + if ( + classcat2 + && typeof classcat2.product_type != 'undefined' + && String(classcat2.product_type).length >= 1 + ) { + eleDynamic.value = classcat2.product_type; + } else { + eleDynamic.value = '' + } } //]]> @@ -144,4 +155,5 @@ + @@ -268,4 +280,5 @@ +
Index: branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl (revision 18700) +++ branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl (revision 18830) @@ -75,37 +75,37 @@ = 1}--> - href="" + + href="" class="expansion" target="_blank" > - <!--{$arrProductsClass[cnt].name|escape}--> + <!--{$arrProductsClass[cnt][$cartKey].name|escape}--> - - 円 + + 円 - 円 + 円 - - 円 + + 円 小計 - 円 + 円 Index: branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl (revision 18700) +++ branches/version-2_5-dev/data/Smarty/templates/default/cart/index.tpl (revision 18830) @@ -48,8 +48,8 @@ - お買い上げ商品の合計金額は「円」です。 + お買い上げ商品の合計金額は「円」です。 - あと「円」で送料無料です！！ + あと「円」で送料無料です！！ 現在、「送料無料」です！！ @@ -69,5 +69,5 @@ - +
@@ -88,43 +88,43 @@ - 削除 + 削除 = 1}--> - href="" + + href="" class="expansion" target="_blank" > - <!--{$arrProductsClass[cnt].name|escape}--> + <!--{$arrProductsClass[cnt].name|escape}--> -
- - ：
+
+ + ：
- - ： + + ： - 円 + 円 - 円 + 円 - + - 円 + 円 小計 - 円 + 円 @@ -156,4 +156,5 @@ + @@ -161,4 +162,5 @@
+

※ 現在カート内に商品はございません。

Index: branches/version-2_5-dev/data/Smarty/templates/default/detail.tpl =================================================================== --- branches/version-2_5-dev/data/Smarty/templates/default/detail.tpl (revision 18829) +++ branches/version-2_5-dev/data/Smarty/templates/default/detail.tpl (revision 18830) @@ -141,4 +141,15 @@ eleDynamic.value = '' } + // 商品種別 + eleDynamic = document.getElementById('product_type'); + if ( + classcat2 + && typeof classcat2.product_type != 'undefined' + && String(classcat2.product_type).length >= 1 + ) { + eleDynamic.value = classcat2.product_type; + } else { + eleDynamic.value = '' + } } $(document).ready(function() { @@ -292,4 +303,5 @@ +