Merge branch 'zjl_export_20180730' into development

resources/views/detail/changeOrder.blade.php

@@ -347,7 +347,7 @@
 <script>
     var is_manager = "{{ $role == 1 || $role == 2 ? true : false }}"; 
 
-    var isNewClient = "{{$isNewClient}}"; 
+    var isNewClient = "{{isset($isNewClient) ? $isNewClient : 0}}"; 
     var order_amount = "{{$order_info['order_amount']}}"; 
     var currency = "{{$order_info['currency']}}"; 
     var order_pay_type = "{{$order_info['order_pay_type']}}";