Changeset 20463 for branches/version-2_5-dev

Timestamp:

2011/03/02 18:13:03 (13 years ago)

Author:

nanasess

bzr:base-revision:

ohkouchi@loop-az.jp-20110302073538-c7n1c2l02udcbhn9

bzr:committer:

Kentaro Ohkouchi <ohkouchi@loop-az.jp>

bzr:file-ids:

data/Smarty/templates/default/products/detail.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fproducts%2Fdetail.tpl
data/Smarty/templates/default/products/list.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fproducts%2Flist.tpl
data/Smarty/templates/sphone/products/detail.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Fproducts%2Fdetail.tpl
data/Smarty/templates/sphone/products/list.tpl 19775@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Fversion-2_5-dev%2Fdata%2FSmarty%2Ftemplates%2Fsphone%2Fproducts%2Flist.tpl
data/class/pages/products/LC_Page_Products_Detail.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_Detail.php
data/class/pages/products/LC_Page_Products_List.php 15154@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fproducts%2FLC_Page_Products_List.php
html/js/products.js products.js-20110223205405-tr2pdhnwxtjiqrzr-1

bzr:mapping-version:

v4

bzr:merge:

ohkouchi@loop-az.jp-20110302091109-hmi52jxntrz3e31z

bzr:repository-uuid:

1e3b908f-19a9-db11-a64c-001125224ba8

bzr:revision-id:

ohkouchi@loop-az.jp-20110302091246-0py2u14857eo8czr

bzr:revno:

3190

bzr:revprop:branch-nick:

branches/version-2_5-dev

bzr:root:

branches/version-2_5-dev

bzr:text-revisions:

data/Smarty/templates/default/products/detail.tpl ohkouchi@loop-az.jp-20110302091109-hmi52jxntrz3e31z
data/Smarty/templates/default/products/list.tpl ohkouchi@loop-az.jp-20110302091109-hmi52jxntrz3e31z
data/Smarty/templates/sphone/products/detail.tpl ohkouchi@loop-az.jp-20110302091109-hmi52jxntrz3e31z
data/Smarty/templates/sphone/products/list.tpl ohkouchi@loop-az.jp-20110302091109-hmi52jxntrz3e31z
data/class/pages/products/LC_Page_Products_Detail.php ohkouchi@loop-az.jp-20110302091109-hmi52jxntrz3e31z
data/class/pages/products/LC_Page_Products_List.php ohkouchi@loop-az.jp-20110302091109-hmi52jxntrz3e31z
html/js/products.js ohkouchi@loop-az.jp-20110302091109-hmi52jxntrz3e31z

bzr:timestamp:

2011-03-02 18:12:46.151999950 +0900

bzr:user-agent:

bzr2.2.1+bzr-svn1.0.4

svn:original-date:

2011-03-02T09:12:46.152000Z

Message:

#1059(商品詳細 商品規格「選択してください」でもカートインされる)

• その他不要な処理を削除

Location:

branches/version-2_5-dev

Files:

• data/Smarty/templates/default/products/detail.tpl (modified) (1 diff)
• data/Smarty/templates/default/products/list.tpl (modified) (3 diffs)
• data/Smarty/templates/sphone/products/detail.tpl (modified) (1 diff)
• data/Smarty/templates/sphone/products/list.tpl (modified) (1 diff)
• data/class/pages/products/LC_Page_Products_Detail.php (modified) (5 diffs)
• data/class/pages/products/LC_Page_Products_List.php (modified) (3 diffs)
• html/js/products.js (modified) (3 diffs)

branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl

@@ -183 +183 @@
     <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->" />
     <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->" id="product_class_id" />
-    <input type="hidden" name="product_type" value="<!--{$tpl_product_type}-->" id="product_type" />
     <input type="hidden" name="favorite_product_id" value="" />
 

branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl

@@ -54 +54 @@
     fnSetVal("product_id", productForm["product_id"].value);
     fnSetVal("product_class_id", productForm["product_class_id"].value);
-    fnSetVal("product_type", productForm["product_type"].value);
     fnSubmit();
 }
@@ -80 +79 @@
         <input type="hidden" name="classcategory_id2" value="" />
         <input type="hidden" name="product_class_id" value="" />
-        <input type="hidden" name="product_type" value="" />
         <input type="hidden" name="quantity" value="" />
         <!--{* ▲注文関連 *}-->
@@ -202 +200 @@
                    <input type="hidden" name="product_id" value="<!--{$id|h}-->" />
                    <input type="hidden" name="product_class_id" id="product_class_id<!--{$id|h}-->" value="<!--{$tpl_product_class_id[$id]}-->" />
-                   <input type="hidden" name="product_type" id="product_type<!--{$id|h}-->" value="<!--{$tpl_product_type[$id]}-->" />
 
                    <div class="cart_area clearfix">

branches/version-2_5-dev/data/Smarty/templates/sphone/products/detail.tpl

@@ -212 +212 @@
                 <input type="hidden" name="product_id" value="<!--{$tpl_product_id}-->" />
                 <input type="hidden" name="product_class_id" value="<!--{$tpl_product_class_id}-->" id="product_class_id" />
-                <input type="hidden" name="product_type" value="<!--{$tpl_product_type}-->" id="product_type" />
                 <input type="hidden" name="favorite_product_id" value="" />
                 

branches/version-2_5-dev/data/Smarty/templates/sphone/products/list.tpl

@@ -56 +56 @@
         <input type="hidden" name="classcategory_id2" value="" />
         <input type="hidden" name="product_class_id" value="" />
-        <input type="hidden" name="product_type" value="" />
         <input type="hidden" name="quantity" value="" />
         <!--{* ▲注文関連 *}-->

branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php

@@ -146 +146 @@
         switch($this->mode) {
             case 'cart':
-                $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam);
+                $this->arrErr = $this->lfCheckError($this->mode,$this->objFormParam,
+                                                    $this->tpl_classcat_find1,
+                                                    $this->tpl_classcat_find2);
                 if (count($this->arrErr) == 0) {
                     $objCartSess = new SC_CartSession_Ex();
-                    $classcategory_id1 = $this->objFormParam->getValue('classcategory_id1');
-                    $classcategory_id2 = $this->objFormParam->getValue('classcategory_id2');
                     $product_class_id = $this->objFormParam->getValue('product_class_id');
-                    $product_type = $this->objFormParam->getValue('product_type');
-
-                    // 規格1が設定されていない場合
-                    if(!$this->tpl_classcat_find1) {
-                        $classcategory_id1 = '0';
-                    }
-
-                    // 規格2が設定されていない場合
-                    if(!$this->tpl_classcat_find2) {
-                        $classcategory_id2 = '0';
-                    }
+
                     $objCartSess->addProduct($product_class_id, $this->objFormParam->getValue('quantity'));
 
@@ -257 +247 @@
 
         $this->subImageFlag = $this->lfSetFile($this->objUpFile,$this->arrProduct,$this->arrFile);
-        // 支払方法の取得
-        $this->arrPayment = $this->lfGetPayment();
         //レビュー情報の取得
         $this->arrReview = $this->lfGetReviewData($product_id);
@@ -331 +319 @@
         // 規格分類名一覧
         $arrClassCatName = SC_Helper_DB_Ex::sfGetIDValueList("dtb_classcategory", "classcategory_id", "name");
-        /*
-         * FIXME
-         * パフォーマンスが出ないため,
-         * SC_Product::getProductsClassByProductIds() を使用した実装に変更
-         */
         // 商品規格情報の取得
         $arrProductsClass = $this->lfGetProductsClass($product_id);
@@ -400 +383 @@
         $objFormParam->addParam("商品ID", "product_id", INT_LEN, "n", array("EXIST_CHECK", "ZERO_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
         $objFormParam->addParam("お気に入り商品ID", "favorite_product_id", INT_LEN, "n", array("ZERO_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
-        $objFormParam->addParam("商品規格ID", "product_class_id", INT_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
-        $objFormParam->addParam("商品種別", "product_type", INT_LEN, "n", array("NUM_CHECK", "MAX_LENGTH_CHECK"));
+        $objFormParam->addParam("商品規格ID", "product_class_id", INT_LEN, "n", array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
         // 値の取得
         $objFormParam->setParam($_REQUEST);
@@ -497 +479 @@
         $arrReview = $objQuery->select($col, $from, $where, $arrval);
         return $arrReview;
-    }
-
-    //支払方法の取得
-    //payment_id    1:クレジット　2:ショッピングローン
-    function lfGetPayment() {
-        $objQuery =& SC_Query::getSingletonInstance();
-        $col = "payment_id, rule, payment_method";
-        $from = "dtb_payment";
-        $where = "del_flg = 0";
-        $order = "payment_id";
-        $objQuery->setOrder($order);
-        $arrPaymentId = $objQuery->select($col, $from, $where);
-        return $arrPaymentId;
     }
 

branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php

@@ -169 +169 @@
             $arrErr = $this->lfCheckError($target_product_id,$this->arrForm,$this->tpl_classcat_find1,$this->tpl_classcat_find2);
             if (count($arrErr) == 0) {
-                $this->lfAddCart($this->arrForm,$this->tpl_classcat_find1,$this->tpl_classcat_find2,$target_product_id,$_SERVER['HTTP_REFERER']);
+                $this->lfAddCart($this->arrForm, $_SERVER['HTTP_REFERER']);
                 SC_Response_Ex::sendRedirect(CART_URLPATH);
                 exit;
@@ -331 +331 @@
             $objErr->doFunc(array("規格2", 'classcategory_id2', INT_LEN), array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
         }
+
+        $objErr->doFunc(array("商品規格ID", 'product_class_id', INT_LEN), array("EXIST_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
         $objErr->doFunc(array("数量", 'quantity', INT_LEN), array("EXIST_CHECK", "ZERO_CHECK", "NUM_CHECK", "MAX_LENGTH_CHECK"));
 
@@ -487 +489 @@
      * @return void
      */   
-    function lfAddCart($arrForm,$tpl_classcat_find1,$tpl_classcat_find2,$target_product_id,$referer){
-        $classcategory_id1 = $arrForm['classcategory_id1'];
-        $classcategory_id2 = $arrForm['classcategory_id2'];
-        // 規格1が設定されていない場合
-        if (!$tpl_classcat_find1[$target_product_id]) {
-            $classcategory_id1 = '0';
-        }
-        // 規格2が設定されていない場合
-        if (!$tpl_classcat_find2[$target_product_id]) {
-            $classcategory_id2 = '0';
-        }
-
-        // 規格IDを取得
+    function lfAddCart($arrForm, $referer){
         $product_class_id = $arrForm['product_class_id'];
-        $product_type = $arrForm['product_type'];
         $objCartSess = new SC_CartSession_Ex();
         $objCartSess->addProduct($product_class_id, $arrForm['quantity']);

branches/version-2_5-dev/html/js/products.js

@@ -51 +51 @@
                 $sele2.append(option);
             }
-        }
-        if ($sele1.val()) {
-            checkStock($form, product_id, $sele1.val(), $sele2.val());
+            checkStock($form, product_id, $sele1.val() ? $sele1.val() : '',
+                       $sele2.val() ? $sele2.val() : '');
         }
     }
@@ -82 +81 @@
         && typeof classcat2['product_code'] != 'undefined') {
         $product_code_default.hide();
+        $product_code_dynamic.show();
         $product_code_dynamic.text(classcat2['product_code']);
+    } else {
+        $product_code_default.show();
+        $product_code_dynamic.hide();
     }
     
@@ -142 +145 @@
     var $product_class_id_dynamic = $form.find('[id^=product_class_id]');
     if (classcat2
-        && typeof classcat2['product_type'] != 'undefined'
-        && String(classcat2['product_type']).length >= 1) {
+        && typeof classcat2['product_class_id'] != 'undefined'
+        && String(classcat2['product_class_id']).length >= 1) {
 
         $product_class_id_dynamic.val(classcat2['product_class_id']);
+    } else {
+        $product_class_id_dynamic.val('');
     }
 }