Changeset 21201 for branches/version-2_11-dev
- Timestamp:
- 2011/08/19 12:06:05 (13 years ago)
- Location:
- branches/version-2_11-dev/data
- Files:
-
- 2 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_11-dev/data/Smarty/templates/admin/order/disp.tpl
r21035 r21201 29 29 30 30 <!--{include file="`$smarty.const.TEMPLATE_ADMIN_REALDIR`admin_popup_header.tpl"}--> 31 <h2>受注管理</h2> 32 <table class="form"> 33 <tr> 34 <th>注文番号</th> 35 <td><!--{$arrForm.order_id.value|h}--></td> 36 <input type="hidden" name="order_id" value="<!--{$arrForm.order_id.value|h}-->" /> 37 </tr> 38 <tr> 39 <th>受注日</th> 40 <td><!--{$arrForm.create_date.value|sfDispDBDate|h}--></td> 41 </tr> 42 <tr> 43 <th>対応状況</th> 44 <td><!--{$arrORDERSTATUS[$arrForm.status.value]|h}--></td> 45 </tr> 46 <tr> 47 <th>入金日</th> 48 <td><!--{$arrForm.payment_date.value|sfDispDBDate|default:"未入金"}--></td> 49 </tr> 50 <tr> 51 <th>発送日</th> 52 <td><!--{$arrForm.commit_date.value|sfDispDBDate|default:"未発送"}--></td> 53 </tr> 54 </table> 55 56 <h2>お客様情報</h2> 57 <table class="form"> 58 <tr> 59 <th>顧客ID</th> 31 32 <!--▼お客様情報ここから--> 33 <table class="form"> 34 <tr> 35 <th>注文番号</th> 36 <td><!--{$arrForm.order_id.value|h}--></td> 37 <input type="hidden" name="order_id" value="<!--{$arrForm.order_id.value|h}-->" /> 38 </tr> 39 <tr> 40 <th>受注日</th> 41 <td><!--{$arrForm.create_date.value|sfDispDBDate|h}--></td> 42 </tr> 43 <tr> 44 <th>対応状況</th> 45 <td><!--{$arrORDERSTATUS[$arrForm.status.value]|h}--></td> 46 </tr> 47 <tr> 48 <th>入金日</th> 49 <td><!--{$arrForm.payment_date.value|sfDispDBDate|default:"未入金"}--></td> 50 </tr> 51 <tr> 52 <th>発送日</th> 53 <td><!--{$arrForm.commit_date.value|sfDispDBDate|default:"未発送"}--></td> 54 </tr> 55 </table> 56 57 <h2>注文者情報</h2> 58 <table class="form"> 59 <tr> 60 <th>顧客ID</th> 61 <td> 60 62 <!--{if $arrForm.customer_id.value > 0}--> 61 < td><!--{$arrForm.customer_id.value|h}-->63 <!--{$arrForm.customer_id.value|h}--> 62 64 <!--{else}--> 63 65 (非会員) 64 66 <!--{/if}--> 65 </td> 66 </tr> 67 <tr> 68 <th>顧客名</th> 69 <td><!--{$arrForm.order_name01.value|h}--> <!--{$arrForm.order_name02.value|h}--></td> 70 </tr> 71 <tr> 72 <th>顧客名(カナ)</th> 73 <td><!--{$arrForm.order_kana01.value|h}--> <!--{$arrForm.order_kana02.value|h}--></td> 74 </tr> 75 <tr> 76 <th>メールアドレス</th> 77 <td><!--{$arrForm.order_email.value|h}--></td> 78 </tr> 79 <tr> 80 <th>TEL</th> 81 <td><!--{$arrForm.order_tel01.value|h}--> - <!--{$arrForm.order_tel02.value|h}--> - <!--{$arrForm.order_tel03.value|h}--></td> 82 </tr> 83 <tr> 84 <th>住所</th> 85 <td> 86 〒 <!--{$arrForm.order_zip01.value|h}--> - <!--{$arrForm.order_zip02.value|h}--><br /> 87 <!--{$arrPref[$arrForm.order_pref.value]|h}--><!--{$arrForm.order_addr01.value|h}--><!--{$arrForm.order_addr02.value|h}--> 88 </td> 89 </tr> 90 <tr> 91 <th>備考</th> 92 <td><!--{$arrForm.message.value|h|nl2br}--></td> 93 </tr> 94 <tr> 95 <th>現在ポイント</th> 96 <td> 97 <!--{if $arrForm.customer_id >0}--> 98 <!--{$arrForm.customer_point.value|number_format}--> 99 pt 100 <!--{else}--> 101 (非会員) 102 <!--{/if}--> 103 </td> 104 </tr> 105 <tr> 106 <th>アクセス端末</th> 107 <td><!--{$arrDeviceType[$arrForm.device_type_id.value]|h}--></td> 108 </tr> 109 </table> 110 67 </td> 68 </tr> 69 <tr> 70 <th>お名前</th> 71 <td><!--{$arrForm.order_name01.value|h}--> <!--{$arrForm.order_name02.value|h}--></td> 72 </tr> 73 <tr> 74 <th>お名前(カナ)</th> 75 <td><!--{$arrForm.order_kana01.value|h}--> <!--{$arrForm.order_kana02.value|h}--></td> 76 </tr> 77 <tr> 78 <th>メールアドレス</th> 79 <td><!--{$arrForm.order_email.value|h}--></td> 80 </tr> 81 <tr> 82 <th>TEL</th> 83 <td><!--{$arrForm.order_tel01.value|h}--> - <!--{$arrForm.order_tel02.value|h}--> - <!--{$arrForm.order_tel03.value|h}--></td> 84 </tr> 85 <tr> 86 <th>住所</th> 87 <td> 88 〒 <!--{$arrForm.order_zip01.value|h}--> - <!--{$arrForm.order_zip02.value|h}--><br /> 89 <!--{$arrPref[$arrForm.order_pref.value]|h}--><!--{$arrForm.order_addr01.value|h}--><!--{$arrForm.order_addr02.value|h}--> 90 </td> 91 </tr> 92 <tr> 93 <th>備考</th> 94 <td><!--{$arrForm.message.value|h|nl2br}--></td> 95 </tr> 96 <tr> 97 <th>現在ポイント</th> 98 <td> 99 <!--{if $arrForm.customer_id >0}--> 100 <!--{$arrForm.customer_point.value|number_format}--> 101 pt 102 <!--{else}--> 103 (非会員) 104 <!--{/if}--> 105 </td> 106 </tr> 107 <tr> 108 <th>アクセス端末</th> 109 <td><!--{$arrDeviceType[$arrForm.device_type_id.value]|h}--></td> 110 </tr> 111 </table> 112 <!--▲お客様情報ここまで--> 113 114 <!--▼受注商品情報ここから--> 111 115 <h2>受注商品情報</h2> 112 113 114 115 116 117 118 119 120 121 122 123 124 125 126 127 128 129 130 116 <table class="list"> 117 <tr> 118 <th class="id">商品コード</th> 119 <th class="name">商品名/規格1/規格2</th> 120 <th class="price">単価</th> 121 <th class="qty">数量</th> 122 <th class="price">税込み価格</th> 123 <th class="price">小計</th> 124 </tr> 125 <!--{section name=cnt loop=$arrForm.quantity.value}--> 126 <!--{assign var=product_index value="`$smarty.section.cnt.index`"}--> 127 <tr> 128 <td> 129 <!--{$arrForm.product_code.value[$product_index]|h}--> 130 </td> 131 <td> 132 <!--{$arrForm.product_name.value[$product_index]|h}-->/<!--{$arrForm.classcategory_name1.value[$product_index]|default:"(なし)"|h}-->/<!--{$arrForm.classcategory_name2.value[$product_index]|default:"(なし)"|h}--> 133 </td> 134 <td align="center"> 131 135 <!--{$arrForm.price.value[$product_index]|h}-->円 132 136 </td> 133 134 135 137 <td align="center"> 138 <!--{$arrForm.quantity.value[$product_index]|h}--> 139 </td> 136 140 <!--{assign var=price value=`$arrForm.price.value[$product_index]`}--> 137 141 <!--{assign var=quantity value=`$arrForm.quantity.value[$product_index]`}--> 138 142 <td class="right"><!--{$price|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}--> 円</td> 139 143 <td class="right"><!--{$price|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|sfMultiply:$quantity|number_format}-->円</td> 140 141 142 143 144 145 146 147 148 149 150 151 152 153 154 155 156 157 158 159 160 161 162 163 164 165 166 167 168 169 170 171 144 </tr> 145 <!--{/section}--> 146 <tr> 147 <th colspan="5" class="column right">小計</th> 148 <td class="right"><!--{$arrForm.subtotal.value|number_format}-->円</td> 149 </tr> 150 <tr> 151 <th colspan="5" class="column right">値引</th> 152 <td class="right"><!--{$arrForm.discount.value|h}-->円</td> 153 </tr> 154 <tr> 155 <th colspan="5" class="column right">送料</th> 156 <td class="right"><!--{$arrForm.deliv_fee.value|h}-->円</td> 157 </tr> 158 <tr> 159 <th colspan="5" class="column right">手数料</th> 160 <td class="right"><!--{$arrForm.charge.value|h}-->円</td> 161 </tr> 162 <tr> 163 <th colspan="5" class="column right">合計</th> 164 <td class="right"><!--{$arrForm.total.value|number_format}--> 円</td> 165 </tr> 166 <tr> 167 <th colspan="5" class="column right">お支払い合計</th> 168 <td class="right"><!--{$arrForm.payment_total.value|number_format}--> 円</td> 169 </tr> 170 <!--{if $smarty.const.USE_POINT !== false}--> 171 <tr> 172 <th colspan="5" class="column right">使用ポイント</th> 173 <td class="right"><!--{$arrForm.use_point.value|default:0|h}-->pt</td> 174 </tr> 175 <!--{if $arrForm.birth_point.value > 0}--> 172 176 <tr> 173 177 <th colspan="5" class="column right">お誕生日ポイント</th> 174 178 <td class="right"><!--{$arrForm.birth_point.value|number_format}-->pt</td> 175 179 </tr> 176 <!--{/if}-->177 <tr>178 <th colspan="5" class="column right">加算ポイント</th>179 <td class="right"><!--{$arrForm.add_point.value|number_format|default:0}-->pt</td>180 </tr>181 180 <!--{/if}--> 182 </table> 183 181 <tr> 182 <th colspan="5" class="column right">加算ポイント</th> 183 <td class="right"><!--{$arrForm.add_point.value|number_format|default:0}-->pt</td> 184 </tr> 185 <!--{/if}--> 186 </table> 187 <!--▼お届け先情報ここから--> 184 188 <h2>お届け先情報</h2> 185 189 <!--{if $arrForm.product_type_id.value[0] != $smarty.const.PRODUCT_TYPE_DOWNLOAD}--> 186 <!--{section name=shipping loop=$arrForm.shipping_quantity.value}--> 187 <!--{assign var=shipping_index value="`$smarty.section.shipping.index`"}--> 188 190 <!--{foreach name=shipping from=$arrAllShipping item=arrShipping key=shipping_index}--> 189 191 <!--{if $arrForm.shipping_quantity.value > 1}--> 190 <h3>お届け先<!--{$smarty. section.shipping.iteration}--></h3>192 <h3>お届け先<!--{$smarty.foreach.shipping.iteration}--></h3> 191 193 <!--{/if}--> 192 194 <!--{assign var=key value="shipping_id"}--> 193 195 <!--{if $arrForm.shipping_quantity.value > 1}--> 194 196 <!--{assign var=product_quantity value="shipping_product_quantity"}--> 195 196 197 <!--{if $arrForm[$product_quantity].value[$shipping_index] > 0}--> 197 198 <table class="list" id="order-edit-products"> … … 202 203 <th class="qty">数量</th> 203 204 </tr> 204 <!--{section name=item loop=$arr Form[$product_quantity].value[$shipping_index]}-->205 <!--{section name=item loop=$arrShipping.shipment_product_class_id|@count}--> 205 206 <!--{assign var=item_index value="`$smarty.section.item.index`"}--> 206 207 207 <tr> 208 208 <td> 209 <!--{assign var=key value="shipment_product_class_id"}-->210 209 <!--{assign var=key value="shipment_product_code"}--> 211 <!--{$arr Form[$key].value[$shipping_index][$item_index]|h}-->210 <!--{$arrShipping[$key][$item_index]|h}--> 212 211 </td> 213 212 <td> … … 215 214 <!--{assign var=key2 value="shipment_classcategory_name1"}--> 216 215 <!--{assign var=key3 value="shipment_classcategory_name2"}--> 217 <!--{$arr Form[$key1].value[$shipping_index][$item_index]|h}-->/<!--{$arrForm[$key2].value[$shipping_index][$item_index]|default:"(なし)"|h}-->/<!--{$arrForm[$key3].value[$shipping_index][$item_index]|default:"(なし)"|h}-->216 <!--{$arrShipping[$key1][$item_index]|h}-->/<!--{$arrShipping[$key2][$item_index]|default:"(なし)"|h}-->/<!--{$arrShipping[$key3][$item_index]|default:"(なし)"|h}--> 218 217 </td> 219 218 <td class="right"> 220 219 <!--{assign var=key value="shipment_price"}--> 221 <!--{$arr Form[$key].value[$shipping_index][$item_index]|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円220 <!--{$arrShipping[$key][$item_index]|sfCalcIncTax:$arrInfo.tax:$arrInfo.tax_rule|number_format}-->円 222 221 </td> 223 222 <td class="right"> 224 223 <!--{assign var=key value="shipment_quantity"}--> 225 <!--{$arr Form[$key].value[$shipping_index][$item_index]|h}-->224 <!--{$arrShipping[$key][$item_index]|h}--> 226 225 </td> 227 226 </tr> … … 230 229 <!--{/if}--> 231 230 <!--{/if}--> 232 231 233 232 <table class="form"> 234 233 <tr> 235 234 <th>お名前</th> 236 235 <td> 237 <!--{$arrForm.shipping_name01.value[$shipping_index]|h}--> <!--{$arrForm.shipping_name02.value[$shipping_index]|h}--> 236 <!--{assign var=key1 value="shipping_name01"}--> 237 <!--{assign var=key2 value="shipping_name02"}--> 238 <!--{$arrShipping[$key1]|h}--> <!--{$arrShipping[$key2]|h}--> 238 239 </td> 239 240 </tr> … … 241 242 <th>お名前(カナ)</th> 242 243 <td> 243 <!--{$arrForm.shipping_kana01.value[$shipping_index]|h}--> <!--{$arrForm.shipping_kana02.value[$shipping_index]|h}--> 244 <!--{assign var=key1 value="shipping_kana01"}--> 245 <!--{assign var=key2 value="shipping_kana02"}--> 246 <!--{$arrShipping[$key1]|h}--> <!--{$arrShipping[$key2]|h}--> 244 247 </td> 245 248 </tr> … … 247 250 <th>TEL</th> 248 251 <td> 249 <!--{$arrForm.shipping_tel01.value[$shipping_index]|h}--> - <!--{$arrForm.shipping_tel02.value[$shipping_index]|h}--> - <!--{$arrForm.shipping_tel03.value[$shipping_index]|h}--> 252 <!--{assign var=key1 value="shipping_tel01"}--> 253 <!--{assign var=key2 value="shipping_tel02"}--> 254 <!--{assign var=key3 value="shipping_tel03"}--> 255 <!--{$arrShipping[$key1]|h}--> - 256 <!--{$arrShipping[$key2]|h}--> - 257 <!--{$arrShipping[$key3]|h}--> 250 258 </td> 251 259 </tr> … … 253 261 <th>住所</th> 254 262 <td> 255 〒 <!--{$arrForm.shipping_zip01.value[$shipping_index]|h}--> - <!--{$arrForm.shipping_zip02.value[$shipping_index]|h}--><br /> 256 <!--{$arrPref[$arrForm.order_pref.value]|h}--><!--{$arrForm.shipping_addr01.value[$shipping_index]|h}--><!--{$arrForm.shipping_addr02.value[$shipping_index]|h}--> 263 <!--{assign var=key1 value="shipping_zip01"}--> 264 <!--{assign var=key2 value="shipping_zip02"}--> 265 〒 266 <!--{$arrShipping[$key1]|h}--> 267 - 268 <!--{$arrShipping[$key2]|h}--> 269 <br /> 270 <!--{$arrPref[$arrShipping.shipping_pref]|h}--> 271 <!--{assign var=key value="shipping_addr01"}--> 272 <!--{$arrShipping[$key]|h}--> 273 <!--{assign var=key value="shipping_addr02"}--> 274 <!--{$arrShipping[$key]|h}--> 257 275 </td> 258 276 </tr> … … 260 278 <th>お届け時間</th> 261 279 <td> 262 <!--{assign var=deliv_time_id value="`$arrForm.time_id.value[$shipping_index]`"}--> 263 <!--{$arrDelivTime[$deliv_time_id]|default:"指定無し"}--> 280 <!--{$arrDelivTime[$arrShipping.time_id]|default:"指定無し"}--> 264 281 </td> 265 282 </tr> … … 267 284 <th>お届け日</th> 268 285 <td> 269 <!--{if $arrForm.shipping_date.value[$shipping_index] == ""}--> 286 <!--{assign var=key1 value="shipping_date_year"}--> 287 <!--{assign var=key2 value="shipping_date_month"}--> 288 <!--{assign var=key3 value="shipping_date_day"}--> 289 <!--{if $arrShipping[$key1] == "" && $arrShipping[$key2] == "" && $arrShipping[$key3] == ""}--> 270 290 指定無し 271 291 <!--{else}--> 272 <!--{$arrForm.shipping_date_year.value[$shipping_index]|default:""}-->年273 <!--{$arrForm.shipping_date_month.value[$shipping_index]|default:""}-->月274 <!--{$arrForm.shipping_date_day.value[$shipping_index]|default:""}-->日292 <!--{$arrShipping[$key1]}-->年 293 <!--{$arrShipping[$key2]}-->月 294 <!--{$arrShipping[$key3]}-->日 275 295 <!--{/if}--> 276 296 </td> … … 278 298 279 299 </table> 280 <!--{/section}--> 300 <!--{/foreach}--> 301 <!--▲お届け先情報ここまで--> 281 302 <!--{/if}--> 282 303 … … 314 335 </tr> 315 336 </table> 316 317 <div class="btn-area" 337 338 <div class="btn-area"> 318 339 <ul> 319 340 <li><a class="btn-action" href="javascript:;" onclick="window.close(); return false;"><span class="btn-next">閉じる</span></a></li> -
branches/version-2_11-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Disp.php
r21166 r21201 33 33 */ 34 34 class LC_Page_Admin_Order_Disp extends LC_Page_Admin_Order_Ex { 35 36 var $arrShippingKeys = array( 37 'shipping_id', 38 'shipping_name01', 39 'shipping_name02', 40 'shipping_kana01', 41 'shipping_kana02', 42 'shipping_tel01', 43 'shipping_tel02', 44 'shipping_tel03', 45 'shipping_fax01', 46 'shipping_fax02', 47 'shipping_fax03', 48 'shipping_pref', 49 'shipping_zip01', 50 'shipping_zip02', 51 'shipping_addr01', 52 'shipping_addr02', 53 'shipping_date_year', 54 'shipping_date_month', 55 'shipping_date_day', 56 'time_id', 57 ); 58 59 var $arrShipmentItemKeys = array( 60 'shipment_product_class_id', 61 'shipment_product_code', 62 'shipment_product_name', 63 'shipment_classcategory_name1', 64 'shipment_classcategory_name2', 65 'shipment_price', 66 'shipment_quantity', 67 ); 35 68 36 69 // }}} … … 80 113 $objPurchase = new SC_Helper_Purchase_Ex(); 81 114 $objFormParam = new SC_FormParam_Ex(); 82 115 83 116 // パラメータ情報の初期化 84 117 $this->lfInitParam($objFormParam); … … 86 119 $objFormParam->convParam(); 87 120 $order_id = $objFormParam->getValue('order_id'); 88 121 89 122 // DBから受注情報を読み込む 90 123 $this->setOrderToFormParam($objFormParam, $order_id); 91 124 92 125 $this->arrForm = $objFormParam->getFormParamList(); 126 $this->arrAllShipping = $objFormParam->getSwapArray(array_merge($this->arrShippingKeys, $this->arrShipmentItemKeys)); 93 127 $this->arrDelivTime = $objPurchase->getDelivTime($objFormParam->getValue('deliv_id')); 94 $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData(); 95 128 $this->arrInfo = SC_Helper_DB_Ex::sfGetBasisData(); 129 96 130 $this->setTemplate($this->tpl_mainpage); 97 131 } 98 132 99 133 /** 100 134 * デストラクタ. … … 229 263 $objFormParam->setParam(SC_Utils_Ex::sfSwapArray($arrOrderDetail)); 230 264 231 $arrShippings = $objPurchase->getShippings($order_id);232 // お届け日の処理233 foreach ( array_keys($arrShippings) as $key) {234 $shipping =& $arrShippings[$key];235 if (!SC_Utils_Ex::isBlank($ shipping["shipping_date"])) {236 $ts = strtotime($ shipping["shipping_date"]);237 $ arrShippings[$key]['shipping_date_year'] = date('Y', $ts);238 $ arrShippings[$key]['shipping_date_month'] = date('n', $ts);239 $ arrShippings[$key]['shipping_date_day'] = date('j', $ts);265 $arrShippingsTmp = $objPurchase->getShippings($order_id); 266 $arrShippings = array(); 267 foreach ($arrShippingsTmp as $row) { 268 // お届け日の処理 269 if (!SC_Utils_Ex::isBlank($row["shipping_date"])) { 270 $ts = strtotime($row["shipping_date"]); 271 $row['shipping_date_year'] = date('Y', $ts); 272 $row['shipping_date_month'] = date('n', $ts); 273 $row['shipping_date_day'] = date('j', $ts); 240 274 } 275 $arrShippings[$row['shipping_id']] = $row; 241 276 } 242 277 $objFormParam->setValue('shipping_quantity', count($arrShippings)); … … 246 281 * 配送商品を設定 247 282 * 248 * $arrShipmentItem['shipment_(key)'][$shipping_i ndex][$item_index] = 値249 * $arrProductQuantity[$shipping_i ndex] = 配送先ごとの配送商品数量283 * $arrShipmentItem['shipment_(key)'][$shipping_id][$item_index] = 値 284 * $arrProductQuantity[$shipping_id] = 配送先ごとの配送商品数量 250 285 */ 251 286 $arrProductQuantity = array(); 252 287 $arrShipmentItem = array(); 253 foreach ($arrShippings as $shipping_i ndex=> $arrShipping) {254 $arrProductQuantity[$shipping_i ndex] = count($arrShipping['shipment_item']);288 foreach ($arrShippings as $shipping_id => $arrShipping) { 289 $arrProductQuantity[$shipping_id] = count($arrShipping['shipment_item']); 255 290 foreach ($arrShipping['shipment_item'] as $item_index => $arrItem) { 256 291 foreach ($arrItem as $item_key => $item_val) { 257 $arrShipmentItem['shipment_' . $item_key][$shipping_i ndex][$item_index] = $item_val;292 $arrShipmentItem['shipment_' . $item_key][$shipping_id][$item_index] = $item_val; 258 293 } 259 294 } … … 270 305 $objFormParam->setParam($arrOrder); 271 306 272 // XXXポイントを設定307 // ポイントを設定 273 308 list($db_point, $rollback_point) = SC_Helper_DB_Ex::sfGetRollbackPoint( 274 309 $order_id, $arrOrder['use_point'], $arrOrder['add_point'], $arrOrder['status'] … … 278 313 279 314 if (!SC_Utils_Ex::isBlank($objFormParam->getValue('customer_id'))) { 280 $ this->setCustomerTo($objFormParam->getValue('customer_id'),281 $objFormParam);315 $arrCustomer = SC_Helper_Customer_Ex::sfGetCustomerDataFromId($objFormParam->getValue('customer_id')); 316 $objFormParam->setValue('customer_point', $arrCustomer['point']); 282 317 } 283 318 }
Note: See TracChangeset
for help on using the changeset viewer.