Merge branch 'master' into waybill_ZD

# Conflicts:
#	app/Http/Controllers/api/thirdPart/flux/PackageController.php
#	resources/views/weight/package/statistics.blade.php

app/Http/Controllers/PackageController.php

@@ -131,7 +131,7 @@ class PackageController extends Controller
 
 
     public function statistics(Request $request){
-        $packages=Package::select(DB::raw('owner_id,logistic_id,COUNT(logistic_id) AS count'));
+        $packages=Package::select(DB::raw('owner_id,logistic_id,COUNT(logistic_id) AS count'))->whereNotNull('owner_id');
         if($request->input('owner_id')){
             $owners_id=$id = explode( ',',$request->input('owner_id'));
             $packages=$packages->whereIn('owner_id',$owners_id);

app/Http/Controllers/api/thirdPart/flux/PackageController.php

@@ -172,10 +172,10 @@ class PackageController extends Controller
             $noIssues=false;
         }
         if($noIssues&&$response['response']['flag']=='Y'){
-            $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($package)."||".json_encode($response['response']),null);
+            $this->log(__METHOD__,'SUCCESS_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
             return ['result'=>'success'];
         }
-        $this->log(__METHOD__,'ERROR_'.__FUNCTION__,json_encode($package)."||".json_encode($response['response']),null);
+        $this->log(__METHOD__,'ERROR_'.__FUNCTION__,json_encode($json).'| response: '.json_encode($response),null);
         return ['result'=>'false'];
     }