Merge branch 'master' of http://119.23.72.7/zhujilai/Order into zjl_self_order_20180502

app/Http/Controllers/OrderController.php

@@ -1270,7 +1270,7 @@ Class OrderController extends Controller
     {
         $order = DB::connection('order')
                 ->table('lie_order')
-                ->whereIn('status', ['2', '3'])
+                ->where('status', '=', 2)
                 ->whereNotIn('user_id', $this->testMobile())
                 ->where('is_type', '=', 0)
                 ->where('pay_time', '>', time())
@@ -1328,7 +1328,7 @@ Class OrderController extends Controller
 
         $order = DB::connection('order')
                 ->table('lie_order')
-                ->whereIn('status', ['2', '3'])
+                ->where('status', '=', 2)
                 ->whereNotIn('user_id', $this->testMobile())
                 ->where('is_type', '=', 0)
                 ->where('pay_time', '>=', $time)
@@ -1343,7 +1343,7 @@ Class OrderController extends Controller
                     $update = DB::connection('order')
                             ->table('lie_order')
                             ->where('order_id', '=', $v->order_id)
-                            ->update(['status' => -1, 'pay_time' => 0]);
+                            ->update(['status' => -1, 'pay_time' => 0, 'cancel_time' => time()]);
 
                     if ($update) {
                         continue;

config/perm.php

@@ -2,7 +2,7 @@
 	return [
 		// 菜单权限
 		'订单管理' => [
-			'平台订单' => ['orderlist_check', 'export', 'check_order', 'cancel_order', 'check_account', 'order_send', 'send_invoice', 'update_address', 'update_invoice', 'check_test_order', 'check_offline_order'],
+			'平台订单' => ['orderlist_check', 'export', 'check_order', 'cancel_order', 'check_account', 'order_send', 'send_invoice', 'update_address', 'update_invoice', 'check_test_order', 'check_offline_order', 'download_contract'],
 
 			'ERP订单'  => ['erp_order_check'],
 

config/website.php

@@ -22,5 +22,5 @@ return [
     'check_access_api'  => 'http://perm.liexin.net/api/perms/access',
 
     // 竞调账户配置显示时间
-    'vp_time_set' => '2018-04-01',
+    'vp_time_set' => '2018-05-01',
 ];

public/js/order.js

@@ -1030,6 +1030,12 @@
                         }
                     }
 
+                    if ($(this).val() < 0) {
+                        layer.msg('只能是正整数');
+                        $(this).val('');
+                        return false;
+                    }
+
                     if($(this).val()>999999.9999){
                         $(this).val(999999.9999);
                     }

resources/views/detail/changeOrder.blade.php

@@ -88,7 +88,7 @@
                         <tr>
                             <td><p>{{$v['goods_name']}}</p></td>
                             <td>
-                                <input class="only_positive_nubme num" name="change_info[{{$v['rec_id']}}][goods_number]" value="{{$v['goods_number']}}">
+                                <input class="only_positive_nubme only_number num" name="change_info[{{$v['rec_id']}}][goods_number]" value="{{$v['goods_number']}}">
                             </td>
                             <td>
                                 <input class="price only_number" name="change_info[{{$v['rec_id']}}][goods_price]" value="{{$v['goods_price']}}">

resources/views/erpOrder/content.blade.php

@@ -266,12 +266,14 @@
             </table>
         </div>
         <div class="row-fluid pagination">
+            @if ($username != 'vpadmin@ichunt.com')
                 <span>
                     共{{$count ? $count : 0}}单，
                     应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}，   ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}， 
                     实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，  
                     ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}  
                 </span>
+            @endif
             
             <?php echo $page; ?>
         </div>

resources/views/orderlist/content.blade.php

@@ -273,6 +273,17 @@
                                         @if (in_array('check_order', $userPerms))
     	                                    <a class="btn btn-success" href="{{URL('change', ['order_id'=>$v['order_id']])}}" target="_blank">人工审单</a>
                                         @endif
+
+                                        <?php 
+                                            $apiUrl = Config('website.api_domain');
+                                            $k1  = time();
+                                            $k2  = md5(md5($k1).'fh6y5t4rr351d2c3bryi');
+                                            $downLoadUrl = $apiUrl.'contract/pdfinfo?id='.$v['order_id'].'&k1='.$k1.'&k2='.$k2;
+                                        ?>
+                                        
+                                        @if (in_array('download_contract', $userPerms))
+                                            <a class="btn btn-info" href="{{$downLoadUrl}}">下载合同</a>
+                                        @endif
                                 </div>
                             </td>
                         </tr>
@@ -367,12 +378,14 @@
             </table>
         </div>
         <div class="row-fluid pagination">
+            @if ($username != 'vpadmin@ichunt.com')
                 <span>
                     共{{$count ? $count : 0}}单，
                     应付金额 ￥{{$pay_count['rmb_count'] ? $pay_count['rmb_count'] : 0}}，   ${{$pay_count['usd_count'] ? $pay_count['usd_count'] : 0}}， 
                     实收金额 ￥{{$pay_count['rmb_pay'] ? $pay_count['rmb_pay'] : 0}}，  
                     ${{$pay_count['usd_pay'] ? $pay_count['usd_pay'] : 0}}  
                 </span>
+            @endif
 
             <?php echo $page; ?>
         </div>