From f30fb167054b7d2019303ed5016dbba5e9f65add Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 20 Jan 2021 18:05:42 +0300 Subject: [PATCH 1/6] #3126 alibaba-theme improvment "e.3" --- ...soft.module.advs__add_is-buying_fields.php | 25 +++++++++++++++++++ .../advs-module/src/Adv/AdvCriteria.php | 19 ++++++++++++++ .../advs-module/src/Adv/AdvModel.php | 1 + 3 files changed, 45 insertions(+) create mode 100644 addons/default/visiosoft/advs-module/migrations/2021_01_20_082123_visiosoft.module.advs__add_is-buying_fields.php diff --git a/addons/default/visiosoft/advs-module/migrations/2021_01_20_082123_visiosoft.module.advs__add_is-buying_fields.php b/addons/default/visiosoft/advs-module/migrations/2021_01_20_082123_visiosoft.module.advs__add_is-buying_fields.php new file mode 100644 index 000000000..5764620c0 --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2021_01_20_082123_visiosoft.module.advs__add_is-buying_fields.php @@ -0,0 +1,25 @@ + 'advs', + ]; + + protected $fields = [ + 'is_buying' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default' => false, + ] + ], + ]; + + protected $assignments = [ + 'is_buying' + ]; +} diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php index 6c62c79ae..6ebb52fe2 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -67,6 +67,25 @@ class AdvCriteria extends EntryCriteria return $ads; } + public function buyingLeads($status = null){ + $advModel = new AdvModel(); + $latest_advs = AdvModel::query() + ->whereDate('finish_at', '>=', date("Y-m-d H:i:s")) + ->where('status', '=', 'approved') + ->where('slug', '!=', '') + ->where('is_buying', ($status == 'buying' ? true : false)) + ->orderBy('publish_at', 'desc') + ->paginate($this->settings->value('streams::per_page')); + + + $ads = $advModel->getLocationNames($latest_advs); + foreach ($ads as $index => $ad) { + $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list'); + $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad); + } + return $ads; + } + public function allAdvs() { $advModel = new AdvModel(); diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index b501e7c76..5416c4d80 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -200,6 +200,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface if ($country != null) { $adv->setAttribute('country_name', $country->name); + $adv->setAttribute('country_abv', $country->abv); } if ($city != null) { $adv->setAttribute('city_name', $city->name); From 67ca4917bcfa79c15c79ed1f01a1f43d68b8bdd3 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 21 Jan 2021 13:36:34 +0300 Subject: [PATCH 2/6] #3126 alibaba-theme improvment "e.4" --- ...soft.module.advs__add_is-buying_fields.php | 25 ------------------- .../advs-module/src/Adv/AdvCriteria.php | 22 +++++++++++++--- 2 files changed, 19 insertions(+), 28 deletions(-) delete mode 100644 addons/default/visiosoft/advs-module/migrations/2021_01_20_082123_visiosoft.module.advs__add_is-buying_fields.php diff --git a/addons/default/visiosoft/advs-module/migrations/2021_01_20_082123_visiosoft.module.advs__add_is-buying_fields.php b/addons/default/visiosoft/advs-module/migrations/2021_01_20_082123_visiosoft.module.advs__add_is-buying_fields.php deleted file mode 100644 index 5764620c0..000000000 --- a/addons/default/visiosoft/advs-module/migrations/2021_01_20_082123_visiosoft.module.advs__add_is-buying_fields.php +++ /dev/null @@ -1,25 +0,0 @@ - 'advs', - ]; - - protected $fields = [ - 'is_buying' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default' => false, - ] - ], - ]; - - protected $assignments = [ - 'is_buying' - ]; -} diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php index 6ebb52fe2..1e624df4d 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -6,24 +6,33 @@ use Anomaly\Streams\Platform\Entry\EntryCriteria; use Anomaly\Streams\Platform\Image\Image; use Illuminate\Support\Facades\Auth; use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; +use Visiosoft\CustomfieldsModule\Cfvalue\CfvalueModel; +use Visiosoft\CustomfieldsModule\Cfvalue\Contract\CfvalueRepositoryInterface; use Visiosoft\RecentlyviewedadsModule\Recently\RecentlyModel; use Visiosoft\SubscriptionsModule\User\UserModel; +use Visiosoft\CustomfieldsModule\CustomField\Contract\CustomFieldRepositoryInterface; class AdvCriteria extends EntryCriteria { private $image; private $advRepository; + private $customFieldRepository; + private $cfvalueModel; public function __construct( SettingRepositoryInterface $repository, Image $image, - AdvRepositoryInterface $advRepository + AdvRepositoryInterface $advRepository, + CustomFieldRepositoryInterface $customFieldRepository, + CfvalueModel $cfvalueModel ) { $this->settings = $repository; $this->image = $image; $this->advRepository = $advRepository; + $this->customFieldRepository = $customFieldRepository; + $this->cfvalueModel = $cfvalueModel; } public function getAdvsModel() @@ -69,15 +78,22 @@ class AdvCriteria extends EntryCriteria public function buyingLeads($status = null){ $advModel = new AdvModel(); + + $customfields = $this->customFieldRepository->findBySlug('is_buying'); + $cfvalue = $this->cfvalueModel->where('custom_field_id', $customfields->id)->first(); + $latest_advs = AdvModel::query() ->whereDate('finish_at', '>=', date("Y-m-d H:i:s")) ->where('status', '=', 'approved') ->where('slug', '!=', '') - ->where('is_buying', ($status == 'buying' ? true : false)) + ->where(function ($query) use ($status, $customfields, $cfvalue) { + if ($status != null and $cfvalue->custom_field_value == 'Yes') { + $query->whereRaw('JSON_CONTAINS(cf_json, \'"' . $cfvalue->id . '"\', \'$.cf' . $customfields->id . '\')'); + } + }) ->orderBy('publish_at', 'desc') ->paginate($this->settings->value('streams::per_page')); - $ads = $advModel->getLocationNames($latest_advs); foreach ($ads as $index => $ad) { $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list'); From 662a9ac87b43a8afd0508797df1176970f236e7b Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 22 Jan 2021 12:02:24 +0300 Subject: [PATCH 3/6] alibaba-theme fixed for comment --- .../advs-module/src/Adv/AdvCriteria.php | 26 ------------------- 1 file changed, 26 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php index 1e624df4d..391d26bdc 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -76,32 +76,6 @@ class AdvCriteria extends EntryCriteria return $ads; } - public function buyingLeads($status = null){ - $advModel = new AdvModel(); - - $customfields = $this->customFieldRepository->findBySlug('is_buying'); - $cfvalue = $this->cfvalueModel->where('custom_field_id', $customfields->id)->first(); - - $latest_advs = AdvModel::query() - ->whereDate('finish_at', '>=', date("Y-m-d H:i:s")) - ->where('status', '=', 'approved') - ->where('slug', '!=', '') - ->where(function ($query) use ($status, $customfields, $cfvalue) { - if ($status != null and $cfvalue->custom_field_value == 'Yes') { - $query->whereRaw('JSON_CONTAINS(cf_json, \'"' . $cfvalue->id . '"\', \'$.cf' . $customfields->id . '\')'); - } - }) - ->orderBy('publish_at', 'desc') - ->paginate($this->settings->value('streams::per_page')); - - $ads = $advModel->getLocationNames($latest_advs); - foreach ($ads as $index => $ad) { - $ads[$index]->detail_url = $advModel->getAdvDetailLinkByModel($ad, 'list'); - $ads[$index] = $advModel->AddAdsDefaultCoverImage($ad); - } - return $ads; - } - public function allAdvs() { $advModel = new AdvModel(); From 86c513d7f9bd277490c37b407d310b7fa3162fb0 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 22 Jan 2021 14:22:10 +0300 Subject: [PATCH 4/6] alibaba-theme minor chanced --- .../default/visiosoft/advs-module/src/Adv/AdvCriteria.php | 6 ------ 1 file changed, 6 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php index 391d26bdc..517fb52e2 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -17,22 +17,16 @@ class AdvCriteria extends EntryCriteria private $image; private $advRepository; - private $customFieldRepository; - private $cfvalueModel; public function __construct( SettingRepositoryInterface $repository, Image $image, AdvRepositoryInterface $advRepository, - CustomFieldRepositoryInterface $customFieldRepository, - CfvalueModel $cfvalueModel ) { $this->settings = $repository; $this->image = $image; $this->advRepository = $advRepository; - $this->customFieldRepository = $customFieldRepository; - $this->cfvalueModel = $cfvalueModel; } public function getAdvsModel() From f53cababba7c74564b594f2d5f1cbc038f7251e3 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 22 Jan 2021 14:22:26 +0300 Subject: [PATCH 5/6] alibaba-theme minor chanced --- addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php index 517fb52e2..f2cc531c5 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -21,7 +21,7 @@ class AdvCriteria extends EntryCriteria public function __construct( SettingRepositoryInterface $repository, Image $image, - AdvRepositoryInterface $advRepository, + AdvRepositoryInterface $advRepository ) { $this->settings = $repository; From d6527ad25fa06e310046f33ffeeba6ace53a828c Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 22 Jan 2021 14:23:12 +0300 Subject: [PATCH 6/6] alibaba-theme minor chanced --- addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php | 3 --- 1 file changed, 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php index f2cc531c5..6c62c79ae 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -6,11 +6,8 @@ use Anomaly\Streams\Platform\Entry\EntryCriteria; use Anomaly\Streams\Platform\Image\Image; use Illuminate\Support\Facades\Auth; use Visiosoft\AdvsModule\Adv\Contract\AdvRepositoryInterface; -use Visiosoft\CustomfieldsModule\Cfvalue\CfvalueModel; -use Visiosoft\CustomfieldsModule\Cfvalue\Contract\CfvalueRepositoryInterface; use Visiosoft\RecentlyviewedadsModule\Recently\RecentlyModel; use Visiosoft\SubscriptionsModule\User\UserModel; -use Visiosoft\CustomfieldsModule\CustomField\Contract\CustomFieldRepositoryInterface; class AdvCriteria extends EntryCriteria {