Merge branch 'master' of ssh://47.103.131.176:10022/var/git/bswas

app/Services/PackageService.php

@@ -22,7 +22,7 @@ class PackageService
         $packages = OrderPackage::query()->with(['order'=>function($query){
             return  $query->with(['owner','logistic','batch']);
         },'paperBox','measuringMachine'])
-        ->whereIn('order_packages.owner_id',app("OwnerService")->getQuery())->orderBy(TABLE.'id','DESC');
+        ->whereIn('order_packages.owner_id',app("OwnerService")->getIdArr())->orderBy(TABLE.'id','DESC');
         if ($params['owner'] ?? false){
             $owner_id = explode(',',$params['owner']);
             $packages->whereIn('order_packages.owner_id',$owner_id);