From fb8d2dca1aadbc6922a5d942fbda09cf20e2d01b Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Wed, 12 May 2021 02:57:38 +0300
Subject: [PATCH] fixed finish and publish date

---
 .../resources/config/settings/sections.php    |   1 +
 .../advs-module/resources/lang/en/field.php   |   5 +-
 .../advs-module/resources/lang/tr/field.php   |   5 +-
 .../resources/views/new-ad/new-create.twig    | 176 +++++++++---------
 4 files changed, 99 insertions(+), 88 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 fa22e92a1..4ce7e632f 100644
--- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
+++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php
@@ -24,6 +24,7 @@ return [
             'ads' => [
                 'title' => 'visiosoft.module.advs::section.ads',
                 'fields' => [
+                    'show_finish_and_publish_date',
                     'latest-limit',
                     'popular_ads_limit',
                     'ads_image_limit',
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 6719a34bf..b362df662 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php
@@ -108,7 +108,7 @@ return [
         'name' => 'Unpublished'
     ],
     'finish_at' => [
-        'name' => 'Finish At'
+        'name' => 'Finish Date'
     ],
     'cover_photo' => [
         'name' => 'Cover Photo'
@@ -370,4 +370,7 @@ return [
         'name' => 'Old Price'
     ],
 	'save_search' => 'Save Search',
+    'publish_at' => [
+        'name' => 'Publish Date'
+    ],
 ];
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 66bf10dae..7f299bba1 100644
--- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
+++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php
@@ -108,7 +108,7 @@ return [
         'name' => 'Yayınlanmamış'
     ],
     'finish_at' => [
-        'name' => 'Bitiş Saati'
+        'name' => 'Bitiş Tarihi'
     ],
     'cover_photo' => [
         'name' => 'Kapak Fotoğrafı'
@@ -371,4 +371,7 @@ return [
         'name' => 'Eski fiyat'
     ],
 	'save_search' => 'Aramayı Kaydet',
+    'publish_at' => [
+        'name' => 'Publish Date'
+    ],
 ];
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 105e9585d..08d8ab12c 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
@@ -2,7 +2,8 @@
 
 {% block styles %}
     <link rel="preconnect" href="https://fonts.gstatic.com">
-    <link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
+    <link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap"
+          rel="stylesheet">
 
     <style>
         {{ asset_inline("visiosoft.module.advs::css/new-create.css") }}
@@ -96,7 +97,8 @@
 
                                         <div class="d-flex">
                                             {% set PriceValue = form.fields.price.value|split('.') %}
-                                            <input type="text" class="mt-3 border-0 text-right priceField whole-price flex-fill"
+                                            <input type="text"
+                                                   class="mt-3 border-0 text-right priceField whole-price flex-fill"
                                                    placeholder="0" value="{{ PriceValue|first }}">
                                             {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
                                                 <input class="mt-3 border-0 ml-2 text-center priceDecimalField decimal-price"
@@ -122,7 +124,8 @@
                                                    placeholder="0" value="{{ standardPriceValue|first }}" type="text">
                                             {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
                                                 <input class="mt-3 border-0 ml-2 text-center standard-price-decimal decimal-price"
-                                                       placeholder="00" type="text" value="{{ standardPriceValue[1] }}" maxlength="2">
+                                                       placeholder="00" type="text" value="{{ standardPriceValue[1] }}"
+                                                       maxlength="2">
                                             {% endif %}
                                             <select name="currency" class="mt-3 border-0 ml-2" id="currency" required>
                                                 {% for currency in config_get('streams::currencies.enabled') %}
@@ -134,94 +137,95 @@
                                         </div>
                                     </div>
                                 </div>
+                                {% if setting_value("visiosoft.module.advs::show_finish_and_publish_date") %}
+                                    <div class="row mx-0 my-3">
+                                        <div class="col-6 px-0">
+                                            <label>
+                                                {{ form.fields.publish_at.label|raw }}
+                                                <span class="required">*</span>
+                                            </label>
 
-                                <div class="row mx-0 my-3">
-                                    <div class="col-6 px-0">
-                                        <label>
-                                            {{ form.fields.publish_at.label|raw }}
-                                            <span class="required">*</span>
-                                        </label>
-
-                                        <div class="py-2 pr-3">
-                                            {{ form.fields.publish_at.input|raw }}
+                                            <div class="py-2 pr-3">
+                                                {{ form.fields.publish_at.input|raw }}
+                                            </div>
                                         </div>
-                                    </div>
-                                    <div class="col-6 px-0">
-                                        <label>
-                                            {{ form.fields.finish_at.label|raw }}
-                                            <span class="required">*</span>
-                                        </label>
+                                        <div class="col-6 px-0">
+                                            <label>
+                                                {{ form.fields.finish_at.label|raw }}
+                                                <span class="required">*</span>
+                                            </label>
 
-                                        <div class="py-2 pr-2">
-                                            {{ form.fields.finish_at.input|raw }}
+                                            <div class="py-2 pr-2">
+                                                {{ form.fields.finish_at.input|raw }}
+                                            </div>
                                         </div>
+                                        <style>
+                                            .input-group {
+                                                position: relative;
+                                                width: 100%;
+                                                display: flex;
+                                            }
+
+                                            .input-group .form-control {
+                                                position: relative;
+                                                z-index: 2;
+                                                flex: 1;
+                                                margin-bottom: 0;
+                                            }
+
+                                            .input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
+                                                z-index: 3;
+                                            }
+
+                                            .input-group-addon:not(:first-child):not(:last-child),
+                                            .input-group-btn:not(:first-child):not(:last-child),
+                                            .input-group .form-control:not(:first-child):not(:last-child) {
+                                                border-radius: 0;
+                                            }
+
+                                            .input-group-addon,
+                                            .input-group-btn {
+                                                white-space: nowrap;
+                                                vertical-align: middle;
+                                            }
+
+                                            .input-group-addon {
+                                                padding: 0.5rem 0.75rem;
+                                                margin-bottom: 0;
+                                                font-size: 1rem;
+                                                font-weight: normal;
+                                                line-height: 1.25;
+                                                color: #55595c;
+                                                text-align: center;
+                                                background-color: #eceeef;
+                                                border: 1px solid rgba(0, 0, 0, 0.15);
+                                                border-radius: 0.1rem;
+                                            }
+
+                                            .input-group-addon.form-control-sm,
+                                            .input-group-sm > .input-group-addon,
+                                            .input-group-sm > .input-group-btn > .input-group-addon.btn {
+                                                padding: 0.25rem 0.5rem;
+                                                font-size: 0.875rem;
+                                                border-radius: 0.1rem;
+                                            }
+
+                                            .input-group-addon.form-control-lg,
+                                            .input-group-lg > .input-group-addon,
+                                            .input-group-lg > .input-group-btn > .input-group-addon.btn {
+                                                padding: 0.75rem 1.5rem;
+                                                font-size: 1.25rem;
+                                                border-radius: 0.25rem;
+                                            }
+
+                                            .input-group-addon input[type=radio],
+                                            .input-group-addon input[type=checkbox] {
+                                                margin-top: 0;
+                                            }
+
+                                        </style>
                                     </div>
-                                    <style>
-                                        .input-group {
-                                            position: relative;
-                                            width: 100%;
-                                            display: flex;
-                                        }
-
-                                        .input-group .form-control {
-                                            position: relative;
-                                            z-index: 2;
-                                            flex: 1;
-                                            margin-bottom: 0;
-                                        }
-
-                                        .input-group .form-control:focus, .input-group .form-control:active, .input-group .form-control:hover {
-                                            z-index: 3;
-                                        }
-
-                                        .input-group-addon:not(:first-child):not(:last-child),
-                                        .input-group-btn:not(:first-child):not(:last-child),
-                                        .input-group .form-control:not(:first-child):not(:last-child) {
-                                            border-radius: 0;
-                                        }
-
-                                        .input-group-addon,
-                                        .input-group-btn {
-                                            white-space: nowrap;
-                                            vertical-align: middle;
-                                        }
-
-                                        .input-group-addon {
-                                            padding: 0.5rem 0.75rem;
-                                            margin-bottom: 0;
-                                            font-size: 1rem;
-                                            font-weight: normal;
-                                            line-height: 1.25;
-                                            color: #55595c;
-                                            text-align: center;
-                                            background-color: #eceeef;
-                                            border: 1px solid rgba(0, 0, 0, 0.15);
-                                            border-radius: 0.1rem;
-                                        }
-
-                                        .input-group-addon.form-control-sm,
-                                        .input-group-sm > .input-group-addon,
-                                        .input-group-sm > .input-group-btn > .input-group-addon.btn {
-                                            padding: 0.25rem 0.5rem;
-                                            font-size: 0.875rem;
-                                            border-radius: 0.1rem;
-                                        }
-
-                                        .input-group-addon.form-control-lg,
-                                        .input-group-lg > .input-group-addon,
-                                        .input-group-lg > .input-group-btn > .input-group-addon.btn {
-                                            padding: 0.75rem 1.5rem;
-                                            font-size: 1.25rem;
-                                            border-radius: 0.25rem;
-                                        }
-
-                                        .input-group-addon input[type=radio],
-                                        .input-group-addon input[type=checkbox] {
-                                            margin-top: 0;
-                                        }
-
-                                    </style>
-                                </div>
+                                {% endif %}
 
 
                                 {% if not setting_value('visiosoft.module.advs::hide_options_field') %}