Merge branch 'zjl_create_order_20180813' into development

app/Http/Controllers/OrderController.php

@@ -881,6 +881,10 @@ Class OrderController extends Controller
 
 
                 $data['shippings'] = $shippingInfo;
                 $data['shippings'] = $shippingInfo;
             }
             }
+
+            $extend = DB::connection('order')->table('lie_order_extend')->where(['order_id' => $id, 'order_type' => 3])->first();
+
+            $data['extend'] = $extend ? $extend : '';       
         }
         }
 
 
         return view($view_id, $data);
         return view($view_id, $data);

resources/views/detail/content.blade.php

@@ -245,7 +245,7 @@
                             @if($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms))
                             @if($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('update_invoice', $userPerms))
                                 <a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                                 <a href="/changeInvoice/{{$order_info['order_id']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                             @endif
                             @endif
-                        @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && $user_mobile != Config('website.internal-account'))
+                        @elseif (isset($_REQUEST['tags']) && $_REQUEST['tags'] == 'self' && !$extend)
                             @if($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms))
                             @if($order_info['status'] < 10 && $order_invoice_info['invoice_status'] < 2 && in_array('self_order_update_invoice', $userPerms))
                                 <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                                 <a href="/changeInvoice/{{$order_info['order_id']}}?tags={{$_REQUEST['tags']}}" class="btn btn-success btn-sm changeBtn">更改发票</a>
                             @endif
                             @endif