From 8e4530f5178c8ef842effafd8b42801a44715efd Mon Sep 17 00:00:00 2001 From: vedatakd Date: Sat, 29 May 2021 16:39:16 +0300 Subject: [PATCH 1/4] trans materials --- database/Command/DeleteInstaller.php | 17 +++++++++++++++++ database/seeder/DatabaseSeeder.php | 8 ++++++-- 2 files changed, 23 insertions(+), 2 deletions(-) create mode 100644 database/Command/DeleteInstaller.php diff --git a/database/Command/DeleteInstaller.php b/database/Command/DeleteInstaller.php new file mode 100644 index 000000000..8dddea0be --- /dev/null +++ b/database/Command/DeleteInstaller.php @@ -0,0 +1,17 @@ +put(base_path('composer.json'), preg_replace($pattern, '', $json)); + + $files->deleteDirectory(base_path('vendor/anomaly/installer-module')); + } +} diff --git a/database/seeder/DatabaseSeeder.php b/database/seeder/DatabaseSeeder.php index 4984b8834..4bd69cc97 100644 --- a/database/seeder/DatabaseSeeder.php +++ b/database/seeder/DatabaseSeeder.php @@ -1,4 +1,5 @@ call(WidgetSeeder::class); + //Delete Installer + dispatch_now(new DeleteInstaller()); + //Create Store Icon Folder if (!$this->folders->findBySlug('ads_excel')) { @@ -218,8 +223,7 @@ class DatabaseSeeder extends Seeder }; //Demodata Seeder - if(is_module_installed('visiosoft.module.demodata')) - { + if (is_module_installed('visiosoft.module.demodata')) { $this->call(\Visiosoft\DemodataModule\Demodata\DemodataSeeder::class); } From efc07b097b368f7e8bf68c776996c8ec7708d277 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Sat, 29 May 2021 17:30:25 +0300 Subject: [PATCH 2/4] remove old route --- .../visiosoft/advs-module/src/AdvsModuleServiceProvider.php | 4 ---- 1 file changed, 4 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 937d1e0da..04f7a4348 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -146,10 +146,6 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'as' => 'adv_add_cart_ajax', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@addCart', ], - 'ajax/countPhone' => [ - 'as' => 'adv_count_show_phone', - 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@showPhoneCounter', - ], 'view/{type}' => [ 'as' => 'visiosoft.module.advs::view_type', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\AdvsController@viewType', From 6661c54cd6e8c146caf3cbc804733b83d2f11326 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Sat, 29 May 2021 18:10:51 +0300 Subject: [PATCH 3/4] added tax field --- ...isiosoft.module.advs__create_tax_field.php | 30 +++++++ .../resources/config/settings/sections.php | 1 + .../resources/config/settings/settings.php | 89 ++++++++++--------- .../advs-module/resources/lang/en/field.php | 3 + .../advs-module/resources/lang/en/setting.php | 4 + .../advs-module/resources/lang/tr/field.php | 3 + .../advs-module/resources/lang/tr/setting.php | 64 +++++++------ .../resources/views/new-ad/new-create.twig | 29 +++++- .../src/Adv/Form/AdvFormBuilder.php | 1 + 9 files changed, 153 insertions(+), 71 deletions(-) create mode 100644 addons/default/visiosoft/advs-module/migrations/2021_05_29_144305_visiosoft.module.advs__create_tax_field.php diff --git a/addons/default/visiosoft/advs-module/migrations/2021_05_29_144305_visiosoft.module.advs__create_tax_field.php b/addons/default/visiosoft/advs-module/migrations/2021_05_29_144305_visiosoft.module.advs__create_tax_field.php new file mode 100644 index 000000000..98ca8fadd --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2021_05_29_144305_visiosoft.module.advs__create_tax_field.php @@ -0,0 +1,30 @@ +getDatabasePlatform()->registerDoctrineTypeMapping('point', 'string'); + } + + protected $stream = [ + 'slug' => 'advs', + ]; + + protected $fields = [ + 'tax' => [ + 'type' => 'anomaly.field_type.integer', + 'config' => [ + 'default_value' => null, + ], + ], + ]; + + protected $assignments = [ + 'tax' + ]; +} 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 4ce7e632f..d8cabb3fa 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -53,6 +53,7 @@ return [ 'create_ad' => [ 'title' => 'visiosoft.module.advs::section.create_ad', 'fields' => [ + 'show_tax_field', 'detailed_product_options', 'steps_color', 'create_ad_button_color', 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 dd64714e4..a3a68a62c 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -180,7 +180,7 @@ return [ 'type' => 'anomaly.field_type.checkboxes', 'required' => true, 'config' => [ - 'mode' => 'tags', + 'mode' => 'tags', 'default_value' => function () { return [config('streams::currencies.default')]; }, @@ -403,34 +403,34 @@ 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, - ] - ], - 'disable_sentry' => 'anomaly.field_type.boolean', + '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, + ] + ], + 'disable_sentry' => 'anomaly.field_type.boolean', 'detailed_product_options' => [ 'type' => 'anomaly.field_type.boolean', 'config' => [ @@ -443,18 +443,18 @@ return [ 'default_value' => false, ] ], - 'show_price_to_members_only' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ], - 'hide_ad_cat' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ], + 'show_price_to_members_only' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], + 'hide_ad_cat' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], 'show_finish_and_publish_date' => [ 'type' => 'anomaly.field_type.boolean', @@ -462,4 +462,11 @@ return [ 'default_value' => false, ], ], + + 'show_tax_field' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ], + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/field.php b/addons/default/visiosoft/advs-module/resources/lang/en/field.php index b5ab6b91e..559a3f737 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -376,4 +376,7 @@ return [ 'publish_at' => [ 'name' => 'Publish Date' ], + 'tax' => [ + 'name' => 'Tax' + ], ]; 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 eea84435b..d79e86434 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -276,4 +276,8 @@ return [ 'name' => 'Show Finish Date And Publish Date For Create', 'instructions' => 'Displays the publish_at and finish_at fields on the ad creation page.' ], + 'show_tax_field' => [ + 'name' => 'Show Tax Field', + 'instructions' => 'When this option is enabled, you can set the tax rate on the ad creation page.' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php index 7f299bba1..609575cde 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php @@ -374,4 +374,7 @@ return [ 'publish_at' => [ 'name' => 'Publish Date' ], + 'tax' => [ + 'name' => 'KDV Dahil Oranı' + ], ]; 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 94d4e460d..1feccdf46 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -27,7 +27,7 @@ return [ 'favicon' => [ 'name' => 'Favicon', ] - ,'map_coordinates_long' => [ + , 'map_coordinates_long' => [ 'name' => 'Harita Long Koordinati', ], 'map_coordinates_lat' => [ @@ -41,7 +41,7 @@ return [ ], 'ogImage' => [ 'name' => 'Sosyal Paylaşma Logosu', - 'warning' => '1200 x 630 çözünürlükte olmalıdır.', + 'warning' => '1200 x 630 çözünürlükte olmalıdır.', ], 'currencies' => [ @@ -52,7 +52,7 @@ return [ ], 'site_address' => [ 'name' => 'Site Adresi', - 'warning' => 'Otomatik eklendi www. www. sitename.com', + 'warning' => 'Otomatik eklendi www. www. sitename.com', ], 'google_map_key' => [ 'name' => 'Google Harita Api Anahtarı', @@ -134,9 +134,9 @@ return [ 'market_place' => [ 'name' => 'Pazar Yeri', ], - 'price_area_hidden' => [ - 'name' => 'Fiyat Alanı Gizli', - ], + 'price_area_hidden' => [ + 'name' => 'Fiyat Alanı Gizli', + ], 'hide_price_filter' => [ 'name' => 'Fiyat Filtresini Gizle', ], @@ -215,18 +215,18 @@ return [ 'name' => 'Oluşturulma Tarihini Gizle', 'instructions' => 'İlan detay sayfasında oluşturulan tarihi gizle', ], - 'hide_listing_header' => [ - 'name' => 'Liste Başlığını Gizle', - 'instructions' => 'Türleri sıralamak ve görüntülemek için gizleme', - ], - 'hide_filter_section' => [ - 'name' => 'Filtre Bölümünü Gizle', - 'instructions' => 'Liste sayfasında sol filtre alanına gizleniyor', - ], - 'hide_seller_info' => [ - 'name' => 'Satıcı Bilgilerini Gizle', - 'instructions' => 'İlan detay sayfasında satıcı bilgilerinin gizlenmesi', - ], + 'hide_listing_header' => [ + 'name' => 'Liste Başlığını Gizle', + 'instructions' => 'Türleri sıralamak ve görüntülemek için gizleme', + ], + 'hide_filter_section' => [ + 'name' => 'Filtre Bölümünü Gizle', + 'instructions' => 'Liste sayfasında sol filtre alanına gizleniyor', + ], + 'hide_seller_info' => [ + 'name' => 'Satıcı Bilgilerini Gizle', + 'instructions' => 'İlan detay sayfasında satıcı bilgilerinin gizlenmesi', + ], 'show_post_ad_agreement' => [ 'name' => 'İlan Sonrası Sözleşmesini Göster', 'instructions' => 'Reklam oluşturma sayfasında bir gizlilik politikası sözleşmesi görüntülemek istiyorsanız bunu açın', @@ -251,9 +251,9 @@ return [ 'name' => 'GET Kategorileri', 'instructions' => 'GET özelliğinin geçerli olacağı kategorileri temsil eder.' ], - 'disable_sentry' => [ - 'name' => 'Sentry\'yi devre dışı bırak' - ], + 'disable_sentry' => [ + 'name' => 'Sentry\'yi devre dışı bırak' + ], 'watermark' => [ 'name' => 'Filigran', 'instructions' => 'Filigran etkin mi?' @@ -265,11 +265,19 @@ return [ 'show_subcats_mobile' => [ 'name' => 'Alt kategorileri mobil görünümde göster', ], - 'show_price_to_members_only' => [ - 'name' => 'Sadece Üyelere Fiyat Göster', - ], - 'hide_ad_cat' => [ - 'name' => 'Kategorileri Gizle', - 'instructions' => 'İlan listelemede ilan kategorilerini gizle' - ] + 'show_price_to_members_only' => [ + 'name' => 'Sadece Üyelere Fiyat Göster', + ], + 'hide_ad_cat' => [ + 'name' => 'Kategorileri Gizle', + 'instructions' => 'İlan listelemede ilan kategorilerini gizle' + ], + 'show_finish_and_publish_date' => [ + 'name' => 'İlan Oluşturma Sayfasında Publish_at ve Finish_at göster', + 'instructions' => 'İlan oluşturma sayfasında Publish_at ve Finish_at alanlarını gösterir.' + ], + 'show_tax_field' => [ + 'name' => 'Vergi Oranı Seçmeyi Göster', + 'instructions' => 'Bu seçenek etkinleştirildiğinde ilan oluşturma sayfasında vergi oranı belirleyebilirsiniz.' + ], ]; 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 a82a57656..e40819b0e 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 @@ -126,10 +126,12 @@ {% set standardPriceValue = form.fields.standard_price.value|split('.') %} + placeholder="0" value="{{ standardPriceValue|first }}" + type="text"> {% if setting_value('visiosoft.field_type.decimal::showDecimal') %} {% endif %} @@ -143,6 +145,29 @@ + + {% if setting_value("visiosoft.module.advs::show_tax_field") %} +
+
+ + +
+
+ +
+
+
+
+ {% endif %} + {% if setting_value("visiosoft.module.advs::show_finish_and_publish_date") %}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php index e5f836d7a..c9f6eb197 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php @@ -57,6 +57,7 @@ class AdvFormBuilder extends FormBuilder 'cat9', 'cat10', 'currency', + 'tax', 'online_payment', 'stock', 'country' => [ From 6fbcdb1723a4da5950b0da3141215de32d0a9e56 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Mon, 31 May 2021 01:42:41 +0300 Subject: [PATCH 4/4] comments --- ...021_05_29_144305_visiosoft.module.advs__create_tax_field.php | 2 +- .../default/visiosoft/advs-module/resources/lang/tr/field.php | 2 +- .../advs-module/resources/views/new-ad/new-create.twig | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/migrations/2021_05_29_144305_visiosoft.module.advs__create_tax_field.php b/addons/default/visiosoft/advs-module/migrations/2021_05_29_144305_visiosoft.module.advs__create_tax_field.php index 98ca8fadd..1d1f282d5 100644 --- a/addons/default/visiosoft/advs-module/migrations/2021_05_29_144305_visiosoft.module.advs__create_tax_field.php +++ b/addons/default/visiosoft/advs-module/migrations/2021_05_29_144305_visiosoft.module.advs__create_tax_field.php @@ -19,7 +19,7 @@ class VisiosoftModuleAdvsCreateTaxField extends Migration 'tax' => [ 'type' => 'anomaly.field_type.integer', 'config' => [ - 'default_value' => null, + 'default_value' => 0, ], ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php index 609575cde..3500a0ce0 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php @@ -375,6 +375,6 @@ return [ 'name' => 'Publish Date' ], 'tax' => [ - 'name' => 'KDV Dahil Oranı' + 'name' => 'KDV Oranı' ], ]; 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 e40819b0e..becf09e32 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 @@ -157,7 +157,7 @@