|
|
@@ -15,7 +15,7 @@ class OrderPackageFilters
|
|
|
protected $request;
|
|
|
protected $queryBuilder;
|
|
|
protected $filters = ['logistic_number', 'status', 'received_at_start',
|
|
|
- 'received_at_end', 'is_weighed', 'logistic_id', 'owner_id', 'sent_at_start', 'sent_at_end', 'is_exception', 'exception_type', 'default_date','has_transfer_status'];
|
|
|
+ 'received_at_end', 'is_weighed', 'logistic', 'owner', 'sent_at_start', 'sent_at_end', 'is_exception', 'exception_type', 'default_date','has_transfer_status'];
|
|
|
|
|
|
public function __construct(Request $request)
|
|
|
{
|
|
|
@@ -82,7 +82,7 @@ class OrderPackageFilters
|
|
|
}
|
|
|
}
|
|
|
|
|
|
- private function logistic_id($logistic_id)
|
|
|
+ private function logistic($logistic_id)
|
|
|
{
|
|
|
$logistic_ids = array_filter(preg_split('/[,, ]+/is', $logistic_id));
|
|
|
$this->queryBuilder->whereIn('order_id', function ($query) use ($logistic_ids) {
|
|
|
@@ -90,7 +90,7 @@ class OrderPackageFilters
|
|
|
});
|
|
|
}
|
|
|
|
|
|
- private function owner_id($owner_id)
|
|
|
+ private function owner($owner_id)
|
|
|
{
|
|
|
$owner_ids = array_filter(preg_split('/[,, ]+/is', $owner_id));
|
|
|
$this->queryBuilder->whereIn('owner_id', $owner_ids);
|