dever %!s(int64=3) %!d(string=hai) anos
pai
achega
8c4cdf2fd6
Modificáronse 2 ficheiros con 3 adicións e 3 borrados
  1. 2 2
      app/shop/lib/Refund.php
  2. 1 1
      app/store/admin/Order.php

+ 2 - 2
app/shop/lib/Refund.php

@@ -284,7 +284,7 @@ class Refund
                 $update['refund_status'] = 3;
             }
             # 检测是否还有别的退款申请
-            $refund_data = Dever::db($this->refund_table)->find(array('order_id' => $order['id'], 'status' => 1));
+            $refund_data = Dever::db($this->refund_table)->find(array('order_id' => $order['id'], 'process' => 1));
             if ($refund_data) {
                 $update['refund_status'] = 2;
             }
@@ -321,7 +321,7 @@ class Refund
                     }
 
                     if ($update['refund_status'] == 3) {
-                        $refund_data = Dever::db($this->refund_table)->find(array('order_id' => $order['id'], 'status' => 1));
+                        $refund_data = Dever::db($this->refund_table)->find(array('order_id' => $order['id'], 'process' => 1));
                         if ($refund_data) {
                             $update['refund_status'] = 2;
                         }

+ 1 - 1
app/store/admin/Order.php

@@ -53,7 +53,7 @@ class Order extends Core
         		} else {
         			$ps_date = '-';
         		}
-        		$view = Dever::url('order_view?type=2&order_id=' . $v['id'] . '&cash=2', 'store');
+        		$view = Dever::url('order_view?type=2&noprice=1&order_id=' . $v['id'] . '&cash=2', 'store');
 
         		$send = Dever::url('order_send?id=' . $v['id'] . '&type=2', 'store');