hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-09 23:06:08 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #1012 from openclassify/vedatakd

Browse Source 
fixes
This commit is contained in:
Dia Shalabi 2021-03-29 17:43:46 +03:00 committed by GitHub
commit bbfe74bf18
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 33 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
addons/default/visiosoft/advs-module/src/Adv/AdvModel.php
View File

@ -71,13 +71,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface
public function userAdv($nullable_ad = false, $checkRole = true) public function userAdv($nullable_ad = false, $checkRole = true)
{ {
if ($user = Auth::user() and $user->hasRole('admin') && $checkRole) {
return $this->getAdv(null, $nullable_ad);
} else {
return $this->getAdv(null, $nullable_ad) return $this->getAdv(null, $nullable_ad)
->where('advs_advs.created_by_id', Auth::id()); ->where('advs_advs.created_by_id', Auth::id());
} }
}
public function getAdvByCat($cat_id) public function getAdvByCat($cat_id)
{ {

8
addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php
View File

@ -75,16 +75,16 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface
if ($city) { if ($city) {
$query = $query->where('city', $city->id); $query = $query->where('city', $city->id);
} elseif (isset($param['city']) and !empty(array_filter($param['city']))) { } elseif (isset($param['city']) and !empty(array_filter($param['city']))) {
$query = $query->whereIn('city', $param['city']); $query = $query->whereIn('city', explode(',', array_first($param['city'])));
} }
if (isset($param['district']) and !empty(array_filter($param['district']))) { if (isset($param['district']) and !empty(array_filter($param['district']))) {
$query = $query->whereIn('district', $param['district']); $query = $query->whereIn('district', explode(',',array_first($param['district'])));
} }
if (isset($param['neighborhood']) and !empty(array_filter($param['neighborhood']))) { if (isset($param['neighborhood']) and !empty(array_filter($param['neighborhood']))) {
$query = $query->whereIn('neighborhood', $param['neighborhood']); $query = $query->whereIn('neighborhood', explode(',',array_first($param['neighborhood'])));
} }
if (isset($param['village']) and !empty(array_filter($param['village']))) { if (isset($param['village']) and !empty(array_filter($param['village']))) {
$query = $query->whereIn('village', $param['village']); $query = $query->whereIn('village', explode(',',array_first($param['village'])));
} }
} }
if ($category) { if ($category) {

5
addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php
View File

@ -43,6 +43,8 @@ class OptionConfigurationController extends PublicController
public function confAddCart() public function confAddCart()
{ {
if($conf = $this->optionConfigurationRepository->find($this->request->configuration)) if($conf = $this->optionConfigurationRepository->find($this->request->configuration))
{
if($conf->parent_adv->getStatus() == "approved")
{ {
$conf->name = $conf->getName(); $conf->name = $conf->getName();
@ -54,6 +56,9 @@ class OptionConfigurationController extends PublicController
return $this->redirect->to(route('visiosoft.module.carts::cart')); return $this->redirect->to(route('visiosoft.module.carts::cart'));
} }
} }
$this->messages->info(trans('visiosoft.module.advs::message.error_added_cart'));
return back();
}
} }
public function ajaxConfAddCart() public function ajaxConfAddCart()

2
addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
View File

@ -1229,7 +1229,7 @@ class AdvsController extends PublicController
$thisModel = new AdvModel(); $thisModel = new AdvModel();
$adv = $thisModel->isAdv($id); $adv = $thisModel->isAdv($id);
$response = array(); $response = array();
if ($adv) { if ($adv and $adv->getStatus() == "approved") {
$cart = $thisModel->addCart($adv, $quantity, $name); $cart = $thisModel->addCart($adv, $quantity, $name);
$response['status'] = "success"; $response['status'] = "success";
$count = $cart->getItems()->count; $count = $cart->getItems()->count;