- Timestamp:
- 2011/01/18 04:38:42 (13 years ago)
- bzr:base-revision:
- svn-v4:1e3b908f-19a9-db11-a64c-001125224ba8:branches/version-2_5-dev:19948
- bzr:committer:
- Kentaro Ohkouchi <nanasess@fsm.ne.jp>
- bzr:file-ids:
data/Smarty/templates/admin/main_frame.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Fmain_frame.tpl
data/Smarty/templates/admin/order/edit.tpl 15732@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2FSmarty%2Ftemplates%2Fdefault%2Fadmin%2Forder%2Fedit.tpl
data/class/helper/SC_Helper_Purchase.php sc_helper_purchase.p-20101020100530-jyaoa7ch9pdfjqzp-1
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php 15594@1e3b908f-19a9-db11-a64c-001125224ba8:branches%2Ffeature-module-update%2Fdata%2Fclass%2Fpages%2Fadmin%2Forder%2FLC_Page_Admin_Order_Edit.php- bzr:mapping-version:
- v4
- bzr:merge:
nanasess@fsm.ne.jp-20110117193611-el60eq6bhi2uj54q- bzr:repository-uuid:
- 1e3b908f-19a9-db11-a64c-001125224ba8
- bzr:revision-id:
- nanasess@fsm.ne.jp-20110117193838-vgfohrkdiaqqbdxo
- bzr:revno:
- 2678
- bzr:revprop:branch-nick:
- branches/version-2_5-dev
- bzr:root:
- branches/version-2_5-dev
- bzr:text-revisions:
data/Smarty/templates/admin/main_frame.tpl nanasess@fsm.ne.jp-20110117193611-el60eq6bhi2uj54q
data/Smarty/templates/admin/order/edit.tpl nanasess@fsm.ne.jp-20110117193611-el60eq6bhi2uj54q
data/class/helper/SC_Helper_Purchase.php nanasess@fsm.ne.jp-20110117193611-el60eq6bhi2uj54q
data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php nanasess@fsm.ne.jp-20110117193611-el60eq6bhi2uj54q- bzr:timestamp:
- 2011-01-18 04:38:38.407999992 +0900
- bzr:user-agent:
- bzr2.2.2+bzr-svn1.0.4
- svn:original-date:
- 2011-01-17T19:38:38.408000Z
- Location:
- branches/version-2_5-dev/data
- Files:
-
- 4 edited
Legend:
- Unmodified
- Added
- Removed
-
branches/version-2_5-dev/data/Smarty/templates/admin/main_frame.tpl
r19943 r19949 154 154 155 155 </div> 156 </div>157 156 </body> 158 157 </html> -
branches/version-2_5-dev/data/Smarty/templates/admin/order/edit.tpl
r19946 r19949 56 56 57 57 function fnMultiple() { 58 win03('<!--{$smarty.const.URL_PATH}--><!--{$smarty.const.ADMIN_DIR}-->order/multiple.php', 'multiple', '600', '500'); 59 document.form1.anchor_key.value = "shipping"; 58 60 document.form1.mode.value = "multiple"; 59 61 document.form1.submit(); … … 81 83 <tr> 82 84 <th>帳票出力</th> 83 <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf',' 1000','800'); return false;">帳票出力</a></td>85 <td><a class="btn-normal" href="javascript:;" onclick="win02('pdf.php?order_id=<!--{$arrForm.order_id.value}-->','pdf','615','800'); return false;">帳票出力</a></td> 84 86 </tr> 85 87 <!--{/if}--> 86 88 <tr> 87 89 <th>注文番号</th> 88 <td><!--{$ tpl_order_id|h}--></td>90 <td><!--{$arrForm.order_id.value|h}--></td> 89 91 </tr> 90 92 <tr> 91 93 <th>受注日</th> 92 <td><!--{$arrForm.create_date.value|sfDispDBDate}--></td> 93 <input type="hidden" name="create_date" value="<!--{$arrForm.create_date.value}-->" /> 94 <td><!--{$arrForm.create_date.value|sfDispDBDate}--><input type="hidden" name="create_date" value="<!--{$arrForm.create_date.value}-->" /></td> 94 95 </tr> 95 96 <tr> … … 353 354 <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnCopyFromOrderData();">お客様情報へお届けする</a> 354 355 <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnCopyFromOrderData();">お届け先を新規追加</a> 355 <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnM odeSubmit('multiple','anchor_key','shipping');">複数のお届け先を指定する</a>356 <a class="btn-normal" href="javascript:;" name="input_from_order_data" onclick="fnMultiple();">複数のお届け先を指定する</a> 356 357 </h2> 357 358 … … 536 537 <!--{assign var=key value="note"}--> 537 538 <span class="attention"><!--{$arrErr[$key]}--></span> 538 <textarea name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="80" rows="6" class="area80" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|h}--></textarea> </td>539 <textarea name="<!--{$key}-->" maxlength="<!--{$arrForm[$key].length}-->" cols="80" rows="6" class="area80" style="<!--{$arrErr[$key]|sfGetErrorColor}-->" ><!--{$arrForm[$key].value|h}--></textarea> 539 540 </td> 540 541 </tr> -
branches/version-2_5-dev/data/class/helper/SC_Helper_Purchase.php
r19943 r19949 541 541 $sqlval['classcategory_name1'] = $d['classcategory_name1']; 542 542 $sqlval['classcategory_name2'] = $d['classcategory_name2']; 543 $sqlval['price'] = $d['price '];543 $sqlval['price'] = $d['price02']; 544 544 $sqlval['quantity'] = $val['quantity']; 545 545 $objQuery->insert("dtb_shipment_item", $sqlval); -
branches/version-2_5-dev/data/class/pages/admin/order/LC_Page_Admin_Order_Edit.php
r19935 r19949 219 219 case 'multiple': 220 220 $this->objFormParam->setParam($_POST); 221 $this->tpl_onload = "win03('" . URL_PATH . ADMIN_DIR . "order/multiple.php', 'multiple', '600', '500');";222 221 break; 223 222 … … 408 407 } 409 408 409 $arrQuantity = array(); 410 410 $this->arrShippingIds = array(); 411 411 $this->arrProductClassIds = array(); … … 418 418 419 419 foreach ($items as $productClassId => $item) { 420 $arrQuantity[$productClassId] += $item['quantity']; 420 421 foreach ($item as $itemKey => $itemVal) { 421 422 $this->objFormParam->setValue($itemKey . '_' . $shippingId . '_' . $productClassId, $itemVal); … … 423 424 } 424 425 } 426 427 // 受注商品の数量を変更 428 $dest = array(); 429 foreach ($arrQuantity as $productClassId => $quantity) { 430 foreach ($this->arrForm['product_class_id'] as $n => $orderProductClassId) { 431 if ($productClassId == $orderProductClassId) { 432 $dest['quantity'][$n] = $quantity; 433 } 434 } 435 } 436 437 $this->objFormParam->setParam($dest); 425 438 } 426 439 … … 496 509 function lfGetOrderDetail($order_id) { 497 510 $objQuery = new SC_Query(); 511 $col = "T1.product_id, T1.product_class_id, T1.product_name, " 512 . "T1.product_code, T1.classcategory_name1, T1.classcategory_name2, " 513 . "T1.price, T1.quantity, T1.point_rate, T2.product_type_id"; 498 514 $from = <<< __EOS__ 499 515 dtb_order_detail T1 … … 501 517 ON T1.product_class_id = T2.product_class_id 502 518 __EOS__; 503 $arrRet = $objQuery->select( "T1.*, T2.product_type_id", $from,519 $arrRet = $objQuery->select($col, $from, 504 520 "order_id = ?", array($order_id)); 505 521 return $arrRet; … … 599 615 /** 600 616 * DB更新処理 617 * 618 * TODO リファクタリング 601 619 * 602 620 * @param integer $order_id 注文番号 … … 690 708 } 691 709 710 // 配送情報の初期化 711 // FIXME UPDATE/INSERT にする 712 $objQuery->delete('dtb_shipping', "order_id = ?", array($order_id)); 713 $objQuery->delete('dtb_shipment_item', "order_id = ?", array($order_id)); 714 715 $arrParams = $this->objFormParam->getHashArray(); 716 // 配送ID の配列を取得 717 $shippingIds = array(); 718 foreach (array_keys($arrParams) as $key) { 719 if (preg_match('/^shipping_id_/', $key)) { 720 $shippingIds[] = $arrParams[$key]; 721 } 722 } 723 724 $cols = $objQuery->listTableFields('dtb_shipping'); 725 foreach ($shippingIds as $shipping_id) { 726 727 $arrParams['shipping_date_' . $shipping_id] = SC_Utils_Ex::sfGetTimestamp($arrParams['shipping_date_year_' . $shipping_id], 728 $arrParams['shipping_date_month_' . $shipping_id], 729 $arrParams['shipping_date_day_' . $shipping_id]); 730 $dest = array(); 731 foreach ($arrParams as $key => $val) { 732 $key = preg_replace('/_' . $shipping_id . '$/', '', $key); 733 if (in_array($key, $cols)) { 734 $dest[$key] = $val; 735 } 736 } 737 $dest['shipping_id'] = $shipping_id; 738 $dest['order_id'] = $order_id; 739 $dest['create_date'] = 'Now()'; 740 $dest['update_date'] = 'Now()'; 741 $objQuery->insert('dtb_shipping', $dest); 742 743 // 商品規格ID の配列を取得 744 $productClassIds = array(); 745 foreach (array_keys($arrParams) as $key) { 746 if (preg_match('/^product_class_id_' . $shipping_id . '_/', $key)) { 747 $productClassIds[] = $arrParams[$key]; 748 } 749 } 750 751 foreach ($productClassIds as $product_class_id) { 752 $item['shipping_id'] = $shipping_id; 753 $item['order_id'] = $order_id; 754 $item['product_class_id'] = $product_class_id; 755 $item['product_name'] = $arrParams['product_name_' . $shipping_id . '_' . $product_class_id]; 756 $item['product_code'] = $arrParams['product_code_' . $shipping_id . '_' . $product_class_id]; 757 $item['classcategory_name1'] = $arrParams['classcategory_name1_' . $shipping_id . '_' . $product_class_id]; 758 $item['classcategory_name2'] = $arrParams['classcategory_name2_' . $shipping_id . '_' . $product_class_id]; 759 $item['price'] = $arrParams['price_' . $shipping_id . '_' . $product_class_id]; 760 $item['quantity'] = $arrParams['quantity_' . $shipping_id . '_' . $product_class_id]; 761 $objQuery->insert("dtb_shipment_item", $item); 762 } 763 } 692 764 $objQuery->commit(); 693 765 } … … 780 852 $dest = array(); 781 853 foreach ($sqlval as $key => $val) { 782 if (in_array($ cols, $key)) {854 if (in_array($key, $cols)) { 783 855 $dest[$key] = $val; 784 856 } 785 857 } 786 $result = $objQuery->update($table, $dest, "order_id = ?", array($order_id)); 787 if ($result == 0) { 858 859 $exists = $objQuery->count("dtb_order", "order_id = ?", array($order_id)); 860 if ($exists > 0) { 861 $objQuery->update($table, $dest, "order_id = ?", array($order_id)); 862 } else { 863 // TODO 788 864 $dest['order_id'] = $order_id; 789 865 $result = $objQuery->insert($table, $dest);
Note: See TracChangeset
for help on using the changeset viewer.