From 141dee9da7207e5a7fd384d531f8dff240cf4704 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Tue, 18 May 2021 10:42:02 +0300
Subject: [PATCH 1/3] Revert "#3984 new advs currency bug"

This reverts commit 9ce2fbb2
---
 .../resources/views/new-ad/new-create.twig    | 28 ++++++++-----------
 1 file changed, 11 insertions(+), 17 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 a82a57656..5c6c057c5 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
@@ -106,14 +106,10 @@
                                             {% endif %}
                                         </div>
                                     </div>
-                                    <div class="select-price">
-                                        {% set HideStandardPrice = setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' %}
-
+                                    <div class="select-price{{ setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' }}">
                                         <label>
-                                            <span class="{{ HideStandardPrice }}">
-                                                {{ form.fields.standard_price.label }}
-                                                <span class="required">*</span>
-                                            </span>
+                                            {{ form.fields.standard_price.label }}
+                                            <span class="required">*</span>
                                         </label>
 
                                         <div class="col-12 standard-price-hidden d-none">
@@ -123,16 +119,14 @@
                                         </div>
 
                                         <div class="d-flex">
-                                            <span class="w-100 {{ HideStandardPrice }}">
-                                                {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
-                                                <input class="mt-3 border-0 text-right standard-price-field whole-price flex-fill w-100"
-                                                       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">
-                                                {% endif %}
-                                            </span>
+                                            {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
+                                            <input class="mt-3 border-0 text-right standard-price-field whole-price flex-fill"
+                                                   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">
+                                            {% endif %}
                                             <select name="currency" class="mt-3 border-0 ml-2" id="currency" required>
                                                 {% for currency in config_get('streams::currencies.enabled') %}
                                                     <option value="{{ currency }}">

From 975efcd5e0322a525181bb4d9b71674e3ae8719a Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Wed, 19 May 2021 12:18:32 +0300
Subject: [PATCH 2/3] Revert "Revert "#3984 new advs currency bug""

This reverts commit 141dee9d
---
 .../resources/views/new-ad/new-create.twig    | 28 +++++++++++--------
 1 file changed, 17 insertions(+), 11 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 5c6c057c5..a82a57656 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
@@ -106,10 +106,14 @@
                                             {% endif %}
                                         </div>
                                     </div>
-                                    <div class="select-price{{ setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' }}">
+                                    <div class="select-price">
+                                        {% set HideStandardPrice = setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' %}
+
                                         <label>
-                                            {{ form.fields.standard_price.label }}
-                                            <span class="required">*</span>
+                                            <span class="{{ HideStandardPrice }}">
+                                                {{ form.fields.standard_price.label }}
+                                                <span class="required">*</span>
+                                            </span>
                                         </label>
 
                                         <div class="col-12 standard-price-hidden d-none">
@@ -119,14 +123,16 @@
                                         </div>
 
                                         <div class="d-flex">
-                                            {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
-                                            <input class="mt-3 border-0 text-right standard-price-field whole-price flex-fill"
-                                                   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">
-                                            {% endif %}
+                                            <span class="w-100 {{ HideStandardPrice }}">
+                                                {% set standardPriceValue = form.fields.standard_price.value|split('.') %}
+                                                <input class="mt-3 border-0 text-right standard-price-field whole-price flex-fill w-100"
+                                                       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">
+                                                {% endif %}
+                                            </span>
                                             <select name="currency" class="mt-3 border-0 ml-2" id="currency" required>
                                                 {% for currency in config_get('streams::currencies.enabled') %}
                                                     <option value="{{ currency }}">

From d3fc0f4da7e21d15223bbc99c6dddbc2a77331a4 Mon Sep 17 00:00:00 2001
From: Muammer Top <muammer@visiosoft.com.tr>
Date: Wed, 19 May 2021 12:19:42 +0300
Subject: [PATCH 3/3] edited advs import

---
 .../advs-module/src/Adv/AdvsImport.php        | 19 ++++++++++++-------
 1 file changed, 12 insertions(+), 7 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php b/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php
index f54b2f8db..6e16350e0 100644
--- a/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php
+++ b/addons/default/visiosoft/advs-module/src/Adv/AdvsImport.php
@@ -12,13 +12,18 @@ class AdvsImport implements ToModel, WithHeadingRow
 	public function model(array $row)
     {
         if ($row['name'] !== null && $row['price'] !== null && $row['currency'] !== null) {
-            return new AdvModel([
-                'name' => $row['name'],
-                'slug' => Str::slug($row['name']),
-                'advs_desc' => $row['description'],
-                'price' => $row['price'],
-                'currency' => $row['currency'],
-            ]);
+	        return new AdvModel([
+		        'name' => $row['name'],
+		        'slug' => Str::slug($row['name']),
+		        'advs_desc' => $row['description'] ?? null,
+		        'standard_price' => $row['standard_price'] ?? null,
+		        'price' => $row['price'],
+		        'currency' => $row['currency'],
+		        'country' => $row['country'] ?? null,
+		        'city' => $row['city'] ?? null,
+		        'cat1' => $row['cat1'] ?? null,
+		        'cat2' => $row['cat2'] ?? null,
+	        ]);
         }
     }
 }