mirror of
https://github.com/openclassify/openclassify.git
synced 2026-02-10 23:36:08 -06:00
Merge branch 'master' of https://github.com/openclassify/openclassify
This commit is contained in:
commit
ac92307102
@ -159,7 +159,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($this->model->is_enabled('customfields')) {
|
if ($this->model->is_enabled('customfields')) {
|
||||||
$query = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->filterSearch($customParameters, $param, $query);
|
$query = app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController')->filterSearch($customParameters, $param, $query);
|
||||||
}
|
}
|
||||||
|
|
||||||
// //UPDATE `default_advs_advs` SET `coor` = (PointFromText('POINT(41.085022 28.804754)')) WHERE `default_advs_advs`.`id` = 8
|
// //UPDATE `default_advs_advs` SET `coor` = (PointFromText('POINT(41.085022 28.804754)')) WHERE `default_advs_advs`.`id` = 8
|
||||||
|
|||||||
@ -292,7 +292,7 @@ class AdvsController extends PublicController
|
|||||||
|
|
||||||
$cFArray = array();
|
$cFArray = array();
|
||||||
if ($isActiveCustomFields) {
|
if ($isActiveCustomFields) {
|
||||||
$returnvalues = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->index($mainCats, $subCats, $categoryId);
|
$returnvalues = app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController')->index($mainCats, $subCats, $categoryId);
|
||||||
$checkboxes = $returnvalues['checkboxes'];
|
$checkboxes = $returnvalues['checkboxes'];
|
||||||
$topfields = $returnvalues['topfields'];
|
$topfields = $returnvalues['topfields'];
|
||||||
$selectDropdown = $returnvalues['selectDropdown'];
|
$selectDropdown = $returnvalues['selectDropdown'];
|
||||||
@ -527,7 +527,7 @@ class AdvsController extends PublicController
|
|||||||
|
|
||||||
$features = null;
|
$features = null;
|
||||||
if ($this->adv_model->is_enabled('customfields')) {
|
if ($this->adv_model->is_enabled('customfields')) {
|
||||||
$features = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->view($adv);
|
$features = app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController')->view($adv);
|
||||||
}
|
}
|
||||||
|
|
||||||
//Cloudinary Module
|
//Cloudinary Module
|
||||||
@ -641,7 +641,7 @@ class AdvsController extends PublicController
|
|||||||
$options = $this->optionRepository->findAllBy('adv_id', $id);
|
$options = $this->optionRepository->findAllBy('adv_id', $id);
|
||||||
|
|
||||||
if ($this->adv_model->is_enabled('customfields')) {
|
if ($this->adv_model->is_enabled('customfields')) {
|
||||||
$features = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->view($adv);
|
$features = app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController')->view($adv);
|
||||||
}
|
}
|
||||||
|
|
||||||
$isActiveDopings = $this->adv_model->is_enabled('dopings');
|
$isActiveDopings = $this->adv_model->is_enabled('dopings');
|
||||||
@ -727,7 +727,7 @@ class AdvsController extends PublicController
|
|||||||
$cats_d['cat' . $plus1] = $cat->name;
|
$cats_d['cat' . $plus1] = $cat->name;
|
||||||
}
|
}
|
||||||
if ($isActive->is_enabled('customfields')) {
|
if ($isActive->is_enabled('customfields')) {
|
||||||
$custom_fields = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->create($categories);
|
$custom_fields = app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController')->create($categories);
|
||||||
}
|
}
|
||||||
//Cloudinary Module
|
//Cloudinary Module
|
||||||
return $this->view->make('visiosoft.module.advs::new-ad/new-create', compact(
|
return $this->view->make('visiosoft.module.advs::new-ad/new-create', compact(
|
||||||
@ -827,7 +827,7 @@ class AdvsController extends PublicController
|
|||||||
}
|
}
|
||||||
}
|
}
|
||||||
if ($this->adv_model->is_enabled('customfields')) {
|
if ($this->adv_model->is_enabled('customfields')) {
|
||||||
app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->store($adv, $request);
|
app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController')->store($adv, $request);
|
||||||
}
|
}
|
||||||
|
|
||||||
// Auto approve
|
// Auto approve
|
||||||
@ -960,7 +960,7 @@ class AdvsController extends PublicController
|
|||||||
$categories = array_keys($cats);
|
$categories = array_keys($cats);
|
||||||
|
|
||||||
if ($this->adv_model->is_enabled('customfields')) {
|
if ($this->adv_model->is_enabled('customfields')) {
|
||||||
$custom_fields = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')
|
$custom_fields = app('Visiosoft\CustomfieldsModule\Http\Controller\CustomFieldsController')
|
||||||
->edit($adv, $categories, $cats);
|
->edit($adv, $categories, $cats);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|||||||
Loading…
Reference in New Issue
Block a user