From f17af048a9916880c35a4f45b79647a9196f7af4 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Fri, 17 Jan 2020 15:16:23 +0300
Subject: [PATCH 1/3] direction

---
 resources/streams/config/currencies.php | 46 ++++++++++++-------------
 1 file changed, 23 insertions(+), 23 deletions(-)

diff --git a/resources/streams/config/currencies.php b/resources/streams/config/currencies.php
index da0f58383..56af89aa9 100644
--- a/resources/streams/config/currencies.php
+++ b/resources/streams/config/currencies.php
@@ -49,7 +49,7 @@ return [
         ],
         'TRY' => [
             'name' => 'Türk Lirası',
-            'direction' => 'ltr',
+            'direction' => 'rtl',
             'symbol' => 'TL',
             'separator' => ',',
             'point' => '.',
@@ -105,7 +105,7 @@ return [
         ],
         'AUD' => [
             'name' => 'Australian Dollar',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -137,7 +137,7 @@ return [
         ],
         'BBD' => [
             'name' => 'Barbados Dollar',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -177,7 +177,7 @@ return [
         ],
         'BMD' => [
             'name' => 'Bermudian Dollar',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -185,7 +185,7 @@ return [
         ],
         'BND' => [
             'name' => 'Brunei Dollar',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -209,7 +209,7 @@ return [
         ],
         'BSD' => [
             'name' => 'Bahamian Dollar',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -241,7 +241,7 @@ return [
         ],
         'BZD' => [
             'name' => 'Belize Dollar',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -249,7 +249,7 @@ return [
         ],
         'CAD' => [
             'name' => 'Canadian Dollar',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -273,7 +273,7 @@ return [
         ],
         'CLP' => [
             'name' => 'Chilean Peso',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -289,7 +289,7 @@ return [
         ],
         'COP' => [
             'name' => 'Colombian Peso',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -305,7 +305,7 @@ return [
         ],
         'CUP' => [
             'name' => 'Cuban Peso',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -313,7 +313,7 @@ return [
         ],
         'CVE' => [
             'name' => 'Cape Verde Escudo',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -345,7 +345,7 @@ return [
         ],
         'DOP' => [
             'name' => 'Dominican Peso',
-            'direction' => 'rtr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
@@ -361,11 +361,11 @@ return [
         ],
         'EGP' => [
             'name' => 'Egyptian Pound',
-            'direction' => 'ltr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
-            'symbol' => '£',
+            'symbol' => 'EGP',
         ],
         'ERN' => [
             'name' => 'Nakfa',
@@ -401,11 +401,11 @@ return [
         ],
         'FKP' => [
             'name' => 'Falkland Islands Pound',
-            'direction' => 'ltr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
-            'symbol' => '£',
+            'symbol' => 'FKP',
         ],
         'GBP' => [
             'name' => 'Pound Sterling',
@@ -433,11 +433,11 @@ return [
         ],
         'GIP' => [
             'name' => 'Gibraltar Pound',
-            'direction' => 'ltr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
-            'symbol' => '£',
+            'symbol' => 'GIP',
         ],
         'GMD' => [
             'name' => 'Dalasi',
@@ -985,11 +985,11 @@ return [
         ],
         'SDG' => [
             'name' => 'Sudanese Pound',
-            'direction' => 'ltr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
-            'symbol' => '£',
+            'symbol' => 'SDG',
         ],
         'SEK' => [
             'name' => 'Swedish Krona',
@@ -1009,11 +1009,11 @@ return [
         ],
         'SHP' => [
             'name' => 'Saint Helena Pound',
-            'direction' => 'ltr',
+            'direction' => 'rtl',
             'separator' => ',',
             'point' => '.',
             'decimals' => 2,
-            'symbol' => '£',
+            'symbol' => 'SHP',
         ],
         'SLL' => [
             'name' => 'Leone',

From c815dab5e7ad4b4407b1bfcb94a64d2af78f3c24 Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Fri, 17 Jan 2020 15:41:36 +0300
Subject: [PATCH 2/3] fixed pagination request parameters

---
 .../resources/views/list/partials/ads.twig    |  1 -
 .../resources/views/list/table.twig           | 32 ++++++++-----------
 .../resources/views/new-ad/new-create.twig    |  2 +-
 3 files changed, 14 insertions(+), 21 deletions(-)

diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
index adffe2240..e2e1353ec 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/ads.twig
@@ -32,4 +32,3 @@
         </a>
     </div>
 {% endfor %}
-{{ advs.links()|raw }}
\ No newline at end of file
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 0b35bcc8c..ae5eefb98 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/table.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/table.twig
@@ -4,23 +4,22 @@
 
         <table class="table classified-list-table">
             <thead>
-            <tr>
-                <th scope="col" colspan="2"
-                    class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }}</th>
-                <th scope="col"
-                    class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }}</th>
-                <th scope="col"
-                    class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }}</th>
-                {% if setting_value('visiosoft.module.location::list_page_location') %}
+                <tr>
+                    <th scope="col" colspan="2"
+                        class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.name') }}</th>
                     <th scope="col"
-                        class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }}
-                        / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
-                {% endif %}
-                {{ addBlock('ads-list/table-column',{'seenList':seenList})|raw }}
-            </tr>
+                        class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.price') }}</th>
+                    <th scope="col"
+                        class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.publish_at') }}</th>
+                    {% if setting_value('visiosoft.module.location::list_page_location') %}
+                        <th scope="col"
+                            class="text-center align-middle">{{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_city') }}
+                            / {{ trans('visiosoft.module.advs::field.advs_list_table_thead.location_country') }}</th>
+                    {% endif %}
+                    {{ addBlock('ads-list/table-column',{'seenList':seenList})|raw }}
+                </tr>
             </thead>
             <tbody>
-
             {% for adv in advs %}
                 <tr class="text-center clickable-row" data-href='{{ adv.detail_url }}'>
                     <td class="justify-content-center align-middle text-center td-image">
@@ -49,15 +48,10 @@
                     {{ addBlock('ads-list/table-row',{'seenList':seenList,'adv':adv})|raw }}
                 </tr>
             {% endfor %}
-
-
             <!--Table Rows-->
-
-
             </tbody>
         </table>
     </div>
-    {{ advs.links()|raw }}
 
 {% endblock %}
 {% block customjs %}
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 8cfff0fcf..907915612 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
@@ -114,7 +114,7 @@
         var default_city = "{{ setting_value('visiosoft.module.advs::default_city') }}";
         var default_district = "{{ setting_value('visiosoft.module.advs::default_district') }}";
         var default_neighborhood = "{{ setting_value('visiosoft.module.advs::default_neighborhood') }}";
-        var default_currency = "{{ setting_value('visiosoft.module.advs::default_currency') }}";
+        var default_currency = "{{ setting_value('streams::currency') }}";
         var default_GET = "{{ setting_value('visiosoft.module.advs::default_GET') }}";
         var adv_id = "{{ id }}";
     </script>

From 9cd85ac509411b9be2b82f9962d38aaa9566a40c Mon Sep 17 00:00:00 2001
From: vedatakd <vedat@vebze.com>
Date: Fri, 17 Jan 2020 15:46:14 +0300
Subject: [PATCH 3/3] include pagination

---
 .../visiosoft/advs-module/resources/views/list/list.twig     | 5 ++---
 .../resources/views/list/partials/pagination.twig            | 3 +++
 2 files changed, 5 insertions(+), 3 deletions(-)
 create mode 100644 addons/default/visiosoft/advs-module/resources/views/list/partials/pagination.twig

diff --git a/addons/default/visiosoft/advs-module/resources/views/list/list.twig b/addons/default/visiosoft/advs-module/resources/views/list/list.twig
index d2ed6b68c..7739126be 100644
--- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig
+++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig
@@ -34,9 +34,8 @@
                                 {% include "visiosoft.module.advs::list/partials/ads" %}
                             {% endblock %}
                         </div>
-                        <div class="d-flex justify-content-center">
-                            {{ advs.appends(request_query()).links()|raw }}
-                        </div>
+                        {% include "visiosoft.module.advs::list/partials/pagination" %}
+
                         {#                        <div class="category-tabs"></div>#}
                     </div>
                 </div>
diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/pagination.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/pagination.twig
new file mode 100644
index 000000000..40625b560
--- /dev/null
+++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/pagination.twig
@@ -0,0 +1,3 @@
+<div class="d-flex justify-content-center">
+    {{ advs.appends(request_query()).links()|raw }}
+</div>
\ No newline at end of file