From a15302457e3df6186082259e16ecac679791aa03 Mon Sep 17 00:00:00 2001 From: example Date: Fri, 8 May 2020 16:17:00 +0300 Subject: [PATCH 1/2] function-currency-TL --- .../advs-module/src/AdvsModulePlugin.php | 7 ++++ .../src/Currency/CurrencyFormat.php | 42 +++++++++++++++++++ 2 files changed, 49 insertions(+) create mode 100644 addons/default/visiosoft/advs-module/src/Currency/CurrencyFormat.php diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php index da7789d85..be50a339d 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php @@ -5,6 +5,8 @@ use Visiosoft\AdvsModule\Adv\Command\appendRequestURL; use Visiosoft\AdvsModule\Adv\Command\GetAd; use Visiosoft\AdvsModule\Adv\Command\isActive; use Visiosoft\AdvsModule\Adv\Command\LatestAds; +use Visiosoft\AdvsModule\Currency\Currency; +use Visiosoft\AdvsModule\Currency\CurrencyFormat; class AdvsModulePlugin extends Plugin { @@ -25,6 +27,11 @@ class AdvsModulePlugin extends Plugin return $ad; } + ), new \Twig_SimpleFunction( + 'currencyFormat', + function ($number, $currency = null, array $options = []) { + return app(CurrencyFormat::class)->format($number, $currency, $options); + } ), new \Twig_SimpleFunction( 'isActive', function ($name, $type = 'module', $project = 'visiosoft') { diff --git a/addons/default/visiosoft/advs-module/src/Currency/CurrencyFormat.php b/addons/default/visiosoft/advs-module/src/Currency/CurrencyFormat.php new file mode 100644 index 000000000..4c13ec7da --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Currency/CurrencyFormat.php @@ -0,0 +1,42 @@ +symbol($currency); + } else { + $suffix = app(Currency::class)->symbol($currency); + } + return $prefix . number_format(($number * 100) / 100, $decimals, $point, $separator) . $suffix; + } +} From aca805c0febf5f9f73428f69aa84aa19634bad5e Mon Sep 17 00:00:00 2001 From: "vedat@vebze.com" Date: Mon, 11 May 2020 13:28:53 +0300 Subject: [PATCH 2/2] #1339 remove ad limit for core --- .../resources/config/settings/sections.php | 1 - .../resources/config/settings/settings.php | 9 ---- .../advs-module/resources/lang/en/message.php | 1 - .../advs-module/resources/lang/en/setting.php | 3 -- .../advs-module/resources/lang/tr/setting.php | 3 -- .../src/Http/Controller/advsController.php | 43 ++++++------------- 6 files changed, 12 insertions(+), 48 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php index ec5826d04..36dd048fe 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -23,7 +23,6 @@ return [ 'auto_approve', 'estimated_pending_time', 'default_published_time', - 'default_adv_limit', 'default_GET', 'thumbnail_width', 'thumbnail_height', diff --git a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php index 77628ef40..ed8b2e4a9 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -50,15 +50,6 @@ return [ 'default_value' => 10, ], ], - 'default_adv_limit' => [ - 'type' => 'anomaly.field_type.integer', - 'bind' => 'adv.default_adv_limit', - 'env' => 'ADV_LIMIT', - 'required' => true, - 'config' => [ - 'default_value' => 15, - ], - ], 'iban_numbers' => [ 'type' => 'anomaly.field_type.wysiwyg', diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/message.php b/addons/default/visiosoft/advs-module/resources/lang/en/message.php index 128c6171a..bd0868e39 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php @@ -2,7 +2,6 @@ return [ 'error_added_cart' => 'Requested product is currently missing or inactive', - 'please_buy_package' => 'Please buy package', 'please_payment' => 'Please Pay', 'bank_account_info' => 'Bank account information', 'agreement' => 'By clicking Post, you agree to our Terms of Use and Privacy Policy acknowledge that you are the rightful owner of this item.', diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php index 6c41b6a08..ad787722f 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -18,9 +18,6 @@ return [ 'default_published_time' => [ 'name' => 'Default Publish Time', ], - 'default_adv_limit' => [ - 'name' => 'Default Ads Limit', - ], 'address' => [ 'name' => 'Contact Adress', ], diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php index d85e6a84f..d8924614a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -18,9 +18,6 @@ return [ 'default_published_time' => [ 'name' => 'Varsayılan Yayın Süresi', ], - 'default_adv_limit' => [ - 'name' => 'Varsayılan İlan Sınırı', - ], 'address' => [ 'name' => 'İletişim Adresiniz', ], diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php index 4149e8be5..28d7c4c97 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -469,24 +469,14 @@ class AdvsController extends PublicController public function getCatsForNewAd($id) { - $cats = $this->getCats($id); - $count_user_ads = count($this->adv_model->userAdv()->get()); - if (empty($cats->toArray())) { - $cats = trans('visiosoft.module.advs::message.create_ad_with_post_cat'); + if ($this->adv_model->is_enabled('packages')) { + $cats = app('Visiosoft\PackagesModule\Http\Controller\PackageFEController')->AdLimitForCategorySelection($id); + } else { + $cats = $this->getCats($id); - if (setting_value('visiosoft.module.advs::default_adv_limit') <= $count_user_ads) { - if ($this->adv_model->is_enabled('packages')) { - $packageModel = new PackageModel(); - $parent_cat = $this->category_model->getParentCats($id, 'parent_id'); - $package = $packageModel->reduceLimit($parent_cat); - if ($package != null) { - return $package; - } - } else { - $msg = trans('visiosoft.module.advs::message.max_ad_limit'); - return $msg; - } + if (empty($cats->toArray())) { + $cats = trans('visiosoft.module.advs::message.create_ad_with_post_cat'); } } return $cats; @@ -547,21 +537,12 @@ class AdvsController extends PublicController /* Update Adv */ $adv = AdvsAdvsEntryModel::find($request->update_id); - $count_user_ads = count($this->adv_model->userAdv()->get()); - - if (setting_value('visiosoft.module.advs::default_adv_limit') < $count_user_ads) { - if ($advModel->is_enabled('packages') and $adv->slug == "") { - $parent_cat = $categoryModel->getParentCats($request->cat1, 'parent_id'); - $packageModel = new PackageModel(); - $package = $packageModel->reduceLimit($parent_cat, 'reduce'); - if ($package != null) { - $this->messages->error(trans('visiosoft.module.advs::message.please_buy_package')); - return redirect('/'); - } - } elseif ($adv->slug == '') { - $this->messages->error(trans('visiosoft.module.advs::message.max_ad_limit.title')); - return redirect('/'); - } + if ($advModel->is_enabled('packages') and $adv->slug == "") { + $cat = app('Visiosoft\PackagesModule\Http\Controller\PackageFEController')->AdLimitForNewAd($request); + if(!is_null($cat)) + { + return redirect('/'); + } } $adv->is_get_adv = $request->is_get_adv;