|
|
|
@ -63,7 +63,8 @@ class OrderDeliveryReport extends EloquentRepository |
|
|
|
->join(EmployeesModel::TABLE_NAME,EmployeesModel::TABLE_NAME.'.id','=',Model::$tableName.'.horseman_id','left') |
|
|
|
->where(Model::$tableName.'.type',1) |
|
|
|
->where('shipping_type',1) |
|
|
|
->whereIn('state',Model::ORDER_STATE_FINISH); |
|
|
|
->whereIn('state',Model::ORDER_STATE_FINISH) |
|
|
|
->where(Model::$tableName.'.created_at','>=',strtotime('2020-10-01 00:00:00')); |
|
|
|
|
|
|
|
if($userId){ |
|
|
|
$model->where(EmployeesModel::TABLE_NAME.'.user_id',$userId); |
|
|
|
|