Changeset 20312
- Timestamp:
- 2011/02/22 04:53:09 (13 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:20311
- bzr:committer:
- Kentaro Ohkouchi <nanasess@fsm.ne.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/class/SC_CartSession.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2FSC_CartSession.php
data/class/pages/mypage/LC_Page_Mypage_Order.php 16238@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fmypage%2FLC_Page_Mypage_Order.php
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- bzr:mapping-version:
- v4
- bzr:merge:
nanasess@fsm.ne.jp-20110221195031-0vy4un7rchp3l9vz- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- nanasess@fsm.ne.jp-20110221195303-74zqydzg575y50uh
- bzr:revno:
- 3040
- 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 nanasess@fsm.ne.jp-20110221195031-0vy4un7rchp3l9vz
data/Smarty/templates/default/products/list.tpl nanasess@fsm.ne.jp-20110221195031-0vy4un7rchp3l9vz
data/class/SC_CartSession.php nanasess@fsm.ne.jp-20110221195031-0vy4un7rchp3l9vz
data/class/pages/mypage/LC_Page_Mypage_Order.php nanasess@fsm.ne.jp-20110221195031-0vy4un7rchp3l9vz
data/class/pages/products/LC_Page_Products_Detail.php nanasess@fsm.ne.jp-20110221195031-0vy4un7rchp3l9vz
data/class/pages/products/LC_Page_Products_List.php nanasess@fsm.ne.jp-20110221195031-0vy4un7rchp3l9vz- bzr:timestamp:
- 2011-02-22 04:53:03.749000072 +0900
- bzr:user-agent:
- bzr2.2.2+bzr-svn1.0.4
- svn:original-date:
- 2011-02-21T19:53:03.749000Z
- Location:
- branches/version-2_5-dev/data
- Files:
-
- 6 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/Smarty/templates/default/products/detail.tpl
r20290 r20312 150 150 } else { 151 151 eleDynamic.value = '' 152 eleDynamic.style.display = 'none';153 152 } 154 153 // 商品種別 … … 163 162 } else { 164 163 eleDynamic.value = '' 165 eleDynamic.style.display = 'none';166 164 } 167 165 } -
branches/version-2_5-dev/data/Smarty/templates/default/products/list.tpl
r20290 r20312 111 111 } else { 112 112 eleDefault.style.display = ''; 113 eleDynamic.style.display = 'none';114 113 eleDynamic.innerHTML = ''; 115 114 } -
branches/version-2_5-dev/data/class/SC_CartSession.php
r20112 r20312 225 225 226 226 // カートへの商品追加 227 function addProduct($id, $quantity, $productTypeId) { 227 function addProduct($product_class_id, $quantity) { 228 $objProduct = new SC_Product(); 229 $arrProduct = $objProduct->getProductsClass($product_class_id); 230 $productTypeId = $arrProduct['product_type_id']; 228 231 $find = false; 229 232 $max = $this->getMax($productTypeId); 230 233 for($i = 0; $i <= $max; $i++) { 231 234 232 if($this->cartSession[$productTypeId][$i]['id'] == $ id) {235 if($this->cartSession[$productTypeId][$i]['id'] == $product_class_id) { 233 236 $val = $this->cartSession[$productTypeId][$i]['quantity'] + $quantity; 234 237 if(strlen($val) <= INT_LEN) { … … 239 242 } 240 243 if(!$find) { 241 $this->cartSession[$productTypeId][$max+1]['id'] = $ id;244 $this->cartSession[$productTypeId][$max+1]['id'] = $product_class_id; 242 245 $this->cartSession[$productTypeId][$max+1]['quantity'] = $quantity; 243 246 $this->cartSession[$productTypeId][$max+1]['cart_no'] = $this->getNextCartID($productTypeId); -
branches/version-2_5-dev/data/class/pages/mypage/LC_Page_Mypage_Order.php
r20162 r20312 94 94 if ($order_count != 1) return array(); 95 95 96 $col = "product_class_id, quantity , product_type_id";96 $col = "product_class_id, quantity"; 97 97 $table = "dtb_order_detail LEFT JOIN dtb_products_class USING(product_class_id)"; 98 98 $where = "order_id = ?"; … … 109 109 110 110 $objCartSess->addProduct($order_row['product_class_id'], 111 $order_row['quantity'], 112 $order_row['product_type_id']); 111 $order_row['quantity']); 113 112 } 114 113 } -
branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_Detail.php
r20270 r20312 169 169 $classcategory_id2 = '0'; 170 170 } 171 $objCartSess->addProduct($product_class_id, $this->objFormParam->getValue('quantity') , $product_type);171 $objCartSess->addProduct($product_class_id, $this->objFormParam->getValue('quantity')); 172 172 173 173 // カート「戻るボタン」用に保持 -
branches/version-2_5-dev/data/class/pages/products/LC_Page_Products_List.php
r20289 r20312 154 154 155 155 $objJson = new Services_JSON(); 156 $this->tpl_javascript .= 'var productsClassCategories = ' . $objJson->encode($objProduct->classCategories) . '; \n';156 $this->tpl_javascript .= 'var productsClassCategories = ' . $objJson->encode($objProduct->classCategories) . ';'; 157 157 158 158 //onloadスクリプトを設定 159 159 foreach ($this->arrProducts as $arrProduct) { 160 $js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProduct['product_id']}); \n";160 $js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProduct['product_id']});"; 161 161 } 162 162 … … 185 185 } 186 186 187 $this->tpl_javascript .= 'function fnOnLoad(){' . $js_fnOnLoad . '}' ."\n";187 $this->tpl_javascript .= 'function fnOnLoad(){' . $js_fnOnLoad . '}'; 188 188 $this->tpl_onload .= 'fnOnLoad(); '; 189 189 … … 479 479 $arrProducts[$key]['quantity'] = $arrForm['quantity']; 480 480 $arrProducts[$key]['arrErr'] = $arrErr; 481 $js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProducts[$key]['product_id']}, '{$arrForm['classcategory_id2']}'); \n";481 $js_fnOnLoad .= "fnSetClassCategories(document.product_form{$arrProducts[$key]['product_id']}, '{$arrForm['classcategory_id2']}');"; 482 482 } 483 483 } … … 506 506 $product_type = $arrForm['product_type']; 507 507 $objCartSess = new SC_CartSession(); 508 $objCartSess->addProduct($product_class_id, $arrForm['quantity'] , $product_type);508 $objCartSess->addProduct($product_class_id, $arrForm['quantity']); 509 509 510 510 // カート「戻るボタン」用に保持
Note: See TracChangeset
for help on using the changeset viewer.