From b3e930d692df3b280a34c12a18043146bdeeb5a4 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 12 Apr 2021 12:51:41 +0300 Subject: [PATCH 1/4] fix category text title --- .../advs-module/src/Http/Controller/advsController.php | 4 ++-- 1 file changed, 2 insertions(+), 2 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 30faf9bc9..c990523f1 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -409,12 +409,12 @@ class AdvsController extends PublicController if ($city) { $catText = "$city->name $catText"; } elseif (count($mainCats) == 1 || count($mainCats) == 2) { - $catText = end($mainCats)['val']; + $catText = end($mainCats)->name; } elseif (count($mainCats) > 2) { $catArray = array_slice($mainCats, 2); $loop = 0; foreach ($catArray as $cat) { - $catText = !$loop ? $catText . $cat['val'] : $catText . ' ' . $cat['val']; + $catText = !$loop ? $catText . $cat->name : $catText . ' ' . $cat->name; $loop++; } } From f87a76354f3820e79c752643715c8b0fe84f97b6 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Mon, 12 Apr 2021 15:36:52 +0300 Subject: [PATCH 2/4] fix store listing design and translation --- .../views/list/partials/mobile-list.twig | 34 +++++++++++-------- 1 file changed, 19 insertions(+), 15 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig index 54bff7527..072a019ba 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/mobile-list.twig @@ -1,22 +1,26 @@
- {% include "visiosoft.module.advs::list/partials/mobile-breadcrumb" %} + {% if not hideBreadcrump %} + {% include "visiosoft.module.advs::list/partials/mobile-breadcrumb" %} + {% endif %} + + {% if not hideActions %} +
+
+ {{ img('visiosoft.module.advs::images/listing/mobile-filter.svg').data|raw }} +

{{ trans('visiosoft.module.advs::field.filter') }}

+
+
+
+ {{ img('visiosoft.module.advs::images/listing/mobile-sort.svg').data|raw }} +

{{ trans('visiosoft.module.advs::field.sort') }}

+
+
+ + {{ addBlock('ads-list/mobile/action-bar')|raw }} -
-
- {{ img('visiosoft.module.advs::images/listing/mobile-filter.svg').data|raw }} -

{{ trans('visiosoft.module.advs::field.filter') }}

-
-
- {{ img('visiosoft.module.advs::images/listing/mobile-sort.svg').data|raw }} -

{{ trans('visiosoft.module.advs::field.sort') }}

-
-
- - {{ addBlock('ads-list/mobile/action-bar')|raw }} - -
+ {% endif %}
{% for adv in advs %} From eab3885dc498f1a1ec00e984be4d5334135cbb39 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 14 Apr 2021 09:53:15 +0300 Subject: [PATCH 3/4] #3699 province district add button --- .../location-module/resources/lang/en/message.php | 1 + .../resources/views/admin/fields/choose.twig | 10 ++++------ .../src/Http/Controller/Admin/CitiesController.php | 8 ++++++++ .../visiosoft/location-module/src/LocationModule.php | 10 +++++++++- 4 files changed, 22 insertions(+), 7 deletions(-) diff --git a/addons/default/visiosoft/location-module/resources/lang/en/message.php b/addons/default/visiosoft/location-module/resources/lang/en/message.php index aacc0275b..7b4d2e7bf 100644 --- a/addons/default/visiosoft/location-module/resources/lang/en/message.php +++ b/addons/default/visiosoft/location-module/resources/lang/en/message.php @@ -3,4 +3,5 @@ return [ 'placeholder' => 'Type here to search', 'null_msg' => 'Not Found', + 'choose_country' => 'Choose a Country', ]; diff --git a/addons/default/visiosoft/location-module/resources/views/admin/fields/choose.twig b/addons/default/visiosoft/location-module/resources/views/admin/fields/choose.twig index 6e730b616..58fe3f837 100644 --- a/addons/default/visiosoft/location-module/resources/views/admin/fields/choose.twig +++ b/addons/default/visiosoft/location-module/resources/views/admin/fields/choose.twig @@ -2,7 +2,7 @@ -

{{ trans('visiosoft.module.advs::message.choose_field_type') }}

+

{{ trans('visiosoft.module.location::message.choose_country') }}

@@ -10,12 +10,10 @@ {% include "streams::modals/filter" %}
    - {% for field_type in field_types %} + {% for country in countries %}
  • - - {{ trans(field_type.getTitle()) }} -
    - {{ trans(field_type.getDescription()) }} +     + {{ country.name }}
    • {% endfor %} diff --git a/addons/default/visiosoft/location-module/src/Http/Controller/Admin/CitiesController.php b/addons/default/visiosoft/location-module/src/Http/Controller/Admin/CitiesController.php index 6ed43feb3..80d39d931 100644 --- a/addons/default/visiosoft/location-module/src/Http/Controller/Admin/CitiesController.php +++ b/addons/default/visiosoft/location-module/src/Http/Controller/Admin/CitiesController.php @@ -5,6 +5,7 @@ use Visiosoft\LocationModule\City\CityModel; use Visiosoft\LocationModule\City\Form\CityFormBuilder; use Visiosoft\LocationModule\City\Table\CityTableBuilder; use Anomaly\Streams\Platform\Http\Controller\AdminController; +use Visiosoft\LocationModule\Country\Contract\CountryRepositoryInterface; use Visiosoft\LocationModule\District\DistrictModel; class CitiesController extends AdminController @@ -32,6 +33,13 @@ class CitiesController extends AdminController return $table->render(); } + public function choose(CountryRepositoryInterface $countryRepository) + { + $countries = $countryRepository->all(); + + return $this->view->make('visiosoft.module.location::admin/fields/choose', ['countries' => $countries]); + } + public function create(CityFormBuilder $form) { $form->setCountry($this->request->get('cities')); diff --git a/addons/default/visiosoft/location-module/src/LocationModule.php b/addons/default/visiosoft/location-module/src/LocationModule.php index 1aa429a9a..8d55369fe 100644 --- a/addons/default/visiosoft/location-module/src/LocationModule.php +++ b/addons/default/visiosoft/location-module/src/LocationModule.php @@ -14,7 +14,15 @@ class LocationModule extends Module 'new_country', ], ], - 'cities', + 'cities' => [ + 'buttons' => [ + 'new_city' => [ + 'data-toggle' => 'modal', + 'data-target' => '#modal', + 'href' => 'admin/location/cities/choose', + ], + ], + ], 'districts', 'neighborhoods', 'village', From 294f769f4a9e265d1912e3fd6525fbd8cf46e012 Mon Sep 17 00:00:00 2001 From: Diatrex Date: Wed, 14 Apr 2021 10:31:29 +0300 Subject: [PATCH 4/4] change dev username --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index 47c4944c3..e4c6641aa 100644 --- a/README.md +++ b/README.md @@ -136,7 +136,7 @@ Emek Sancar @emeksancar Ozcan Durak @ozcandurak -Dia @Diatrex +Dia @diashalabi ## Thanks to