diff --git a/adm/shop_admin/orderrequestdelete.php b/adm/shop_admin/orderrequestdelete.php new file mode 100644 index 000000000..ce361c319 --- /dev/null +++ b/adm/shop_admin/orderrequestdelete.php @@ -0,0 +1,31 @@ + \ No newline at end of file diff --git a/adm/shop_admin/orderrequestform.php b/adm/shop_admin/orderrequestform.php index 0ff12376e..b8dc0ff22 100644 --- a/adm/shop_admin/orderrequestform.php +++ b/adm/shop_admin/orderrequestform.php @@ -104,23 +104,22 @@ $qstr2 = $qstr.'&rq_type='.$rq_type.'&save_stx='.$stx; - + - + @@ -137,12 +136,6 @@ $qstr2 = $qstr.'&rq_type='.$rq_type.'&save_stx='.$stx; - - - - 교환요청상품 수령함 - - @@ -170,7 +163,7 @@ $qstr2 = $qstr.'&rq_type='.$rq_type.'&save_stx='.$stx; - + @@ -181,16 +174,10 @@ $qstr2 = $qstr.'&rq_type='.$rq_type.'&save_stx='.$stx; - - - - 반품요청상품 수령함 - - - + @@ -205,20 +192,20 @@ $qstr2 = $qstr.'&rq_type='.$rq_type.'&save_stx='.$stx; if($default['de_tax_flag_use']) { ?> - + - + - + @@ -236,7 +223,7 @@ $qstr2 = $qstr.'&rq_type='.$rq_type.'&save_stx='.$stx;
- + 목록 @@ -246,12 +233,12 @@ $qstr2 = $qstr.'&rq_type='.$rq_type.'&save_stx='.$stx; diff --git a/extend/shop.extend2.php b/extend/shop.extend2.php index 652113209..f3879de0e 100644 --- a/extend/shop.extend2.php +++ b/extend/shop.extend2.php @@ -371,7 +371,6 @@ if(!sql_query(" select rq_id from {$g4['shop_request_table']} limit 1 ", false)) `rq_content` TEXT NOT NULL, `rq_status` TINYINT(4) NOT NULL DEFAULT '0', `rq_item` TEXT NOT NULL, - `rq_recv` TINYINT(4) NOT NULL DEFAULT '0', `dl_company` INT(11) NOT NULL DEFAULT '0', `rq_invoice` VARCHAR(255) NOT NULL DEFAULT '', `rq_amount1` INT(11) NOT NULL DEFAULT '0', diff --git a/install/shop.sql b/install/shop.sql index 9d31fe195..8b19a8307 100644 --- a/install/shop.sql +++ b/install/shop.sql @@ -672,7 +672,6 @@ CREATE TABLE IF NOT EXISTS `shop_request` ( `rq_content` TEXT NOT NULL, `rq_status` TINYINT(4) NOT NULL DEFAULT '0', `rq_item` TEXT NOT NULL, - `rq_recv` TINYINT(4) NOT NULL DEFAULT '0', `dl_company` INT(11) NOT NULL DEFAULT '0', `rq_invoice` VARCHAR(255) NOT NULL DEFAULT '', `rq_amount1` INT(11) NOT NULL DEFAULT '0',