Index: /branches/beta/html/admin/order/status.php
===================================================================
--- /branches/beta/html/admin/order/status.php (revision 12238)
+++ /branches/beta/html/admin/order/status.php (revision 12299)
@@ -11,15 +11,15 @@
class LC_Page {
- function LC_Page() {
- $this->tpl_mainpage = 'order/status.tpl';
- $this->tpl_subnavi = 'order/subnavi.tpl';
- $this->tpl_mainno = 'order';
- $this->tpl_subno = 'status';
- global $arrORDERSTATUS;
- global $arrORDERSTATUS_COLOR;
- $this->arrORDERSTATUS = $arrORDERSTATUS;
- $this->arrORDERSTATUS_COLOR = $arrORDERSTATUS_COLOR;
-
- }
+ function LC_Page() {
+ $this->tpl_mainpage = 'order/status.tpl';
+ $this->tpl_subnavi = 'order/subnavi.tpl';
+ $this->tpl_mainno = 'order';
+ $this->tpl_subno = 'status';
+ global $arrORDERSTATUS;
+ global $arrORDERSTATUS_COLOR;
+ $this->arrORDERSTATUS = $arrORDERSTATUS;
+ $this->arrORDERSTATUS_COLOR = $arrORDERSTATUS_COLOR;
+
+ }
}
@@ -36,62 +36,62 @@
$objPage->SelectedStatus = $_POST['status'];
$objPage->arrForm = $_POST;
-
+
//»ÙʧÊýË¡¤Î¼èÆÀ
$objPage->arrPayment = sfGetIDValueList("dtb_payment", "payment_id", "payment_method");
switch ($_POST['mode']){
-
- case 'search':
- switch($_POST['change_status']){
-
- default:
- break;
-
- //¿·µ¬¼õÉÕ
- case ORDER_NEW:
- lfStatusMove(ORDER_NEW, $_POST['move']);
- break;
+
+ case 'search':
+ switch($_POST['change_status']){
- //Æþ¶âÂÔ¤Á
- case ORDER_PAY_WAIT:
- lfStatusMove(ORDER_PAY_WAIT, $_POST['move']);
- break;
-
- //¥¥ã¥ó¥»¥ë
- case ORDER_CANCEL:
- lfStatusMove(ORDER_CANCEL, $_POST['move']);
- break;
-
- //¼è¤ê´ó¤»Ãæ
- case ORDER_BACK_ORDER:
- lfStatusMove(ORDER_BACK_ORDER, $_POST['move']);
- break;
-
- //ȯÁ÷ºÑ¤ß
- case ORDER_DELIV:
- lfStatusMove(ORDER_DELIV, $_POST['move']);
- break;
-
- //Æþ¶âºÑ¤ß
- case ORDER_PRE_END:
- lfStatusMove(ORDER_PRE_END, $_POST['move']);
- break;
-
- //ºï½ü
- case 'delete':
- lfStatusMove("delete",$_POST['move']);
- break;
- }
-
- //¸¡º÷·ë²Ì¤Îɽ¼¨
- lfStatusDisp($_POST['status'],$_POST['search_pageno']);
- break;
-
- default:
- //¥Ç¥Õ¥©¥ë¥È¤Ç¿·µ¬¼õÉÕ°ìÍ÷ɽ¼¨
- lfStatusDisp(ORDER_NEW, $_POST['search_pageno']);
- $objPage->defaultstatus = ORDER_NEW;
- break;
- }
+ default:
+ break;
+
+ //¿·µ¬¼õÉÕ
+ case ORDER_NEW:
+ lfStatusMove(ORDER_NEW, $_POST['move']);
+ break;
+
+ //Æþ¶âÂÔ¤Á
+ case ORDER_PAY_WAIT:
+ lfStatusMove(ORDER_PAY_WAIT, $_POST['move']);
+ break;
+
+ //¥¥ã¥ó¥»¥ë
+ case ORDER_CANCEL:
+ lfStatusMove(ORDER_CANCEL, $_POST['move']);
+ break;
+
+ //¼è¤ê´ó¤»Ãæ
+ case ORDER_BACK_ORDER:
+ lfStatusMove(ORDER_BACK_ORDER, $_POST['move']);
+ break;
+
+ //ȯÁ÷ºÑ¤ß
+ case ORDER_DELIV:
+ lfStatusMove(ORDER_DELIV, $_POST['move']);
+ break;
+
+ //Æþ¶âºÑ¤ß
+ case ORDER_PRE_END:
+ lfStatusMove(ORDER_PRE_END, $_POST['move']);
+ break;
+
+ //ºï½ü
+ case 'delete':
+ lfStatusMove("delete",$_POST['move']);
+ break;
+ }
+
+ //¸¡º÷·ë²Ì¤Îɽ¼¨
+ lfStatusDisp($_POST['status'],$_POST['search_pageno']);
+ break;
+
+ default:
+ //¥Ç¥Õ¥©¥ë¥È¤Ç¿·µ¬¼õÉÕ°ìÍ÷ɽ¼¨
+ lfStatusDisp(ORDER_NEW, $_POST['search_pageno']);
+ $objPage->defaultstatus = ORDER_NEW;
+ break;
+}
$objView->assignobj($objPage);
@@ -102,58 +102,75 @@
//¥¹¥Æ¡¼¥¿¥¹°ìÍ÷¤Îɽ¼¨
function lfStatusDisp($status,$pageno){
- global $objPage;
- global $objQuery;
-
- $select ="*";
- $from = "dtb_order";
- $where="del_flg=0 AND status=?";
- $order = "order_id DESC";
-
- $linemax = $objQuery->count("dtb_order", "del_flg = 0 AND status=?", array($status));
- $objPage->tpl_linemax = $linemax;
-
- // ¥Ú¡¼¥¸Á÷¤ê¤Î½èÍý
- $page_max = ORDER_STATUS_MAX;
-
- // ¥Ú¡¼¥¸Á÷¤ê¤Î¼èÆÀ
- $objNavi = new SC_PageNavi($pageno, $linemax, $page_max, "fnNaviSearchOnlyPage", NAVI_PMAX);
- $objPage->tpl_strnavi = $objNavi->strnavi; // ɽ¼¨Ê¸»úÎó
- $startno = $objNavi->start_row;
-
- $objPage->tpl_pageno = $pageno;
-
- // ¼èÆÀÈϰϤλØÄê(³«»Ï¹ÔÈֹ桢¹Ô¿ô¤Î¥»¥Ã¥È)
- $objQuery->setlimitoffset($page_max, $startno);
-
- //ɽ¼¨½ç½ø
- $objQuery->setorder($order);
-
- //¸¡º÷·ë²Ì¤Î¼èÆÀ
- $objPage->arrStatus = $objQuery->select($select, $from, $where, array($status));
-
- return $objPage;
+ global $objPage;
+ global $objQuery;
+
+ $select ="*";
+ $from = "dtb_order";
+ $where="del_flg=0 AND status=?";
+ $order = "order_id DESC";
+
+ $linemax = $objQuery->count("dtb_order", "del_flg = 0 AND status=?", array($status));
+ $objPage->tpl_linemax = $linemax;
+
+ // ¥Ú¡¼¥¸Á÷¤ê¤Î½èÍý
+ $page_max = ORDER_STATUS_MAX;
+
+ // ¥Ú¡¼¥¸Á÷¤ê¤Î¼èÆÀ
+ $objNavi = new SC_PageNavi($pageno, $linemax, $page_max, "fnNaviSearchOnlyPage", NAVI_PMAX);
+ $objPage->tpl_strnavi = $objNavi->strnavi; // ɽ¼¨Ê¸»úÎó
+ $startno = $objNavi->start_row;
+
+ $objPage->tpl_pageno = $pageno;
+
+ // ¼èÆÀÈϰϤλØÄê(³«»Ï¹ÔÈֹ桢¹Ô¿ô¤Î¥»¥Ã¥È)
+ $objQuery->setlimitoffset($page_max, $startno);
+
+ //ɽ¼¨½ç½ø
+ $objQuery->setorder($order);
+
+ //¸¡º÷·ë²Ì¤Î¼èÆÀ
+ $objPage->arrStatus = $objQuery->select($select, $from, $where, array($status));
+
+ return $objPage;
}
//¥¹¥Æ¡¼¥¿¥¹¾ðÊó¤Î¹¹¿·¡Êºï½ü¡Ë
-function lfStatusMove($status_id,$move){
- global $objQuery;
- global $objPage;
-
- if ($status_id == 'delete'){
- $sql = "UPDATE dtb_order SET del_flg = 1 ";
- }elseif ($status_id == ORDER_DELIV){
- $sql = "UPDATE dtb_order SET status = ".$status_id.",commit_date = now() ";
- }else{
- $sql = "UPDATE dtb_order SET status = ".$status_id." ";
- }
- $sql .= " WHERE order_id = ? ";
- if (isset($move)){
- foreach ($move as $val){
- if ($val != "") {
- $objQuery->exec($sql, array($val));
- }
- $objPage->tpl_onload = "window.alert('ÁªÂò¹àÌܤòºï½ü¤·¤Þ¤·¤¿¡£');";
- }
- }
+function lfStatusMove($status_id, $arrMove){
+ global $objQuery;
+ global $objPage;
+ global $arrORDERSTATUS;
+
+ $table = 'dtb_order';
+ $where = 'order_id = ?';
+ $arrUpdate = array('update_date' => 'NOW()');
+
+ $delflg = '1'; // ºï½ü¥Õ¥é¥°
+ $message = ''; // ¥¹¥Æ¡¼¥¿¥¹Êѹ¹¸å¤Ë¥Ý¥Ã¥×¥¢¥Ã¥×¤¹¤ë¥á¥Ã¥»¡¼¥¸¤ÎÆâÍÆ
+
+ if ( $status_id == 'delete' ) {
+ $arrUpdate['del_flg'] = $delflg;
+ $message = 'ºï½ü';
+ }
+ // ¥¹¥Æ¡¼¥¿¥¹¤¬È¯Á÷ºÑ¤ß¤Î»þ¤ÏȯÁ÷Æü¤ò¹¹¿·
+ elseif ( $status_id == ORDER_DELIV ) {
+ $arrUpdate['status'] = $status_id;
+ $arrUpdate['commit_date'] = 'NOW()';
+ $message = $arrORDERSTATUS[$status_id] . '¤Ø°ÜÆ°';
+ }
+ else {
+ $arrUpdate['status'] = $status_id;
+ $message = $arrORDERSTATUS[$status_id] . '¤Ø°ÜÆ°';
+ }
+
+ if ( isset($arrMove) ){
+ foreach ( $arrMove as $val ){
+ if ( $val != "" ) {
+ $objQuery->update($table, $arrUpdate, $where, array($val));
+ }
+
+ }
+ }
+
+ $objPage->tpl_onload = "window.alert('ÁªÂò¹àÌܤò" . $message . "¤·¤Þ¤·¤¿¡£');";
}