Changeset 19868 for branches/version-2_5-dev/data
- Timestamp:
- 2011/01/11 19:07:12 (13 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19867
- bzr:committer:
- Kentaro Ohkouchi <ohkouchi@loop-az.jp>
- bzr:file-ids:
data/Smarty/templates/default/shopping/confirm.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fconfirm.tpl
data/Smarty/templates/default/shopping/payment.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fshopping%2Fpayment.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/shopping/LC_Page_Shopping_Confirm.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Confirm.php
data/class/pages/shopping/LC_Page_Shopping_Deliv.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Deliv.php
data/class/pages/shopping/LC_Page_Shopping_Multiple.php lc_page_shopping_mul-20110109122547-u3fq5xmi1b4jn5n4-2
data/class/pages/shopping/LC_Page_Shopping_Payment.php 15223@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fshopping%2FLC_Page_Shopping_Payment.php
data/install.php 15078@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Finstall.php
docs/eccube-diagram.jude eccubediagram.jude-20101102081620-jpq1fqmox6ocmuj3-2- bzr:mapping-version:
- v4
- bzr:merge:
ohkouchi@loop-az.jp-20110111095932-jpbga7ryu3gwplpe- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- ohkouchi@loop-az.jp-20110111100455-7kr2c7uujtdoze5y
- bzr:revno:
- 2597
- bzr:revprop:branch-nick:
- branches/version-2_5-dev
- bzr:root:
- branches/version-2_5-dev
- bzr:text-revisions:
data/Smarty/templates/default/shopping/confirm.tpl ohkouchi@loop-az.jp-20110111095932-jpbga7ryu3gwplpe
data/Smarty/templates/default/shopping/payment.tpl ohkouchi@loop-az.jp-20110111095932-jpbga7ryu3gwplpe
data/class/helper/SC_Helper_Purchase.php ohkouchi@loop-az.jp-20110111095932-jpbga7ryu3gwplpe
data/class/pages/shopping/LC_Page_Shopping_Confirm.php ohkouchi@loop-az.jp-20110111095932-jpbga7ryu3gwplpe
data/class/pages/shopping/LC_Page_Shopping_Deliv.php ohkouchi@loop-az.jp-20110111095932-jpbga7ryu3gwplpe
data/class/pages/shopping/LC_Page_Shopping_Multiple.php ohkouchi@loop-az.jp-20110111095932-jpbga7ryu3gwplpe
data/class/pages/shopping/LC_Page_Shopping_Payment.php ohkouchi@loop-az.jp-20110111095932-jpbga7ryu3gwplpe- bzr:timestamp:
- 2011-01-11 19:04:55.760999918 +0900
- bzr:user-agent:
- bzr2.2.1+bzr-svn1.0.4
- svn:original-date:
- 2011-01-11T10:04:55.761000Z
- Location:
- branches/version-2_5-dev/data
- Files:
-
- 7 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/Smarty/templates/default/shopping/confirm.tpl
r19851 r19868 160 160 <!--お届け先ここから--> 161 161 <!--{* 販売方法判定(ダウンロード販売のみの場合はお届け先を表示しない) *}--> 162 <!--{if $cartdown != "2"}--> 162 <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 163 <!--{foreach item=shippingItem from=$shipping name=shippingItem}--> 164 <h3>▼お届け先<!--{if $isMultiple}--><!--{$smarty.foreach.shippingItem.iteration}--><!--{/if}--></h3> 165 <!--{if $isMultiple}--> 166 <table summary="ご注文内容確認"> 167 <tr> 168 <th>商品写真</th> 169 <th>商品名</th> 170 <th>単価</th> 171 <th>数量</th> 172 <!--{* XXX 購入小計と誤差が出るためコメントアウト 173 <th>小計</th> 174 *}--> 175 </tr> 176 <!--{foreach item=item from=$shippingItem.shipment_item}--> 177 <tr> 178 <td class="phototd"> 179 <a 180 <!--{if $item.productsClass.main_image|strlen >= 1}--> 181 href="<!--{$smarty.const.IMAGE_SAVE_URL}--><!--{$item.productsClass.main_image|sfNoImageMainList|h}-->" 182 class="expansion" 183 target="_blank" 184 <!--{/if}--> 185 > 186 <img src="<!--{$smarty.const.URL_PATH}-->resize_image.php?image=<!--{$item.productsClass.main_list_image|sfNoImageMainList|h}-->&width=65&height=65" alt="<!--{$item.productsClass.name|h}-->" /></a> 187 </td> 188 <td><!--{* 商品名 *}--><strong><!--{$item.productsClass.name|h}--></strong><br /> 189 <!--{if $item.productsClass.classcategory_name1 != ""}--> 190 <!--{$item.productsClass.class_name1}-->:<!--{$item.productsClass.classcategory_name1}--><br /> 191 <!--{/if}--> 192 <!--{if $item.productsClass.classcategory_name2 != ""}--> 193 <!--{$item.productsClass.class_name2}-->:<!--{$item.productsClass.classcategory_name2}--> 194 <!--{/if}--> 195 </td> 196 <td class="pricetd"> 197 <!--{$item.productsClass.price02|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円 198 </td> 199 <td id="quantity"><!--{$item.quantity}--></td> 200 <!--{* XXX 購入小計と誤差が出るためコメントアウト 201 <td class="pricetd"><!--{$item.total_inctax|number_format}-->円</td> 202 *}--> 203 </tr> 204 <!--{/foreach}--> 205 </table> 206 <!--{/if}--> 207 163 208 <table summary="お届け先確認" class="delivname"> 164 <thead>165 <tr>166 <th colspan="2">▼お届け先</th>167 </tr>168 </thead>169 209 <tbody> 170 <!--{* 別のお届け先が選択されている場合 *}--> 171 <!--{if $arrData.deliv_check >= 1}--> 172 <tr> 173 <th>お名前</th> 174 <td><!--{$arrData.deliv_name01|h}--> <!--{$arrData.deliv_name02|h}--></td> 175 </tr> 176 <tr> 177 <th>お名前(フリガナ)</th> 178 <td><!--{$arrData.deliv_kana01|h}--> <!--{$arrData.deliv_kana02|h}--></td> 179 </tr> 180 <tr> 181 <th>郵便番号</th> 182 <td>〒<!--{$arrData.deliv_zip01|h}-->-<!--{$arrData.deliv_zip02|h}--></td> 183 </tr> 184 <tr> 185 <th>住所</th> 186 <td><!--{$arrPref[$arrData.deliv_pref]}--><!--{$arrData.deliv_addr01|h}--><!--{$arrData.deliv_addr02|h}--></td> 187 </tr> 188 <tr> 189 <th>電話番号</th> 190 <td><!--{$arrData.deliv_tel01}-->-<!--{$arrData.deliv_tel02}-->-<!--{$arrData.deliv_tel03}--></td> 191 </tr> 192 <!--{else}--> 193 <tr> 194 <th>お名前</th> 195 <td><!--{$arrData.order_name01|h}--> <!--{$arrData.order_name02|h}--></td> 196 </tr> 197 <tr> 198 <th>お名前(フリガナ)</th> 199 <td><!--{$arrData.order_kana01|h}--> <!--{$arrData.order_kana02|h}--></td> 200 </tr> 201 <tr> 202 <th>郵便番号</th> 203 <td>〒<!--{$arrData.order_zip01|h}-->-<!--{$arrData.order_zip02|h}--></td> 204 </tr> 205 <tr> 206 <th>住所</th> 207 <td><!--{$arrPref[$arrData.order_pref]}--><!--{$arrData.order_addr01|h}--><!--{$arrData.order_addr02|h}--></td> 208 </tr> 209 <tr> 210 <th>電話番号</th> 211 <td><!--{$arrData.order_tel01}-->-<!--{$arrData.order_tel02}-->-<!--{$arrData.order_tel03}--></td> 212 </tr> 213 <!--{/if}--> 210 <tr> 211 <th>お名前</th> 212 <td><!--{$shippingItem.shipping_name01|h}--> <!--{$shippingItem.shipping_name02|h}--></td> 213 </tr> 214 <tr> 215 <th>お名前(フリガナ)</th> 216 <td><!--{$shippingItem.shipping_kana01|h}--> <!--{$shippingItem.shipping_kana02|h}--></td> 217 </tr> 218 <tr> 219 <th>郵便番号</th> 220 <td>〒<!--{$shippingItem.shipping_zip01|h}-->-<!--{$shippingItem.shipping_zip02|h}--></td> 221 </tr> 222 <tr> 223 <th>住所</th> 224 <td><!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01|h}--><!--{$shippingItem.shipping_addr02|h}--></td> 225 </tr> 226 <tr> 227 <th>電話番号</th> 228 <td><!--{$shippingItem.shipping_tel01}-->-<!--{$shippingItem.shipping_tel02}-->-<!--{$shippingItem.shipping_tel03}--></td> 229 </tr> 230 <!--{if $cartKey != $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 231 <tr> 232 <th>お届け日</th> 233 <td><!--{$shippingItem.deliv_date|default:"指定なし"|h}--></td> 234 </tr> 235 <tr> 236 <th>お届け時間</th> 237 <td><!--{$shippingItem.deliv_time|default:"指定なし"|h}--></td> 238 </tr> 239 <!--{/if}--> 214 240 </tbody> 215 241 </table> 242 <!--{/foreach}--> 216 243 <!--{/if}--> 217 244 <!--お届け先ここまで--> 218 245 246 <h3>▼お支払方法・その他お問い合わせ</h3> 219 247 <table summary="お支払方法・お届け日時の指定・その他お問い合わせ" class="delivname"> 220 <thead>221 <tr>222 <th colspan="2">▼お支払方法・お届け日時の指定・その他お問い合わせ</th>223 </tr>224 </thead>225 248 <tbody> 226 249 <tr> … … 229 252 </tr> 230 253 <!--{* 販売方法判定(ダウンロード販売のみの場合はお届け日、時間を表示しない) *}--> 231 <!--{if $cartdown != "2"}-->232 <tr>233 <th>お届け日</th>234 <td><!--{$arrData.deliv_date|default:"指定なし"|h}--></td>235 </tr>236 <tr>237 <th>お届け時間</th>238 <td><!--{$arrData.deliv_time|default:"指定なし"|h}--></td>239 </tr>240 <!--{/if}-->241 254 <tr> 242 255 <th>その他お問い合わせ</th> -
branches/version-2_5-dev/data/Smarty/templates/default/shopping/payment.tpl
r19860 r19868 67 67 <h3>お届け時間の指定</h3> 68 68 <p>ご希望の方は、お届け時間を選択してください。</p> 69 <!--{foreach item=shippingItem name=shippingItem from=$shipping}--> 70 <!--{assign var=index value=$smarty.foreach.shippingItem.index}--> 69 71 <div> 70 72 <!--★お届け日★--> 71 <!--{assign var=key value="deliv_date "}-->73 <!--{assign var=key value="deliv_date`$index`"}--> 72 74 <span class="attention"><!--{$arrErr[$key]}--></span> 73 75 <em>お届け日:</em> … … 81 83 <!--{/if}--> 82 84 <!--★お届け時間★--> 83 <!--{assign var=key value="deliv_time_id "}-->85 <!--{assign var=key value="deliv_time_id`$index`"}--> 84 86 <span class="attention"><!--{$arrErr[$key]}--></span> 85 87 <em>お届け時間:</em> … … 88 90 <!--{html_options options=$arrDelivTime selected=$arrForm[$key].value}--> 89 91 </select> 92 <!--{if $isMultiple}--> 93 <!--{$shippingItem.shipping_name01}--><!--{$shippingItem.shipping_name02}--> 94 <!--{$arrPref[$shippingItem.shipping_pref]}--><!--{$shippingItem.shipping_addr01}--><!--{$shippingItem.shipping_addr02}--> 95 <!--{/if}--> 90 96 </div> 97 <!--{/foreach}--> 91 98 </div> 92 99 <!--{/if}--> -
branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
r19862 r19868 79 79 } 80 80 } 81 81 82 $this->registerShipping($orderId, $shippingTemp); 82 83 $objQuery->commit(); … … 188 189 189 190 /** 191 * 配送商品を設定する. 192 */ 193 function setShipmentItemTemp($otherDelivId, $productClassId, $quantity) { 194 $_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['shipping_id'] = $otherDelivId; 195 $_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['product_class_id'] = $productClassId; 196 $_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['quantity'] += $quantity; 197 198 $objProduct = new SC_Product(); 199 if (empty($_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['productsClass'])) { 200 $product = $objProduct->getDetailAndProductsClass($productClassId); 201 $_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['productsClass'] = $product; 202 } 203 $incTax = SC_Helper_DB_Ex::sfCalcIncTax($_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['productsClass']['price02']); 204 $_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['total_inctax'] = $incTax * $_SESSION['shipping'][$otherDelivId]['shipment_item'][$productClassId]['quantity']; 205 } 206 207 /** 208 * 複数配送指定の購入かどうか. 209 * 210 * @return boolean 複数配送指定の購入の場合 true 211 */ 212 function isMultiple() { 213 return (count($this->getShippingTemp()) > 1); 214 } 215 216 /** 190 217 * 配送情報をセッションに保存する. 191 218 */ 192 function saveShippingTemp(&$src, $other_deliv_id = 0, 193 $keys = array('name01', 'name02', 'kana01', 'kana02', 194 'sex', 'zip01', 'zip02', 'pref', 195 'addr01', 'addr02', 196 'tel01', 'tel02', 'tel03'), 197 $prefix = 'shipping') { 198 $dest = array(); 199 foreach ($keys as $key) { 200 $dest[$prefix . '_' . $key] = $src[$prefix . '_' . $key]; 201 } 202 $_SESSION['shipping'][$other_deliv_id] = $src; 219 function saveShippingTemp(&$src, $otherDelivId = 0) { 220 $_SESSION['shipping'][$otherDelivId] = array_merge($_SESSION['shipping'][$otherDelivId], $src); 203 221 } 204 222 -
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Confirm.php
r19861 r19868 79 79 $objPurchase = new SC_Helper_Purchase_Ex(); 80 80 81 $this->isMultiple = $objPurchase->isMultiple(); 82 81 83 // 前のページで正しく登録手続きが行われた記録があるか判定 82 84 SC_Utils_Ex::sfIsPrePage($objSiteSess); … … 128 130 $this->payment_type = $payment_type; 129 131 132 $this->shipping = $objPurchase->getShippingTemp(); 133 130 134 if (!isset($_POST['mode'])) $_POST['mode'] = ""; 131 135 … … 143 147 144 148 // 集計結果を受注一時テーブルに反映 145 unset($arrData[0]); // FIXME146 unset($arrData[1]);147 149 $objPurchase->saveOrderTemp($uniqid, $arrData, $objCustomer); 148 150 // 正常に登録されたことを記録しておく -
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Deliv.php
r19862 r19868 219 219 220 220 default: 221 //$objPurchase->unsetShippingTemp(); 221 222 $arrOrderTemp = $objPurchase->getOrderTemp($uniqid); 222 223 if (empty($arrOrderTemp)) $arrOrderTemp = array(""); -
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Multiple.php
r19862 r19868 118 118 } 119 119 $sqlval[$other_deliv_id]['deliv_id'] = $objPurchase->getDeliv($this->cartKey); 120 $sqlval[$other_deliv_id]['shipment_item'][$params['product_class_id' . $i]]['shipping_id'] = $other_deliv_id; 121 $sqlval[$other_deliv_id]['shipment_item'][$params['product_class_id' . $i]]['quantity'] += $params['quantity' . $i]; 122 $sqlval[$other_deliv_id]['shipment_item'][$params['product_class_id' . $i]]['product_class_id'] = $params['product_class_id' . $i]; 120 $objPurchase->setShipmentItemTemp($other_deliv_id, $params['product_class_id' . $i], $params['quantity' . $i]); 123 121 $i++; 124 122 } -
branches/version-2_5-dev/data/class/pages/shopping/LC_Page_Shopping_Payment.php
r19861 r19868 54 54 $this->tpl_onload = "fnCheckInputPoint(); fnSetDelivTime('payment','payment_id','deliv_time_id');"; 55 55 $this->tpl_title = "お支払方法・お届け時間等の指定"; 56 $masterData = new SC_DB_MasterData(); 57 $this->arrPref = $masterData->getMasterData('mtb_pref'); 56 58 } 57 59 … … 78 80 $objPurchase = new SC_Helper_Purchase_Ex(); 79 81 $this->objCustomer = new SC_Customer(); 82 83 $this->shipping =& $objPurchase->getShippingTemp(); 84 $this->isMultiple = $objPurchase->isMultiple(); 80 85 81 86 // パラメータ管理クラス … … 366 371 $this->objFormParam->addParam("お支払い方法", "payment_id", INT_LEN, "n", array("EXIST_CHECK", "MAX_LENGTH_CHECK", "NUM_CHECK")); 367 372 $this->objFormParam->addParam("ポイント", "use_point", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK", "ZERO_START")); 368 $this->objFormParam->addParam("お届け時間", "deliv_time_id", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"));369 373 $this->objFormParam->addParam("ご質問", "message", LTEXT_LEN, "KVa", array("SPTAB_CHECK", "MAX_LENGTH_CHECK")); 370 374 $this->objFormParam->addParam("ポイントを使用する", "point_check", INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK"), '2'); 371 $this->objFormParam->addParam("お届け日", "deliv_date", STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK")); 375 376 for ($i = 0; $i < count($this->shipping); $i++) { 377 $this->objFormParam->addParam("お届け時間", "deliv_time_id" . $i, INT_LEN, "n", array("MAX_LENGTH_CHECK", "NUM_CHECK")); 378 $this->objFormParam->addParam("お届け日", "deliv_date" . $i, STEXT_LEN, "KVa", array("MAX_LENGTH_CHECK")); 379 } 372 380 } 373 381
Note: See TracChangeset
for help on using the changeset viewer.