Merge branch 'master' of github.com:gnuboard/yc5

2013-11-13 11:42:34 +09:00
parent 51ea3bcd0e c0edc46bb9
commit b034c330ce
9 changed files with 44 additions and 11 deletions
--- a/shop/orderinquirycancel.php
+++ b/shop/orderinquirycancel.php
@ -75,6 +75,7 @@ $sql = " update {$g5['g5_shop_order_table']}
                od_cart_coupon = '0',
                od_coupon = '0',
                od_send_coupon = '0',
+                od_status = '취소',
                od_shop_memo = concat(od_shop_memo,\"\\n주문자 본인 직접 취소 - ".G5_TIME_YMDHIS." (취소이유 : {$cancel_memo})\")
            where od_id = '$od_id' ";
 sql_query($sql);