TPS/birzha
TPS
/
birzha
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'github/1.1' into 1.1

This commit is contained in:
merdan 2021-11-22 18:46:56 +05:00
parent 8908e0bec6 966a7124d6
commit ddca873360
1 changed files with 18 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

23
plugins/ahmadfatoni/apigenerator/controllers/api/ProductsApiController.php
View File

@ -44,7 +44,9 @@ class ProductsAPIController extends Controller
// $query = $this->Product::with('categories:id,name')
$query = $this->Product::with([
'translations:locale,model_id,attribute_data',
'images:attachment_id,attachment_type,disk_name,file_name'
'images:attachment_id,attachment_type,disk_name,file_name',
'measure.translations:locale,model_id,attribute_data',
'currency.translations:locale,model_id,attribute_data'
])
->approvedAndFreshEndDate()
->orderBy('updated_at', $sortOrder);
@ -56,7 +58,9 @@ class ProductsAPIController extends Controller
// ->with('categories:id,name')
->with([
'translations:locale,model_id,attribute_data',
'images:attachment_id,attachment_type,disk_name,file_name'
'images:attachment_id,attachment_type,disk_name,file_name',
'measure.translations:locale,model_id,attribute_data',
'currency.translations:locale,model_id,attribute_data'
])
->approvedAndFreshEndDate()
->orderBy('updated_at', $sortOrder);
@ -77,7 +81,9 @@ class ProductsAPIController extends Controller
// ->with('categories:id,name')
->with([
'translations:locale,model_id,attribute_data',
'images:attachment_id,attachment_type,disk_name,file_name'
'images:attachment_id,attachment_type,disk_name,file_name',
'measure.translations:locale,model_id,attribute_data',
'currency.translations:locale,model_id,attribute_data'
])
->approvedAndFreshEndDate()
->orderBy('updated_at', $sortOrder);
@ -90,7 +96,9 @@ class ProductsAPIController extends Controller
$query = $this->Product::searched($locale, $queryString)
->with([
'translations:locale,model_id,attribute_data',
'images:attachment_id,attachment_type,disk_name,file_name'
'images:attachment_id,attachment_type,disk_name,file_name',
'measure.translations:locale,model_id,attribute_data',
'currency.translations:locale,model_id,attribute_data'
])
->orderBy('updated_at', $sortOrder);
}
@ -110,7 +118,12 @@ class ProductsAPIController extends Controller
$data = $this->Product::with([
'translations:locale,model_id,attribute_data',
'images:attachment_id,attachment_type,disk_name,file_name'
'images:attachment_id,attachment_type,disk_name,file_name',
'measure.translations:locale,model_id,attribute_data',
'currency.translations:locale,model_id,attribute_data',
'payment_term.translations:locale,model_id,attribute_data',
'delivery_term.translations:locale,model_id,attribute_data',
'vendor:id,name,surname,email,username'
])->find($id);
if ($data && $data->status == 'approved' && $data->ends_at >= \Carbon\Carbon::now()){