From 7ce27aa33b5501ab40c9c7989c7aecb2c3024edc Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 31 Dec 2020 17:58:20 +0300 Subject: [PATCH 1/3] getcfo completed mizan --- .../advs-module/src/AdvsModulePlugin.php | 18 ++++++++++++++++++ 1 file changed, 18 insertions(+) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php index 947630c53..2005dd80e 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php @@ -120,4 +120,22 @@ class AdvsModulePlugin extends Plugin ), ]; } + + /** + * Get the filters. + * + * @return array + */ + public function getFilters() + { + return [ + new \Twig_SimpleFilter( + 'ksort', + function (array $array) { + ksort($array); + return $array; + } + ), + ]; + } } From 4d64d281eaa69b8465ddb81ecddedaec93c05faa Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 4 Jan 2021 10:39:11 +0300 Subject: [PATCH 2/3] move seeder --- .../profile-module/src/ProfileModuleSeeder.php | 16 ---------------- database/seeds/DatabaseSeeder.php | 18 ++++++++++++++++++ 2 files changed, 18 insertions(+), 16 deletions(-) diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php index 158ad05c8..50e69cfe6 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php @@ -43,21 +43,5 @@ class ProfileModuleSeeder extends Seeder { // Users Fields Seeder $this->call(UsersFieldsSeeder::class); - - if (is_null($this->folders->findBy('slug', 'favicon'))) { - $disk = $this->disks->findBySlug('local'); - - $this->folders->create([ - 'en' => [ - 'name' => 'Favicon', - 'description' => 'A folder for Favicon.', - ], - 'slug' => 'favicon', - 'disk' => $disk, - 'allowed_types' => [ - 'ico','png', - ], - ]); - }; } } \ No newline at end of file diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index b90ff0f09..f9a9d30db 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -156,5 +156,23 @@ class DatabaseSeeder extends Seeder ], ]); } + + + //Favicon Folder + if (is_null($this->folders->findBy('slug', 'favicon'))) { + $disk = $this->disks->findBySlug('local'); + + $this->folders->create([ + 'en' => [ + 'name' => 'Favicon', + 'description' => 'A folder for Favicon.', + ], + 'slug' => 'favicon', + 'disk' => $disk, + 'allowed_types' => [ + 'ico','png', + ], + ]); + }; } } From fdb162fdc787940c7105dccfbff22627065c394e Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 4 Jan 2021 17:10:03 +0300 Subject: [PATCH 3/3] fixed convert currency response message --- .../advs-module/src/Adv/AdvModel.php | 22 +++++++++----- .../advs-module/src/Adv/AdvRepository.php | 30 +++++++++++-------- .../src/Adv/Table/Handler/ConvertCurrency.php | 4 ++- 3 files changed, 36 insertions(+), 20 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index d6bbfe168..b501e7c76 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -1,9 +1,9 @@ value('visiosoft.module.advs::free_currencyconverterapi_key'); - $response = $client->get('http://free.currencyconverterapi.com/api/v6/convert?q=' - . $url . '&compact=y&apiKey=' . $freeCurrencyKey); + + $client = new \GuzzleHttp\Client(); + $response = $client->request('GET', 'http://free.currencyconverterapi.com/api/v6/convert', ['query' => [ + 'q' => $url, + 'compact' => 'y', + 'apiKey' => $freeCurrencyKey + ]]); + if ($response->getStatusCode() == '200') { $response = (array)\GuzzleHttp\json_decode($response->getBody()->getContents()); if (!empty($response)) { @@ -132,8 +137,11 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface $foreign_currency[$currencyIn] = $price * $rate; } } - } catch (\Exception $e) { - $this->messages->error((!is_null($e->getMessage())) ? $e->getMessage() : trans('streams::error.500.message')); + } catch (\GuzzleHttp\Exception\ClientException $e) { + $response = $e->getResponse(); + $responseBodyAsString = $response->getBody()->getContents(); + $response = json_decode($responseBodyAsString, true); + $messages->error($response['error']); } } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index b39827ea4..0970d1336 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -102,20 +102,26 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface if (!empty($param['user'])) { $query = $query->where('advs_advs.created_by_id', $param['user']); } + $currency = setting_value('streams::currency'); + if (!empty($param['currency'])) { - if (!empty($param['min_price'])) { - $num = $param['min_price']; - $int = (int)$num; - $column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') >=" . $int; - $query = $query->whereRaw($column); - } - if (!empty($param['max_price'])) { - $num = $param['max_price']; - $int = (int)$num; - $column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') <=" . $int; - $query = $query->whereRaw($column); - } + $currency = $param['currency']; } + + if (!empty($param['min_price'])) { + $num = $param['min_price']; + $int = (int)$num; + $column = "JSON_EXTRACT(foreign_currencies, '$." . $currency . "') >= " . $int; + $query = $query->whereRaw($column); + } + + if (!empty($param['max_price'])) { + $num = $param['max_price']; + $int = (int)$num; + $column = "JSON_EXTRACT(foreign_currencies, '$." . $currency . "') <= " . $int; + $query = $query->whereRaw($column); + } + if (!empty($param['date'])) { if ($param['date'] === 'day') { $query = $query->where('advs_advs.publish_at', '>=', Carbon::now()->subDay()); diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php b/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php index 6c0e47ff3..c9fc56ce5 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php @@ -13,7 +13,9 @@ class ConvertCurrency extends ActionHandler foreach ($selected as $id) { $entry = $model->newQuery()->find($id); - $model->foreignCurrency($entry->currency, $entry->price, $id, $settingRepository); + if ($entry) { + $model->foreignCurrency($entry->currency, $entry->price, $id, $settingRepository); + } } if ($selected) { $this->messages->success(trans('visiosoft.module.advs::message.currency_converted'));