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

adm/shop_admin/ordercartupdate.php

@@ -253,8 +253,10 @@ $od_misu = ( $cart_price + $send_cost + $od['od_send_cost2'] )
            - ( $od['od_receipt_price'] + $od['od_receipt_point'] - $od['od_refund_price'] );
 
 // 주문정보 반영
+$od_cart_price = $cart_price + $cancel_price;
+
 $sql = " update {$g5['g5_shop_order_table']}
-            set od_cart_price   = '$cart_price',
+            set od_cart_price   = '$od_cart_price',
                 od_cart_coupon  = '$cart_coupon',
                 od_coupon       = '$tot_od_cp_price',
                 od_send_coupon  = '$tot_sc_cp_price',

adm/shop_admin/orderreceiptupdate.php

@@ -34,8 +34,8 @@ if($od['od_tax_flag']) {
     $tot_tax_mny = ( $tax_mny + $od_send_cost + $od_send_cost2 )
                    - ( $od['od_coupon'] + $od['od_send_coupon'] + $od_receipt_point );
     if($tot_tax_mny < 0) {
-        $tot_tax_mny = 0;
         $free_mny += $tot_tax_mny;
+        $tot_tax_mny = 0;
     }
 } else {
     $tot_tax_mny = ( $tax_mny + $free_mny + $od_send_cost + $od_send_cost2 )