From 3ce17fbfd2799e61c0bf58c4fd267c8a60f16172 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 8 Mar 2021 11:56:03 +0300 Subject: [PATCH 01/33] trans fixes --- .../resources/lang/en/field.php | 10 +++++ .../resources/lang/nl/field.php | 2 +- .../src/Seed/UsersFieldsSeeder.php | 42 +++++++++---------- 3 files changed, 32 insertions(+), 22 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/lang/en/field.php b/addons/default/visiosoft/profile-module/resources/lang/en/field.php index b914bb360..8bf5e6803 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/en/field.php @@ -484,4 +484,14 @@ return [ 'education_part' => [ 'name' => 'State of Education' ], + + 'notified_new_updates' => [ + 'name' => 'Notified New Updates', + ], + 'notified_about_ads' => [ + 'name' => 'Notified About Ads', + ], + 'receive_messages_email' => [ + 'name' => 'Receive Messages Email', + ], ]; diff --git a/addons/default/visiosoft/profile-module/resources/lang/nl/field.php b/addons/default/visiosoft/profile-module/resources/lang/nl/field.php index 730aabeb3..436e726d4 100644 --- a/addons/default/visiosoft/profile-module/resources/lang/nl/field.php +++ b/addons/default/visiosoft/profile-module/resources/lang/nl/field.php @@ -2,7 +2,7 @@ return [ 'file' => [ - 'name' => 'foto\\'s' + 'name' => 'foto\'s' ], 'first_name' => [ 'name' => 'Voornaam' diff --git a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php index 497108c1e..c4ec98c9b 100644 --- a/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php +++ b/addons/default/visiosoft/profile-module/src/Seed/UsersFieldsSeeder.php @@ -20,7 +20,7 @@ class UsersFieldsSeeder extends Seeder $customFields = [ [ - 'name' => 'File', + 'name' => 'visiosoft.module.profile::field.file.name', 'slug' => 'file', 'type' => 'visiosoft.field_type.singlefile', 'config' => [ @@ -29,7 +29,7 @@ class UsersFieldsSeeder extends Seeder ] ], [ - 'name' => 'Country', + 'name' => 'visiosoft.module.profile::field.country.name', 'slug' => 'country', 'type' => 'anomaly.field_type.relationship', 'config' => [ @@ -38,42 +38,42 @@ class UsersFieldsSeeder extends Seeder ], ], [ - 'name' => 'City', + 'name' => 'visiosoft.module.profile::field.city.name', 'slug' => 'city', 'type' => 'anomaly.field_type.select', ], [ - 'name' => 'District', + 'name' => 'visiosoft.module.profile::field.district.name', 'slug' => 'district', 'type' => 'anomaly.field_type.select', ], [ - 'name' => 'Neighborhood', + 'name' => 'visiosoft.module.profile::field.neighborhood.name', 'slug' => 'neighborhood', 'type' => 'anomaly.field_type.select', ], [ - 'name' => 'Village', + 'name' => 'visiosoft.module.profile::field.village.name', 'slug' => 'village', 'type' => 'anomaly.field_type.select', ], [ - 'name' => 'Gsm Phone', + 'name' => 'visiosoft.module.profile::field.gsm_phone.name', 'slug' => 'gsm_phone', 'type' => 'anomaly.field_type.text', ], [ - 'name' => 'Land Phone', + 'name' => 'visiosoft.module.profile::field.land_phone.name', 'slug' => 'land_phone', 'type' => 'anomaly.field_type.text', ], [ - 'name' => 'Office Phone', + 'name' => 'visiosoft.module.profile::field.office_phone.name', 'slug' => 'office_phone', 'type' => 'anomaly.field_type.text', ], [ - 'name' => 'Register Type', + 'name' => 'visiosoft.module.profile::field.register_type.name', 'slug' => 'register_type', 'type' => 'anomaly.field_type.select', "config" => [ @@ -81,12 +81,12 @@ class UsersFieldsSeeder extends Seeder ] ], [ - 'name' => 'Identification Number', + 'name' => 'visiosoft.module.profile::field.identification_number.name', 'slug' => 'identification_number', 'type' => 'anomaly.field_type.text', ], [ - 'name' => 'Notified New Updates', + 'name' => 'visiosoft.module.profile::field.notified_new_updates.name', 'slug' => 'notified_new_updates', 'type' => 'anomaly.field_type.select', 'config' => [ @@ -96,7 +96,7 @@ class UsersFieldsSeeder extends Seeder ] ], [ - 'name' => 'Notified About Ads', + 'name' => 'visiosoft.module.profile::field.notified_about_ads.name', 'slug' => 'notified_about_ads', 'type' => 'anomaly.field_type.select', 'config' => [ @@ -106,7 +106,7 @@ class UsersFieldsSeeder extends Seeder ] ], [ - 'name' => 'Receive Messages Email', + 'name' => 'visiosoft.module.profile::field.receive_messages_email.name', 'slug' => 'receive_messages_email', 'type' => 'anomaly.field_type.select', 'config' => [ @@ -116,7 +116,7 @@ class UsersFieldsSeeder extends Seeder ] ], [ - 'name' => trans('visiosoft.module.profile::field.birthday.name'), + 'name' => 'visiosoft.module.profile::field.birthday.name', 'slug' => 'birthday', 'type' => 'anomaly.field_type.datetime', 'config' => [ @@ -125,32 +125,32 @@ class UsersFieldsSeeder extends Seeder ] ], [ - 'name' => trans('visiosoft.module.profile::field.education.name'), + 'name' => 'visiosoft.module.profile::field.education.name', 'slug' => 'education', 'type' => 'anomaly.field_type.text', ], [ - 'name' => trans('visiosoft.module.profile::field.state_of_education.name'), + 'name' => 'visiosoft.module.profile::field.state_of_education.name', 'slug' => 'state_of_education', 'type' => 'anomaly.field_type.text', ], [ - 'name' => trans('visiosoft.module.profile::field.profession.name'), + 'name' => 'visiosoft.module.profile::field.profession.name', 'slug' => 'profession', 'type' => 'anomaly.field_type.select', ], [ - 'name' => trans('visiosoft.module.profile::field.education_part.name'), + 'name' => 'visiosoft.module.profile::field.education_part.name', 'slug' => 'education_part', 'type' => 'anomaly.field_type.select', ], [ - 'name' => trans('visiosoft.module.profile::field.facebook_address.name'), + 'name' => 'visiosoft.module.profile::field.facebook_address.name', 'slug' => 'facebook_address', 'type' => 'anomaly.field_type.text', ], [ - 'name' => trans('visiosoft.module.profile::field.google_address.name'), + 'name' => 'visiosoft.module.profile::field.google_address.name', 'slug' => 'google_address', 'type' => 'anomaly.field_type.text', ] From 67673b29d5746c54bbc0592c97def523acdb8d95 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 9 Mar 2021 11:26:21 +0300 Subject: [PATCH 02/33] #3283 added theme settings in left navigation --- app/Providers/AppServiceProvider.php | 31 ++++++++++++++++++++++------ 1 file changed, 25 insertions(+), 6 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c98476533..c0e457ef1 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -2,6 +2,8 @@ namespace App\Providers; +use Anomaly\Streams\Platform\Ui\ControlPanel\Component\Navigation\NavigationFactory; +use Anomaly\Streams\Platform\Ui\ControlPanel\ControlPanelBuilder; use Illuminate\Support\ServiceProvider; class AppServiceProvider extends ServiceProvider @@ -12,15 +14,15 @@ class AppServiceProvider extends ServiceProvider * * @return void */ - public function boot() + public function boot(ControlPanelBuilder $builder, NavigationFactory $factory) { - view()->composer('*', function ($view) { + view()->composer('*', function ($view) use ($builder, $factory) { //Hidden menu items in sidebar on dashboard if (auth()->check() and template()->get('cp')) { - $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.variables')) ? $navigation->setClass('hidden') : false; - $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.system')) ? $navigation->setClass('hidden') : false; - $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.redirects')) ? $navigation->setClass('hidden') : false; - $is_hidden = ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.repeaters')) ? $navigation->setClass('hidden') : false; + ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.variables')) ? $navigation->setClass('hidden') : false; + ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.system')) ? $navigation->setClass('hidden') : false; + ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.redirects')) ? $navigation->setClass('hidden') : false; + ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.repeaters')) ? $navigation->setClass('hidden') : false; } //Auto Language Switcher if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { @@ -30,6 +32,23 @@ class AppServiceProvider extends ServiceProvider App()->setLocale($lang); Request()->session()->put('_locale', $lang); } + + $newNavigations = [ + [ + 'slug' => setting_value("streams::standard_theme"), + 'icon' => 'fa fa-pencil-square-o', + 'title' => 'visiosoft.theme.defaultadmin::section.theme_settings.name', + 'attributes' => [ + 'href' => url("admin/settings/themes/" . setting_value("streams::standard_theme")) + ] + ] + ]; + $cp = $builder->getControlPanel(); + foreach ($newNavigations as $newNavigation) { + if (!template()->get('cp')->getNavigation()->get($newNavigation['slug'])){ + $cp->addNavigationLink($factory->make($newNavigation)); + } + } }); } From 9136b20a4f70b441ae853b6286f359b4477fa83b Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 9 Mar 2021 12:03:19 +0300 Subject: [PATCH 03/33] #3283 added theme settings in left navigation --- app/Providers/AppServiceProvider.php | 40 +++++++++++++++------------- 1 file changed, 21 insertions(+), 19 deletions(-) diff --git a/app/Providers/AppServiceProvider.php b/app/Providers/AppServiceProvider.php index c0e457ef1..cf87ee4f4 100644 --- a/app/Providers/AppServiceProvider.php +++ b/app/Providers/AppServiceProvider.php @@ -17,12 +17,31 @@ class AppServiceProvider extends ServiceProvider public function boot(ControlPanelBuilder $builder, NavigationFactory $factory) { view()->composer('*', function ($view) use ($builder, $factory) { - //Hidden menu items in sidebar on dashboard + if (auth()->check() and template()->get('cp')) { - ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.variables')) ? $navigation->setClass('hidden') : false; + //Hidden menu items in sidebar on dashboard + ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.variables')) ? $navigation->setClass('hidden') : false; ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.system')) ? $navigation->setClass('hidden') : false; ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.redirects')) ? $navigation->setClass('hidden') : false; ($navigation = template()->get('cp')->getNavigation()->get('anomaly.module.repeaters')) ? $navigation->setClass('hidden') : false; + + // Add new menu items in sidebar on dashboard + $newNavigations = [ + [ + 'slug' => setting_value("streams::standard_theme"), + 'icon' => 'fa fa-pencil-square-o', + 'title' => 'visiosoft.theme.defaultadmin::section.theme_settings.name', + 'attributes' => [ + 'href' => url("admin/settings/themes/" . setting_value("streams::standard_theme")) + ] + ] + ]; + $cp = $builder->getControlPanel(); + foreach ($newNavigations as $newNavigation) { + if (!template()->get('cp')->getNavigation()->get($newNavigation['slug'])){ + $cp->addNavigationLink($factory->make($newNavigation)); + } + } } //Auto Language Switcher if (config('advs.lang_switcher_for_browser') and is_null(Request()->session()->get('_locale')) and isset($_SERVER['HTTP_ACCEPT_LANGUAGE'])) { @@ -32,23 +51,6 @@ class AppServiceProvider extends ServiceProvider App()->setLocale($lang); Request()->session()->put('_locale', $lang); } - - $newNavigations = [ - [ - 'slug' => setting_value("streams::standard_theme"), - 'icon' => 'fa fa-pencil-square-o', - 'title' => 'visiosoft.theme.defaultadmin::section.theme_settings.name', - 'attributes' => [ - 'href' => url("admin/settings/themes/" . setting_value("streams::standard_theme")) - ] - ] - ]; - $cp = $builder->getControlPanel(); - foreach ($newNavigations as $newNavigation) { - if (!template()->get('cp')->getNavigation()->get($newNavigation['slug'])){ - $cp->addNavigationLink($factory->make($newNavigation)); - } - } }); } From ad827b14816bbd8a64e884a754f2f327ffb9a780 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 9 Mar 2021 12:05:23 +0300 Subject: [PATCH 04/33] #3283 remove placeholder on category --- .../visiosoft/cats-module/src/CatsModule.php | 5 -- .../cats-module/src/CatsModuleSeeder.php | 3 +- .../src/CatsModuleServiceProvider.php | 14 ---- .../Admin/PlaceholderforsearchController.php | 43 ------------ .../PlaceholderforsearchInterface.php | 8 --- ...laceholderforsearchRepositoryInterface.php | 8 --- .../Form/PlaceholderforsearchFormBuilder.php | 66 ------------------- .../PlaceholderforsearchCollection.php | 8 --- .../PlaceholderforsearchCriteria.php | 8 --- .../PlaceholderforsearchModel.php | 9 --- .../PlaceholderforsearchObserver.php | 8 --- .../PlaceholderforsearchPresenter.php | 8 --- .../PlaceholderforsearchRepository.php | 25 ------- .../PlaceholderforsearchRouter.php | 8 --- .../PlaceholderforsearchSeeder.php | 49 -------------- .../PlaceholderforsearchTableBuilder.php | 61 ----------------- 16 files changed, 1 insertion(+), 330 deletions(-) delete mode 100644 addons/default/visiosoft/cats-module/src/Http/Controller/Admin/PlaceholderforsearchController.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchInterface.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchRepositoryInterface.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Form/PlaceholderforsearchFormBuilder.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchCollection.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchCriteria.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchModel.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchObserver.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchPresenter.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRepository.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRouter.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchSeeder.php delete mode 100644 addons/default/visiosoft/cats-module/src/Placeholderforsearch/Table/PlaceholderforsearchTableBuilder.php diff --git a/addons/default/visiosoft/cats-module/src/CatsModule.php b/addons/default/visiosoft/cats-module/src/CatsModule.php index 58af83cd1..497cfa1e2 100644 --- a/addons/default/visiosoft/cats-module/src/CatsModule.php +++ b/addons/default/visiosoft/cats-module/src/CatsModule.php @@ -30,11 +30,6 @@ class CatsModule extends Module 'new_category', ], ], - 'placeholderforsearch' => [ - 'buttons' => [ - 'new_placeholderforsearch', - ], - ], ]; } diff --git a/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php b/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php index 671d997f4..bd5ebd408 100644 --- a/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php +++ b/addons/default/visiosoft/cats-module/src/CatsModuleSeeder.php @@ -1,7 +1,6 @@ call(PlaceholderforsearchSeeder::class); + // } } \ No newline at end of file diff --git a/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php b/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php index 9a7ecebf9..e083237e0 100644 --- a/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php +++ b/addons/default/visiosoft/cats-module/src/CatsModuleServiceProvider.php @@ -1,10 +1,6 @@ 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@cleanSubcats', - 'admin/cats/placeholderforsearch' => 'Visiosoft\CatsModule\Http\Controller\Admin\PlaceholderforsearchController@index', - 'admin/cats/placeholderforsearch/create' => 'Visiosoft\CatsModule\Http\Controller\Admin\PlaceholderforsearchController@create', - 'admin/cats/placeholderforsearch/edit/{id}' => 'Visiosoft\CatsModule\Http\Controller\Admin\PlaceholderforsearchController@edit', 'admin/cats' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@index', 'admin/cats/create' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@create', 'admin/cats/edit/{id}' => 'Visiosoft\CatsModule\Http\Controller\Admin\CategoryController@edit', @@ -117,7 +110,6 @@ class CatsModuleServiceProvider extends AddonServiceProvider * @type array|null */ protected $bindings = [ - CatsPlaceholderforsearchEntryModel::class => PlaceholderforsearchModel::class, CatsCategoryEntryModel::class => CategoryModel::class, ]; @@ -127,7 +119,6 @@ class CatsModuleServiceProvider extends AddonServiceProvider * @type array|null */ protected $singletons = [ - PlaceholderforsearchRepositoryInterface::class => PlaceholderforsearchRepository::class, CategoryRepositoryInterface::class => CategoryRepository::class, ]; @@ -203,11 +194,6 @@ class CatsModuleServiceProvider extends AddonServiceProvider ], ], ], - 'placeholderforsearch' => [ - 'buttons' => [ - 'new_placeholderforsearch', - ], - ], ]; $this->addon->setSections($sections); } diff --git a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/PlaceholderforsearchController.php b/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/PlaceholderforsearchController.php deleted file mode 100644 index dee51c2ec..000000000 --- a/addons/default/visiosoft/cats-module/src/Http/Controller/Admin/PlaceholderforsearchController.php +++ /dev/null @@ -1,43 +0,0 @@ -render(); - } - - /** - * Create a new entry. - * - * @param PlaceholderforsearchFormBuilder $form - * @return \Symfony\Component\HttpFoundation\Response - */ - public function create(PlaceholderforsearchFormBuilder $form) - { - return $form->render(); - } - - /** - * Edit an existing entry. - * - * @param PlaceholderforsearchFormBuilder $form - * @param $id - * @return \Symfony\Component\HttpFoundation\Response - */ - public function edit(PlaceholderforsearchFormBuilder $form, $id) - { - return $form->render($id); - } -} diff --git a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchInterface.php b/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchInterface.php deleted file mode 100644 index b6c652c90..000000000 --- a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Contract/PlaceholderforsearchInterface.php +++ /dev/null @@ -1,8 +0,0 @@ -model = $model; - } -} diff --git a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRouter.php b/addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRouter.php deleted file mode 100644 index 5eb70879d..000000000 --- a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/PlaceholderforsearchRouter.php +++ /dev/null @@ -1,8 +0,0 @@ -truncate(); - DB::table('cats_placeholderforsearch_translations')->truncate(); - PlaceholderforsearchModel::create([ - 'en' => [ - 'name' => 'Chevrolet Camaro' - ], - 'tr' => [ - 'name' => 'Chevrolet Camaro' - ] - ]); - PlaceholderforsearchModel::create([ - 'en' => [ - 'name' => 'Xiaomi Black Shark 128 GB' - ], - 'tr' => [ - 'name' => 'Xiaomi Black Shark 128 GB' - ] - ]); - PlaceholderforsearchModel::create([ - 'en' => [ - 'name' => 'Apple MacBook Pro' - ], - 'tr' => [ - 'name' => 'Apple MacBook Pro' - ] - ]); - PlaceholderforsearchModel::create([ - 'en' => [ - 'name' => 'Make your search now' - ], - 'tr' => [ - 'name' => 'Make your search now' - ] - ]); - } -} diff --git a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Table/PlaceholderforsearchTableBuilder.php b/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Table/PlaceholderforsearchTableBuilder.php deleted file mode 100644 index 0391b56a7..000000000 --- a/addons/default/visiosoft/cats-module/src/Placeholderforsearch/Table/PlaceholderforsearchTableBuilder.php +++ /dev/null @@ -1,61 +0,0 @@ - Date: Tue, 9 Mar 2021 17:36:56 +0300 Subject: [PATCH 05/33] #3515 emlaktown-theme dark mode color add --- .../resources/assets/css/profile-nav.scss | 2 +- .../profile-module/resources/views/profile/index.twig | 2 +- .../resources/views/profile/partials/navigation.twig | 10 +++++----- 3 files changed, 7 insertions(+), 7 deletions(-) diff --git a/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss b/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss index 4fbfa1010..23affb0bd 100644 --- a/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss +++ b/addons/default/visiosoft/profile-module/resources/assets/css/profile-nav.scss @@ -62,7 +62,7 @@ } } - img { + svg { margin-right: .75rem; width: 1.5rem; height: 1.5rem; diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/index.twig b/addons/default/visiosoft/profile-module/resources/views/profile/index.twig index 2d5fd3fe5..7d48583db 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/index.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/index.twig @@ -2,7 +2,7 @@ {{ asset_style("visiosoft.module.profile::assets/css/profile-nav.scss") }} {% endblock %} -
+
{% include "visiosoft.module.profile::profile/partials/navigation" %} diff --git a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig index 5c38fe95f..29b052248 100644 --- a/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig +++ b/addons/default/visiosoft/profile-module/resources/views/profile/partials/navigation.twig @@ -4,26 +4,26 @@
From 07125687a45c3ef864a59a1a3e846f58cd0eac78 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 10 Mar 2021 10:09:46 +0300 Subject: [PATCH 06/33] #3238 Store user info for demo --- .../resources/views/addons/anomaly/users-module/login.twig | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig index e3857e4cf..8d05f6bd1 100644 --- a/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig +++ b/addons/default/visiosoft/base-theme/resources/views/addons/anomaly/users-module/login.twig @@ -29,7 +29,7 @@
{{ form.fields.email.setAttributes({ 'class': phoneLogin ? 'form-control phone' : 'form-control' - }).input|raw }} + }).setValue(app.request.get('username')).input|raw }}
@@ -53,7 +53,7 @@
- {{ form.fields.password.input|raw }} + {{ form.fields.password.setValue(app.request.get('password')).input|raw }}
From d707ae24a51207c2740a3fda823f0ebf6d2d58fb Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 10 Mar 2021 11:22:44 +0300 Subject: [PATCH 07/33] fixed error --- .../advs-module/resources/views/list/partials/price-filter.twig | 1 - 1 file changed, 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig index 4939f0fd1..180820296 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig @@ -41,5 +41,4 @@ - {{ asset_script('visiosoft.module.advs::js/currency_format.js') }} {% endif %} \ No newline at end of file From a4f58f0a8d4c96366c5f2db876e69204735a0ca5 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 10 Mar 2021 11:31:23 +0300 Subject: [PATCH 08/33] remove --- .../MultipleFieldType/LookupTableBuilder.php | 10 ---------- .../MultipleFieldType/SelectedTableBuilder.php | 13 ------------- .../Support/MultipleFieldType/ValueTableBuilder.php | 13 ------------- 3 files changed, 36 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php index 168217fd7..6d8baa6f3 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/LookupTableBuilder.php @@ -1,19 +1,9 @@ - * @author Ryan Thompson - */ class LookupTableBuilder extends \Anomaly\MultipleFieldType\Table\LookupTableBuilder { public function __construct(Table $table,ValueTableBuilder $valueTableBuilder) diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php index dccc81c96..99b456683 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/SelectedTableBuilder.php @@ -1,20 +1,7 @@ - * @author Ryan Thompson - */ class SelectedTableBuilder extends \Anomaly\MultipleFieldType\Table\SelectedTableBuilder { - - /** - * The table columns. - * - * @var array - */ protected $columns = [ 'name', 'product_option' ]; diff --git a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php index b9a42c19b..0fa7cf397 100644 --- a/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/ProductoptionsValue/Support/MultipleFieldType/ValueTableBuilder.php @@ -1,20 +1,7 @@ - * @author Ryan Thompson - */ class ValueTableBuilder extends \Anomaly\MultipleFieldType\Table\ValueTableBuilder { - - /** - * The table columns. - * - * @var array - */ protected $columns = [ 'name', 'product_option' ]; From 2e07a12e6fd1133cabf64f6e8f5b81d79bf7d6de Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 10 Mar 2021 16:37:35 +0300 Subject: [PATCH 09/33] fixed currency_format default currency --- .../visiosoft/advs-module/src/Support/Command/Currency.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Support/Command/Currency.php b/addons/default/visiosoft/advs-module/src/Support/Command/Currency.php index 12dfebc50..d7c2ac70f 100644 --- a/addons/default/visiosoft/advs-module/src/Support/Command/Currency.php +++ b/addons/default/visiosoft/advs-module/src/Support/Command/Currency.php @@ -5,7 +5,7 @@ class Currency public function format($number, $currency = null, array $options = []) { - $currency = strtoupper($currency ?: config('streams::currencies.default')); + $currency = strtoupper($currency ?: setting_value('streams::currency')); $direction = array_get( $options, From ecb9483a4dedd49b4e223845603c001fec684ffb Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 10 Mar 2021 17:24:27 +0300 Subject: [PATCH 10/33] #3522 hide ad date in ads list page --- .../advs-module/resources/views/list/table.twig | 14 +++++++++----- 1 file changed, 9 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/table.twig b/addons/default/visiosoft/advs-module/resources/views/list/table.twig index c4a94399b..6cbc99d3c 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/table.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/table.twig @@ -9,8 +9,10 @@ class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }} {{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }} - {{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }} + {% if not setting_value('visiosoft.module.advs::ads_date_hidden') %} + {{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }} + {% endif %} {% if setting_value('visiosoft.module.location::list_page_location') %} {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }} @@ -38,9 +40,11 @@ {{ currency_format(adv.price,adv.currency) }} - - {{ adv.created_at|date("d/m/Y") }} - + {% if not setting_value('visiosoft.module.advs::ads_date_hidden') %} + + {{ adv.created_at|date("d/m/Y") }} + + {% endif %} {% if setting_value('visiosoft.module.location::list_page_location') %} {{ adv.city_name }} / {{ adv.country_name }} From 4f9ffb46f1363d3541547175b48298c4174b8a50 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 11 Mar 2021 17:35:00 +0300 Subject: [PATCH 11/33] watermark settings --- .../resources/config/settings/sections.php | 1 + .../resources/config/settings/settings.php | 60 ++++++++++--------- .../advs-module/resources/lang/en/setting.php | 4 ++ .../src/Http/Controller/UploadController.php | 38 ++++++------ 4 files changed, 58 insertions(+), 45 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 9222867a3..84f6e8e67 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -62,6 +62,7 @@ return [ 'ads_image' => [ 'title' => 'visiosoft.module.advs::section.ads_image', 'fields' => [ + 'watermark', 'image_resize_backend', 'full_image_width', 'full_image_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 dded12c5b..467bf61e8 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -295,6 +295,12 @@ return [ 'default_value' => 600, ], ], + 'watermark' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], 'watermark_type' => [ 'type' => 'anomaly.field_type.select', 'bind' => 'adv.watermark_type', @@ -389,31 +395,31 @@ return [ }, ], ], - 'favicon' => [ - 'type' => 'anomaly.field_type.file', - ], - 'ads_date_hidden' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ], - 'hide_listing_header' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ], - 'hide_filter_section' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ], - 'hide_seller_info' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ] + 'favicon' => [ + 'type' => 'anomaly.field_type.file', + ], + 'ads_date_hidden' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], + 'hide_listing_header' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], + 'hide_filter_section' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], + 'hide_seller_info' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ] ]; 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 01f5e9639..823d2589a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -247,4 +247,8 @@ return [ 'name' => 'GET Categories', 'instructions' => 'It represents the categories in which the GET property will be valid.' ], + 'watermark' => [ + 'name' => 'Watermark', + 'instructions' => 'Is watermark active?' + ], ]; diff --git a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php index 0fdc0bdf4..7ad894ff6 100644 --- a/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php +++ b/addons/default/visiosoft/media-field_type/src/Http/Controller/UploadController.php @@ -118,26 +118,28 @@ class UploadController extends AdminController foreach ($image_types as $key => $image) { - if ($settings_value['watermark_type'] == 'image') { + if (setting_value('visiosoft.module.advs::watermark', false)) { + if ($settings_value['watermark_type'] == 'image') { + + if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) { + $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); + $image->insert($watermark, $settings_value['watermark_position']); + } + + } else { + $v = "top"; + $h = "center"; + $w = $image->width() / 2; + $h1 = $image->height() / 2; + $font_size = $w / 20; + $image->text(($watermark_text = setting_value('visiosoft.module.advs::watermark_text')) ? $watermark_text : 'Openclassify', $w, $h1, function ($font) use ($v, $h, $font_size) { + $font->file(public_path('Antonio-Bold.ttf')); + $font->size($font_size); + $font->align($h); + $font->valign($v); + }); - if ($watermarkimage = $this->files->find($settings_value['watermark_image'])) { - $watermark = WaterMark::make(app_storage_path() . '/files-module/local/' . $watermarkimage->path()); - $image->insert($watermark, $settings_value['watermark_position']); } - - } else { - $v = "top"; - $h = "center"; - $w = $image->width() / 2; - $h1 = $image->height() / 2; - $font_size = $w / 20; - $image->text(($watermark_text = setting_value('visiosoft.module.advs::watermark_text')) ? $watermark_text : 'Openclassify', $w, $h1, function ($font) use ($v, $h, $font_size) { - $font->file(public_path('Antonio-Bold.ttf')); - $font->size($font_size); - $font->align($h); - $font->valign($v); - }); - } if ($key === "full") { From 919cad01a0edf1265773f6917896d6ad1c94fdd9 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 12:12:02 +0300 Subject: [PATCH 12/33] #3540 Sentry Enabled/Disabled add Senttings --- .../advs-module/resources/config/settings/sections.php | 1 + .../advs-module/resources/config/settings/settings.php | 3 ++- .../visiosoft/advs-module/resources/lang/en/setting.php | 3 +++ app/Exceptions/ExceptionHandler.php | 2 +- 4 files changed, 7 insertions(+), 2 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 9222867a3..f22cddc23 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -17,6 +17,7 @@ return [ 'hide_price_categories', 'tcmb_exchange_url', 'enabled_currencies', + 'close_sentry', ], ], 'ads' => [ 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 dded12c5b..181e4e805 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -415,5 +415,6 @@ return [ 'config' => [ 'default_value' => false, ] - ] + ], + 'close_sentry' => 'anomaly.field_type.boolean', ]; 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 01f5e9639..034aed70a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -247,4 +247,7 @@ return [ 'name' => 'GET Categories', 'instructions' => 'It represents the categories in which the GET property will be valid.' ], + 'close_sentry' => [ + 'name' => 'Disable Sentry' + ] ]; diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index a789a8e71..af7768299 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -87,7 +87,7 @@ class ExceptionHandler extends Handler public function report(Exception $e) { - if (app()->bound('sentry') && $this->shouldReport($e)) { + if (!setting_value('visiosoft.module.advs::close_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { app('sentry')->captureException($e); } From 4cea143922377966e8e9ebb010f8f12507bc5105 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 12:13:24 +0300 Subject: [PATCH 13/33] #3540 Sentry Enabled/Disabled add Senttings --- .../advs-module/resources/config/settings/sections.php | 2 +- .../advs-module/resources/config/settings/settings.php | 2 +- .../default/visiosoft/advs-module/resources/lang/en/setting.php | 2 +- app/Exceptions/ExceptionHandler.php | 2 +- 4 files changed, 4 insertions(+), 4 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 f22cddc23..ab3f3904a 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -17,7 +17,7 @@ return [ 'hide_price_categories', 'tcmb_exchange_url', 'enabled_currencies', - 'close_sentry', + 'disable_sentry', ], ], 'ads' => [ 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 181e4e805..436ca2ba6 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -416,5 +416,5 @@ return [ 'default_value' => false, ] ], - 'close_sentry' => 'anomaly.field_type.boolean', + 'disable_sentry' => 'anomaly.field_type.boolean', ]; 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 034aed70a..7e06bcedb 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -247,7 +247,7 @@ return [ 'name' => 'GET Categories', 'instructions' => 'It represents the categories in which the GET property will be valid.' ], - 'close_sentry' => [ + 'disable_sentry' => [ 'name' => 'Disable Sentry' ] ]; diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index af7768299..316887aca 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -87,7 +87,7 @@ class ExceptionHandler extends Handler public function report(Exception $e) { - if (!setting_value('visiosoft.module.advs::close_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { + if (!setting_value('visiosoft.module.advs::disable_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { app('sentry')->captureException($e); } From 707faec5be05c5e94cf333c539a63e9a2ba123b8 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 12:54:47 +0300 Subject: [PATCH 14/33] #3540 Sentry Enabled/Disabled add Senttings --- app/Exceptions/ExceptionHandler.php | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/app/Exceptions/ExceptionHandler.php b/app/Exceptions/ExceptionHandler.php index 316887aca..79492d1b8 100644 --- a/app/Exceptions/ExceptionHandler.php +++ b/app/Exceptions/ExceptionHandler.php @@ -87,7 +87,11 @@ class ExceptionHandler extends Handler public function report(Exception $e) { - if (!setting_value('visiosoft.module.advs::disable_sentry') && app()->bound('sentry') && $this->shouldReport($e)) { + if (!setting_value('visiosoft.module.advs::disable_sentry') + && app()->bound('sentry') + && $this->shouldReport($e) + && env('SENTRY_LARAVEL_DSN')) { + app('sentry')->captureException($e); } From 78114415c5e5ceabd019d6db4fc118247ba8efc1 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 12 Mar 2021 16:33:50 +0300 Subject: [PATCH 15/33] #3539 igam talepler 12.03 --- addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php index 6fd2e6614..7631a12c0 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php @@ -32,7 +32,7 @@ class AdvCollection extends EntryCollection { return $this->filter( function ($ad) { - return $ad->finish_at->gt(Carbon::now()); + return $ad->where('finish_at', '>', Carbon::now()); } ); } From c8c5571810bc85805e4d03c766b618ea17608a67 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 16 Mar 2021 16:34:03 +0300 Subject: [PATCH 16/33] #3568 product detail currency --- .../advs-module/src/Http/Controller/advsController.php | 10 ++-------- 1 file changed, 2 insertions(+), 8 deletions(-) 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 6aa16c091..673dfc925 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -5,6 +5,7 @@ use Anomaly\Streams\Platform\Http\Controller\PublicController; use Anomaly\Streams\Platform\Message\MessageBag; use Anomaly\Streams\Platform\Model\Advs\AdvsAdvsEntryModel; use Anomaly\Streams\Platform\Model\Complaints\ComplaintsComplainTypesEntryModel; +use Anomaly\Streams\Platform\Support\Currency; use Anomaly\UsersModule\User\Contract\UserRepositoryInterface; use Illuminate\Contracts\Events\Dispatcher; use Illuminate\Http\Request; @@ -1254,14 +1255,7 @@ class AdvsController extends PublicController $response['newPrice'] = $adv->price * $response['newQuantity']; - $separator = ","; - $decimals = 2; - $point = "."; - - $response['newPrice'] = number_format($response['newPrice'], $decimals, $point, str_replace(' ', ' ', $separator)); - $symbol = config('streams::currencies.supported.' . strtoupper($adv->currency) . '.symbol'); - - $response['newPrice'] = $symbol . $response['newPrice']; + $response['newPrice'] = app(Currency::class)->format($response['newPrice'], strtoupper($adv->currency)); $response['status'] = $status; $response['maxQuantity'] = $adv->stock; return $response; From 69d24bc30ea55641d1255c18dde6d76447a94e1b Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 17 Mar 2021 15:22:19 +0300 Subject: [PATCH 17/33] #3570 added foreign_currencies func in new ads --- addons/default/visiosoft/advs-module/src/Adv/AdvModel.php | 6 ++++-- .../visiosoft/advs-module/src/Adv/Contract/AdvInterface.php | 2 +- .../advs-module/src/Http/Controller/advsController.php | 3 ++- 3 files changed, 7 insertions(+), 4 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index e8a84f42b..cbe685212 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -109,7 +109,7 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s')); } - public function foreignCurrency($currency, $price, $isUpdate, $settings) + public function foreignCurrency($currency, $price, $isUpdate, $settings, $showMsg = true) { $currencies = setting_value('visiosoft.module.advs::enabled_currencies'); $messages = app(MessageBag::class); @@ -141,7 +141,9 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface $response = $e->getResponse(); $responseBodyAsString = $response->getBody()->getContents(); $response = json_decode($responseBodyAsString, true); - $messages->error($response['error']); + if ($showMsg) { + $messages->error($response['error']); + } } } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php index 06f037a75..8073d01bc 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvInterface.php @@ -22,7 +22,7 @@ interface AdvInterface extends EntryInterface public function myAdvsByUser(); - public function foreignCurrency($currency, $price, $isUpdate, $settings); + public function foreignCurrency($currency, $price, $isUpdate, $settings, $showMsg); public function popularAdvs(); 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 673dfc925..d1311c2a1 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -882,7 +882,8 @@ class AdvsController extends PublicController return redirect('/advs/edit_advs/' . $request->update_id)->with('cats_d', $cats_d)->with('request', $request); } event(new CreatedAd($adv)); - return redirect(route('advs_preview', [$request->update_id])); + $this->adv_model->foreignCurrency($request->currency, $request->price, $request->update_id, $this->settings_repository, false); + return redirect(route('advs_preview', [$request->update_id])); } /* New Create Adv */ From 601a79bd2450b3be2e7384ee1f78def39e002194 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 18 Mar 2021 11:27:44 +0300 Subject: [PATCH 18/33] override config --- app/Lang/Loader.php | 11 +++++++++++ resources/streams/config/translate.php | 7 +++++++ 2 files changed, 18 insertions(+) create mode 100644 resources/streams/config/translate.php diff --git a/app/Lang/Loader.php b/app/Lang/Loader.php index e0e333626..84407a3a5 100644 --- a/app/Lang/Loader.php +++ b/app/Lang/Loader.php @@ -180,6 +180,17 @@ class Loader extends FileLoader $lines = array_replace_recursive($lines, $this->files->getRequire($file)); } } + + //Override System + $override_list = config('streams::translate.override'); + + foreach ($override_list as $override) { + $override = explode(':', $override); + if (count($override) > 1) { + $lines = $this->findArrayValue($override[0], $override[1], $lines); + } + } + if (config()->has('override_text')) { foreach (config()->get('override_text') as $override) { $override = explode(':', $override); diff --git a/resources/streams/config/translate.php b/resources/streams/config/translate.php new file mode 100644 index 000000000..41135f165 --- /dev/null +++ b/resources/streams/config/translate.php @@ -0,0 +1,7 @@ + [ + 'Sümüklüböcek:Benzersiz İsim', + ], +]; \ No newline at end of file From 33aec0f5d4ff9ec6a00f98045d276e1ed8d99bb1 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 18 Mar 2021 16:31:13 +0300 Subject: [PATCH 19/33] #3512 Enabled Currencies make it tag --- .../visiosoft/advs-module/resources/config/settings/settings.php | 1 + 1 file changed, 1 insertion(+) 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 af1b774f1..563d68e07 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -173,6 +173,7 @@ return [ 'type' => 'anomaly.field_type.checkboxes', 'required' => true, 'config' => [ + 'mode' => 'tags', 'default_value' => function () { return [config('streams::currencies.default')]; }, From 745ceb28a5ca5b4f955224a523aebb6078039f60 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 18 Mar 2021 17:17:37 +0300 Subject: [PATCH 20/33] #3460 Make "show all" 1000 record --- .../views/table/partials/footer.twig | 62 +++++++++++++++++++ .../src/DefaultadminThemeServiceProvider.php | 4 ++ 2 files changed, 66 insertions(+) create mode 100644 addons/default/visiosoft/defaultadmin-theme/resources/views/table/partials/footer.twig diff --git a/addons/default/visiosoft/defaultadmin-theme/resources/views/table/partials/footer.twig b/addons/default/visiosoft/defaultadmin-theme/resources/views/table/partials/footer.twig new file mode 100644 index 000000000..293ce23d2 --- /dev/null +++ b/addons/default/visiosoft/defaultadmin-theme/resources/views/table/partials/footer.twig @@ -0,0 +1,62 @@ + +{% if table.actions|length or table.data.pagination.links|length %} + + + +
+ {{ buttons(table.actions)|raw }} +
+ + {% if table.data.pagination.links|length %} +
+ + + + {{ table.data.pagination.links|raw }} +
+ {% endif %} + +
+ + + +{% endif %} +{% if table.options.total_results %} + + + + {{ table.options.total_results }} {{ trans('streams::message.results') }} + + + +{% endif %} + diff --git a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php index 17d9560e7..70fc9b229 100644 --- a/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php +++ b/addons/default/visiosoft/defaultadmin-theme/src/DefaultadminThemeServiceProvider.php @@ -27,6 +27,10 @@ class DefaultadminThemeServiceProvider extends AddonServiceProvider ], ]; + protected $overrides = [ + 'streams::table/partials/footer' => 'visiosoft.theme.defaultadmin::table/partials/footer' + ]; + public function register() { AbstractPaginator::$defaultView = 'visiosoft.theme.defaultadmin::pagination/bootstrap-4'; From 7cfdf064f166faa22174e875f7bfe71128898979 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Fri, 19 Mar 2021 15:27:22 +0300 Subject: [PATCH 21/33] trans to lang text --- 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 6c62c79ae..6518e653d 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCriteria.php @@ -96,7 +96,7 @@ class AdvCriteria extends EntryCriteria public function getCurrentLocale() { - return locale_get_display_name(config('app.locale')); + return trans('streams::locale.' . config('app.locale') . '.name'); } public function isEnabled($slug) From 9deee510ea9d4424426db4baea67559367db8bab Mon Sep 17 00:00:00 2001 From: vedatakd Date: Fri, 19 Mar 2021 17:42:49 +0300 Subject: [PATCH 22/33] fixed addBlock orher fields --- .../resources/views/new-ad/new-create.twig | 31 ++++++++++++------- 1 file changed, 19 insertions(+), 12 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig index 9faa16334..17e8aadd8 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig @@ -103,11 +103,13 @@ {% set PriceValue = form.fields.price.value|split('.') %}
- +
{% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
-
{% endif %} @@ -135,11 +137,13 @@ {{ trans('visiosoft.module.advs::field.options') }}
- @@ -177,25 +181,28 @@
{{ form.fields.files.input |raw }} - +
{% for docs in form.fields.doc_files.value %} - - {{ docs.name }} - -
+ + {{ docs.name }} + +
{% endfor %}
- - {% if custom_fields and count(custom_fields) %} + {% set other_fields = addBlock('new-ad/other-fields',{'custom_fields':custom_fields}) %} + {% if other_fields or (custom_fields and count(custom_fields)) %}
{{ trans('visiosoft.module.advs::field.additional_fields') }}
- {{ addBlock('new-ad/other-fields',{'custom_fields':custom_fields})|raw }} + {{ other_fields|raw }}
{% endif %} From f837e70e14904f292c1fb83800d467f07731a260 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Mon, 22 Mar 2021 16:39:38 +0300 Subject: [PATCH 23/33] remote sales contract --- .../visiosoft/advs-module/src/Support/_helpers.php | 12 ++++++++++++ 1 file changed, 12 insertions(+) diff --git a/addons/default/visiosoft/advs-module/src/Support/_helpers.php b/addons/default/visiosoft/advs-module/src/Support/_helpers.php index 45c94b635..f5f0bc714 100644 --- a/addons/default/visiosoft/advs-module/src/Support/_helpers.php +++ b/addons/default/visiosoft/advs-module/src/Support/_helpers.php @@ -31,4 +31,16 @@ if (!function_exists('auth_id_if_null')) function auth_id_if_null($userId) { return $userId ?: auth()->id(); } +} + +if (!function_exists('replace_to_text')) +{ + function replace_to_text($content, $array) + { + foreach ($array as $key => $value) { + $content = str_replace('${' . $key . '}', $value, $content); + } + + return $content; + } } \ No newline at end of file From 7055bb85c12fa9d22ebd9f804a3bd0dd58c605a3 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 22 Mar 2021 16:58:42 +0300 Subject: [PATCH 24/33] fixed cover photo error --- .../visiosoft/advs-module/src/Adv/AdvRepository.php | 9 ++++----- 1 file changed, 4 insertions(+), 5 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 779e01c47..c27314a55 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -330,10 +330,8 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface 'extension' => $image->extension, ]); - $coverPhoto = 'files/images/' . $fileName; - } else { - $coverPhoto = $thumbnail->url(); } + $coverPhoto = $thumbnail->url(); } else { $coverPhoto = null; } @@ -502,8 +500,9 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface ->paginate(setting_value('visiosoft.module.advs::popular_ads_limit', setting_value('streams::per_page'))); } - public function getName($id){ - return $this->find($id)->name; + public function getName($id) + { + return $this->find($id)->name; } public function approveAds($adsIDs) From d5fb8f578e440bc3e9762e389c29892c5db8650c Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 22 Mar 2021 17:02:33 +0300 Subject: [PATCH 25/33] fixed cover photo error --- addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index c27314a55..bdc1c0b89 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -331,7 +331,7 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface ]); } - $coverPhoto = $thumbnail->url(); + $coverPhoto = 'files/images/' . $fileName; } else { $coverPhoto = null; } From 9e839fb64bd228f3235608b2d752b6e716389d23 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Tue, 23 Mar 2021 14:55:12 +0300 Subject: [PATCH 26/33] igamkoop bugs and request edited --- .../advs-module/src/Adv/Table/AdvTableColumns.php | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php index 64f303c65..1780c08fc 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php @@ -21,12 +21,16 @@ class AdvTableColumns 'wrapper' => ' #{value.id}{value.name}
- {value.finish_at} + {value.date}
{value.category}', 'value' => [ 'id' => 'entry.id', - 'finish_at' => 'entry.finish_at', + 'date' => function(EntryInterface $entry){ + $created_at = date_format($entry['created_at'], 'd.m.Y H:i'); + $finish_at = date_format($entry['finish_at'], 'd.m.Y H:i'); + return $created_at . ' ' . $finish_at; + }, 'name' => function (EntryInterface $entry) { if ($entry->getTitle()) { $value = " {entry.name} "; From a3f277d919ed8716d41cceedf3ed62aa631d4142 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Wed, 24 Mar 2021 10:22:13 +0300 Subject: [PATCH 27/33] hide price filter by category --- .../views/list/partials/price-filter.twig | 14 ++++++++++++-- 1 file changed, 12 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig index 180820296..06734c9a3 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig @@ -1,4 +1,14 @@ -{% if setting_value('visiosoft.module.advs::hide_price_filter') == false %} +{% set hidePriceCats = setting_value('visiosoft.module.advs::hide_price_categories') %} +{% set cats = entries('cats','category').whereIn('id', hidePriceCats).get() %} +{% set isHidden = false %} + +{% for cat in cats %} + {% if request().segment(2) == cat.slug %} + {% set isHidden = true %} + {% endif %} +{% endfor %} + +{% if setting_value('visiosoft.module.advs::hide_price_filter') == false and not isHidden%}
-{% endif %} \ No newline at end of file +{% endif %} From a81c5d5abcace37548fc8964b7ee6ba266634ad6 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 24 Mar 2021 17:42:14 +0300 Subject: [PATCH 28/33] fixed dateformat --- .../visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php index 1780c08fc..b8364f0fe 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php @@ -27,8 +27,8 @@ class AdvTableColumns 'value' => [ 'id' => 'entry.id', 'date' => function(EntryInterface $entry){ - $created_at = date_format($entry['created_at'], 'd.m.Y H:i'); - $finish_at = date_format($entry['finish_at'], 'd.m.Y H:i'); + $created_at = ($entry['created_at']) ?date_format($entry['created_at'], 'd.m.Y H:i'): ''; + $finish_at = ($entry['finish_at']) ? date_format($entry['finish_at'], 'd.m.Y H:i'): ''; return $created_at . ' ' . $finish_at; }, 'name' => function (EntryInterface $entry) { From 1877b08f3643672d550e23efe7c976b157d079d0 Mon Sep 17 00:00:00 2001 From: Muammer Top Date: Thu, 25 Mar 2021 10:53:56 +0300 Subject: [PATCH 29/33] #3607 igamkoop bugs and requests --- .../default/visiosoft/advs-module/resources/js/filter_modal.js | 2 +- .../resources/views/list/partials/filter-modal.twig | 3 ++- 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/filter_modal.js b/addons/default/visiosoft/advs-module/resources/js/filter_modal.js index 0f371ad38..8fd2d27c1 100644 --- a/addons/default/visiosoft/advs-module/resources/js/filter_modal.js +++ b/addons/default/visiosoft/advs-module/resources/js/filter_modal.js @@ -70,7 +70,7 @@ promiseForCategory.then(function (categories_list) { function CategoryField(name, level) { return '
\n' + '\n\n
'; } diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig index 8ba54e038..a43ffc88f 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/filter-modal.twig @@ -1,5 +1,6 @@ {{ asset_add('scripts.js','visiosoft.module.advs::js/filter_modal.js') }} -
+
+ {% include 'visiosoft.module.advs::list/partials/list-filter' with {"filter_id": 'listFilterFormMobile'} %} +
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig index 24015510f..d977a7892 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/list-filter.twig @@ -1,5 +1,5 @@ {% set formHtml %} -
+ {% endset %} {% set catSlug = null %} {% set citySlug = null %} @@ -12,7 +12,7 @@ {% endif %} {% if catSlug %} {% set formHtml %} - + {% endset %} {% endif %} {{ formHtml }}