Merge branch 'zjl_order_list_20190902'

app/Http/Controllers/OrderController.php

@@ -94,7 +94,7 @@ function getCompanyName($order_id, $user_id)
 {
     $order_invoice = DB::connection('order')->table('lie_order_invoice')->where(['order_id'=>$order_id])->select('tax_title', 'inv_type')->first();
 
-    if ($order_invoice->inv_type != 1) return $order_invoice->tax_title;
+    if ($order_invoice && $order_invoice->inv_type != 1) return $order_invoice->tax_title;
 
     $company = DB::connection('order')->table('lie_user_company')->where(['user_id' => $user_id])->select('com_name')->first();
 

resources/views/orderlist/content.blade.php

@@ -255,7 +255,9 @@
                         <tr data-oid="{{ $v['order_id'] }}" data-type="1">
                             <td class="show-list"><?php print_r(App\Http\Controllers\getAccountName($v['user_id'])); ?></td> 
                             <td class="show-list">
+                                @if ($v['order_type'] == 1)
                                 <p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}" style="width: 200px;">{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}</p>
+                                @endif
                             </td>  
                             <td class="show-list">{{$v['order_sn']}}</td> 
                             <?php $order_extend = App\Http\Controllers\getOrderExtend($v['order_id']); ?> 

resources/views/selfOrder/content.blade.php

@@ -244,7 +244,9 @@
                                 @endif   
                             </td>
                             <td class="show-list">
+                                @if ($v['order_type'] == 1)
                                 <p class="show-title" title="{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}" style="width: 200px;">{{App\Http\Controllers\getCompanyName($v['order_id'], $v['user_id'])}}</p>
+                                @endif
                             </td> 
                             <td class="show-list">{{$v['order_sn']}}</td>   
                             <td class="show-list">