diff --git a/addons/default/visiosoft/advs-module/migrations/2021_01_06_110331_visiosoft.module.advs__add_doc-files_field.php b/addons/default/visiosoft/advs-module/migrations/2021_01_06_110331_visiosoft.module.advs__add_doc-files_field.php new file mode 100644 index 000000000..72343feed --- /dev/null +++ b/addons/default/visiosoft/advs-module/migrations/2021_01_06_110331_visiosoft.module.advs__add_doc-files_field.php @@ -0,0 +1,26 @@ + 'advs', + ]; + + protected $fields = [ + 'doc_files' => [ + 'type' => 'visiosoft.field_type.media', + 'config' => [ + 'folders' => ["ads_documents"], + 'mode' => 'upload', + ], + ], + ]; + + protected $assignments = [ + 'doc_files' + ]; +} diff --git a/addons/default/visiosoft/advs-module/resources/config/permissions.php b/addons/default/visiosoft/advs-module/resources/config/permissions.php index cead467e5..282f8d0ba 100644 --- a/addons/default/visiosoft/advs-module/resources/config/permissions.php +++ b/addons/default/visiosoft/advs-module/resources/config/permissions.php @@ -46,4 +46,9 @@ return [ 'write', 'delete', ], + 'status' => [ + 'read', + 'write', + 'delete', + ], ]; 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 8ac2928e0..b54f66702 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/sections.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/sections.php @@ -22,14 +22,16 @@ return [ 'fields' => [ 'latest-limit', 'popular_ads_limit', + 'ads_image_limit', 'default_view_type', - 'price_area_hidden', + 'price_area_hidden', 'hide_listing_standard_price', 'hide_zero_price', 'auto_approve', 'estimated_pending_time', 'default_published_time', 'default_GET', + 'get_categories', 'listing_page_image', 'show_ads_count', ], @@ -82,6 +84,7 @@ return [ 'translations' => [ 'title' => 'visiosoft.module.advs::section.translations', 'fields' => [ + 'lang_switcher_for_browser', 'override_text', ], ], 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 70cb3439a..e5bca4a16 100644 --- a/addons/default/visiosoft/advs-module/resources/config/settings/settings.php +++ b/addons/default/visiosoft/advs-module/resources/config/settings/settings.php @@ -153,12 +153,12 @@ return [ 'mode' => 'checkbox' ] ], - 'price_area_hidden' => [ - 'type' => 'anomaly.field_type.boolean', - 'config' => [ - 'default_value' => false, - ] - ], + 'price_area_hidden' => [ + 'type' => 'anomaly.field_type.boolean', + 'config' => [ + 'default_value' => false, + ] + ], 'enabled_currencies' => [ 'bind' => 'streams::currencies.enabled', 'env' => 'ADV_ENABLED_CURRENCIES', @@ -351,15 +351,34 @@ return [ 'env' => 'OVERRIDE_TEXT', ], 'steps_color' => [ - "type" => "anomaly.field_type.colorpicker", + "type" => "anomaly.field_type.colorpicker", "config" => [ "default_value" => '#209579', ] ], 'create_ad_button_color' => [ - "type" => "anomaly.field_type.colorpicker", + "type" => "anomaly.field_type.colorpicker", "config" => [ "default_value" => '#00a651', ] ], + 'ads_image_limit' => [ + "type" => "anomaly.field_type.integer", + "config" => [ + "default_value" => 25 + ] + ], + 'lang_switcher_for_browser' => [ + 'type' => 'anomaly.field_type.boolean', + 'bind' => 'advs.lang_switcher_for_browser', + 'env' => 'LANG_SWITCHER_FOR_BROWSER', + ], + 'get_categories' => [ + 'type' => 'anomaly.field_type.checkboxes', + 'config' => [ + 'options' => function (\Visiosoft\CatsModule\Category\Contract\CategoryRepositoryInterface $categoryRepository) { + return $categoryRepository->mainCats()->pluck('name', 'id')->all(); + }, + ], + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/css/custom.css b/addons/default/visiosoft/advs-module/resources/css/custom.css index 54242c139..c00e602ef 100644 --- a/addons/default/visiosoft/advs-module/resources/css/custom.css +++ b/addons/default/visiosoft/advs-module/resources/css/custom.css @@ -44,4 +44,8 @@ select[name=filter_User] + .select2 { min-width: 20rem; +} + +.navbar-collapse { + padding-left: 15px !important; } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/css/list.css b/addons/default/visiosoft/advs-module/resources/css/list.css index e793b0ebc..1362ec7e4 100644 --- a/addons/default/visiosoft/advs-module/resources/css/list.css +++ b/addons/default/visiosoft/advs-module/resources/css/list.css @@ -224,4 +224,58 @@ a.sort-by-open-dropdown:hover { #listFilterForm .card-header { padding: 5px 0; +} + +.p-3{ + background-color: #f4f4f4; +} + +.card { + border: none; +} + +.py-1 { + padding-top: 3px!important; + padding-bottom: 3px!important; +} + +.px-2 { + padding: 0!important; +} + +.btn-link { + font-weight: bold; +} + +.p-3 { + padding: 8px !important; +} + +.searchbut { + padding: 0px !important; +} + +#main > div > nav { + padding-bottom: 10px !important; +} + +.breadcrumb { + padding: 0px !important; +} +.subbreadcrumb small , .sort-by-selected-text{ + color: black !important; +} + +.img-thumbnail { + padding: 0px; + border: none; +} + +.products-list p { + margin-top: 0; + margin-bottom: 0; +} + +.navbar-collapse { + padding-left: 15px !important; } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/js/admin/advanced.js b/addons/default/visiosoft/advs-module/resources/js/admin/advanced.js new file mode 100644 index 000000000..c94938966 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/js/admin/advanced.js @@ -0,0 +1,32 @@ +function getUrlParameter(sParam) { + var sPageURL = window.location.search.substring(1), + sURLVariables = sPageURL.split('&'), + sParameterName, + i; + + for (i = 0; i < sURLVariables.length; i++) { + sParameterName = sURLVariables[i].split('='); + + if (sParameterName[0] === sParam) { + return sParameterName[1] === undefined ? true : decodeURIComponent(sParameterName[1]); + } + } +}; + + +if (getUrlParameter('view') === "advanced") { + $('.fast-update').on('change', function () { + var advanced_value = $(this).val(), advanced_entry_id = $(this).data('entry_id'), + advanced_column = $(this).data('column'), advanced_type = $(this).attr('type'); + + if (advanced_type === "checkbox") { + advanced_value = ($(this).prop('checked')) ? 1 : 0; + } + + crudAjax({ + 'advanced_column': advanced_column, + 'advanced_entry_id': advanced_entry_id, + 'advanced_value': advanced_value + }, advanced_update_url, 'POST') + }) +} \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/button.php b/addons/default/visiosoft/advs-module/resources/lang/en/button.php index 777bc94d0..88b42946a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/button.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/button.php @@ -43,4 +43,5 @@ return [ 'fast_create' => 'Fast create', 'publish' => 'Publish', 'import' => 'Import', + 'new_status' => 'New Status', ]; 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 e813d5ec7..4f8860df0 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/field.php @@ -165,6 +165,7 @@ return [ 'edit' => 'Edit', 'approve' => 'Approve', 'passive' => "Passive", + 'sold' => 'Sold', 'offered_by' => 'Offered By', 'more_ads_by' => 'More Ads By', 'click_phone' => 'Show phone number', @@ -209,6 +210,7 @@ return [ 'corporate_info' => 'Corporate Info', 'featured_ads' => "Featured Ads", 'trending_ads' => 'Trendind Ads', + 'search_ad_result_prefix' => 'on', 'search_ads_result_message' => [ 'name' => ':count ads found for :name search', ], @@ -280,6 +282,7 @@ return [ "no_location" => "No location is selected.", "continue" => 'Continue', "gallery" => 'Gallery', + "ad" => 'Ad', "ads" => 'Ads', "were_found" => 'were found.', @@ -316,6 +319,7 @@ return [ 'congratulations' => 'Congratulations', 'ad_desc' => 'Ad Description', 'upload_photos' => 'Upload Photos', + 'upload_files' => 'Upload Files', 'additional_fields' => 'Additional Fields', 'ad_location' => 'Ad Location', diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/message.php b/addons/default/visiosoft/advs-module/resources/lang/en/message.php index 3d41352db..60f9ffec9 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/message.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/message.php @@ -29,4 +29,5 @@ return [ 'this_ad_is_not_valid_anymore' => "This ad is not valid anymore!", 'approve_status_change' => "Your Ad's Status Has Been Set to Active!", 'passive_status_change' => "Your Ad's Status Has Been Set to Passive!", + 'sold_status_change' => "Your Ad's Status Has Been Set to Sold!", ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/permission.php b/addons/default/visiosoft/advs-module/resources/lang/en/permission.php index 0a094c9f1..1c540e8b2 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/permission.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/permission.php @@ -97,4 +97,12 @@ return [ 'delete' => 'Can delete option configuration?', ], ], + 'status' => [ + 'name' => 'Status', + 'option' => [ + 'read' => 'Can read status?', + 'write' => 'Can create/edit status?', + 'delete' => 'Can delete status?', + ], + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/section.php b/addons/default/visiosoft/advs-module/resources/lang/en/section.php index 6e1310527..d7f9f96a1 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/section.php @@ -56,4 +56,7 @@ return [ 'title' => 'Configuration', ], 'translations' => 'Translations', + 'status' => [ + 'title' => 'Status', + ], ]; 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 ab4017740..28be23772 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/setting.php @@ -219,4 +219,12 @@ return [ 'name' => 'Create Ad Button Color', 'instructions' => 'Changes the button that shows up when the new ad category selection is finished.' ], + 'lang_switcher_for_browser' => [ + 'name' => 'Lang Switcher For Browser', + 'instructions' => 'Allows you to choose browser language as active language' + ], + 'get_categories' => [ + 'name' => 'GET Categories', + 'instructions' => 'It represents the categories in which the GET property will be valid.' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/stream.php b/addons/default/visiosoft/advs-module/resources/lang/en/stream.php index 761fa569d..d94ccdc24 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/stream.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/stream.php @@ -31,4 +31,7 @@ return [ 'option_configuration' => [ 'name' => 'Configuration', ], + 'status' => [ + 'name' => 'Status', + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/en/view.php b/addons/default/visiosoft/advs-module/resources/lang/en/view.php index 0a174882a..0ba4fe99f 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/view.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/view.php @@ -2,4 +2,5 @@ return [ 'unfinished' => 'Unfinished', + 'advanced' => 'Advanced', ]; 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 40751f2d6..26f95961a 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/field.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/field.php @@ -210,6 +210,7 @@ return [ 'corporate_info' => 'Kurumsal Bilgiler', 'featured_ads' => "Öne Çıkan İlanlar", 'trending_ads' => 'Popüler İlanlar', + 'search_ad_result_prefix' => 'Aramanızda', 'search_ads_result_message' => [ 'name' => ':name aramanızda :count adet ilan bulunmuştur. ', @@ -219,7 +220,7 @@ return [ 'view_cart' => 'Sepeti Görüntüle', 'no_ads' => 'İlan bulunamadı!', 'show_display_mode' => [ - 'map' => 'harita', + 'map' => 'Harita', 'list' => 'Liste', ], 'advs_list_table_thead' => [ @@ -282,6 +283,7 @@ return [ "no_location" => "Lokasyon eklenmemiş.", "continue" => 'Devam Et', "gallery" => 'Galeri', + "ad" => 'İlan', "ads" => 'İlanlar', "were_found" => 'bulundu.', 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 a7fc6b867..c4201db02 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/setting.php @@ -219,4 +219,12 @@ return [ 'name' => 'Reklam Düğmesi Rengi Oluştur', 'instructions' => 'Yeni reklam kategorisi seçimi bittiğinde görünen düğmeyi değiştirir.' ], + 'lang_switcher_for_browser' => [ + 'name' => 'Tarayıcı Diline Geç', + 'instructions' => 'Seçili aktif bir dil olmadığında tarayıcı dilini aktif dil olarak seçmenize izin verir' + ], + 'get_categories' => [ + 'name' => 'GET Kategorileri', + 'instructions' => 'GET özelliğinin geçerli olacağı kategorileri temsil eder.' + ], ]; diff --git a/addons/default/visiosoft/advs-module/resources/lang/tr/view.php b/addons/default/visiosoft/advs-module/resources/lang/tr/view.php index 3f1464b90..b5a71395d 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/tr/view.php +++ b/addons/default/visiosoft/advs-module/resources/lang/tr/view.php @@ -2,4 +2,5 @@ return [ 'unfinished' => 'Bitmemiş', + 'advanced' => 'Gelişmiş', ]; diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig index 3c1678bf9..f7335e0c4 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/detail.twig @@ -36,6 +36,12 @@ + + {% if setting_value('visiosoft.theme.base::ad_details_tab') %} {% if blocks('ad-item-content-block-area') is null %} diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/dropleft-edit.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/dropleft-edit.twig index f8363133d..0fe27f951 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/dropleft-edit.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/dropleft-edit.twig @@ -20,6 +20,12 @@ {{ trans('visiosoft.module.advs::field.passive') }} {% endif %} + {% if adv.status != 'sold' and adv.is_get_adv != '1' %} + + + {{ trans('visiosoft.module.advs::field.sold') }} + + {% endif %} {{ asset_add("styles.css", "visiosoft.module.advs::css/dropleft-edit.css") }} diff --git a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/map.twig b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/map.twig index 5df7ac7b8..4632edc42 100644 --- a/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/map.twig +++ b/addons/default/visiosoft/advs-module/resources/views/ad-detail/partials/map.twig @@ -1,4 +1,3 @@ -

{% if(adv.map_Val == "") %} {{ trans('visiosoft.module.advs::field.no_location') }} {% else %} @@ -51,4 +50,3 @@ {% endif %} -

\ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/resources/views/admin/table/table.twig b/addons/default/visiosoft/advs-module/resources/views/admin/table/table.twig new file mode 100644 index 000000000..c600670e8 --- /dev/null +++ b/addons/default/visiosoft/advs-module/resources/views/admin/table/table.twig @@ -0,0 +1,90 @@ +{{ asset_add("scripts.js", "streams::js/table/table.js") }} + +{% if not actions.empty() %} + {{ asset_add("scripts.js", "streams::js/table/actions.js") }} +{% endif %} + +{% if table.options.sortable %} + {{ asset_add("scripts.js", "streams::js/table/sortable.js") }} +{% endif %} + +
+ + {{ view("streams::table/partials/filters", {'table': table}) }} + {{ view("streams::table/partials/views", {'table': table}) }} + + {{ view(table.options.heading ?: "streams::table/partials/heading", {'table': table}) }} + + {% if not table.rows.empty() %} + {% block card %} +
+ + {{ form_open({ 'url': url_full() }) }} +
+ + + {{ view("streams::table/partials/header", {'table': table}) }} + + {% block body %} + + {% for row in table.rows %} + + + {% if table.options.sortable %} + + {% endif %} + + {% if not table.actions.empty() %} + + {% endif %} + + {% for column in row.columns %} + + {% endfor %} + + + + + {% endfor %} + + + {% endblock %} + + {{ view("streams::table/partials/footer", {'table': table}) }} + +
+ {{ icon('fa fa-arrows handle') }} + + + + + {{ (column.attributes.html) ? column.attributes.html|raw : column.value|raw }} + + {{ buttons(row.buttons)|raw }} +
+
+ {{ form_close() }} + +
+ {% endblock %} + {% else %} + + {% block no_results %} +
+
+ {{ trans(table.options.get('no_results_message', 'streams::message.no_results')) }} +
+
+ {% endblock %} + {% endif %} +
+ 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 9b867ef94..91f262d86 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/list.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/list.twig @@ -26,8 +26,9 @@ "{{ catText }}" {% endif %} + {{ trans('visiosoft.module.advs::field.search_ad_result_prefix')|lower }} - {{ advs.total }} {{ trans('visiosoft.module.advs::field.ads')|lower }} + {{ advs.total }} {{ trans('visiosoft.module.advs::field.ad')|lower }} {{ trans('visiosoft.module.advs::field.were_found') }} diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig index afee7be01..f30dc0eac 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/display-mode.twig @@ -1,4 +1,4 @@ -
+
{% if setting_value('visiosoft.module.location::list_page_location') %}
-
+
-
+
@@ -113,7 +113,7 @@ @@ -159,7 +159,7 @@ @@ -187,7 +187,7 @@
- diff --git a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig index 797959112..4939f0fd1 100644 --- a/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig +++ b/addons/default/visiosoft/advs-module/resources/views/list/partials/price-filter.twig @@ -5,8 +5,8 @@
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 aae1f9309..99dfcc9f1 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 @@ -178,11 +178,20 @@
{{ form.fields.files.input |raw }} + + {% for docs in form.fields.doc_files.value %} +
+ {{ docs.name }} + + +
+
+ {% endfor %}
- {% if count(custom_fields) %} + {% if custom_fields and count(custom_fields) %}
{{ trans('visiosoft.module.advs::field.additional_fields') }}
diff --git a/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/steps.twig b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/steps.twig index 24285d9fe..81d701b3d 100644 --- a/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/steps.twig +++ b/addons/default/visiosoft/advs-module/resources/views/new-ad/partials/steps.twig @@ -23,7 +23,7 @@

- {{ addBlock('new-ad/steps/step', {'step': step})|raw }} + {{ addBlock('new-ad/steps/step', _context)|raw }}
diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php b/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php index 7d4729887..855fa19c0 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvCollection.php @@ -1,8 +1,29 @@ count(); + + return self::paginator($this->forPage($page, $pageSize), $total, $pageSize, $page, [ + 'path' => Paginator::resolveCurrentPath(), + 'pageName' => 'page', + ]); + } + + protected static function paginator($items, $total, $perPage, $currentPage, $options) + { + return Container::getInstance()->makeWith(LengthAwarePaginator::class, compact( + 'items', 'total', 'perPage', 'currentPage', 'options' + )); + } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php index d6bbfe168..b501e7c76 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvModel.php @@ -1,9 +1,9 @@ value('visiosoft.module.advs::free_currencyconverterapi_key'); - $response = $client->get('http://free.currencyconverterapi.com/api/v6/convert?q=' - . $url . '&compact=y&apiKey=' . $freeCurrencyKey); + + $client = new \GuzzleHttp\Client(); + $response = $client->request('GET', 'http://free.currencyconverterapi.com/api/v6/convert', ['query' => [ + 'q' => $url, + 'compact' => 'y', + 'apiKey' => $freeCurrencyKey + ]]); + if ($response->getStatusCode() == '200') { $response = (array)\GuzzleHttp\json_decode($response->getBody()->getContents()); if (!empty($response)) { @@ -132,8 +137,11 @@ class AdvModel extends AdvsAdvsEntryModel implements AdvInterface $foreign_currency[$currencyIn] = $price * $rate; } } - } catch (\Exception $e) { - $this->messages->error((!is_null($e->getMessage())) ? $e->getMessage() : trans('streams::error.500.message')); + } catch (\GuzzleHttp\Exception\ClientException $e) { + $response = $e->getResponse(); + $responseBodyAsString = $response->getBody()->getContents(); + $response = json_decode($responseBodyAsString, true); + $messages->error($response['error']); } } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvObserver.php b/addons/default/visiosoft/advs-module/src/Adv/AdvObserver.php index 982e22883..b16e6d295 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvObserver.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvObserver.php @@ -1,8 +1,15 @@ dispatch(new DeleteOptionConfiguration($entry)); + parent::deleting($entry); + } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php index 72f9efe81..0970d1336 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php +++ b/addons/default/visiosoft/advs-module/src/Adv/AdvRepository.php @@ -11,6 +11,7 @@ use Anomaly\Streams\Platform\Entry\EntryRepository; use Visiosoft\CatsModule\Category\CategoryModel; use Visiosoft\LocationModule\City\CityModel; use Visiosoft\LocationModule\Country\CountryModel; +use Visiosoft\LocationModule\District\DistrictModel; class AdvRepository extends EntryRepository implements AdvRepositoryInterface { @@ -101,20 +102,26 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface if (!empty($param['user'])) { $query = $query->where('advs_advs.created_by_id', $param['user']); } + $currency = setting_value('streams::currency'); + if (!empty($param['currency'])) { - if (!empty($param['min_price'])) { - $num = $param['min_price']; - $int = (int)$num; - $column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') >=" . $int; - $query = $query->whereRaw($column); - } - if (!empty($param['max_price'])) { - $num = $param['max_price']; - $int = (int)$num; - $column = "JSON_EXTRACT(foreign_currencies, '$." . $param['currency'] . "') <=" . $int; - $query = $query->whereRaw($column); - } + $currency = $param['currency']; } + + if (!empty($param['min_price'])) { + $num = $param['min_price']; + $int = (int)$num; + $column = "JSON_EXTRACT(foreign_currencies, '$." . $currency . "') >= " . $int; + $query = $query->whereRaw($column); + } + + if (!empty($param['max_price'])) { + $num = $param['max_price']; + $int = (int)$num; + $column = "JSON_EXTRACT(foreign_currencies, '$." . $currency . "') <= " . $int; + $query = $query->whereRaw($column); + } + if (!empty($param['date'])) { if ($param['date'] === 'day') { $query = $query->where('advs_advs.publish_at', '>=', Carbon::now()->subDay()); @@ -215,12 +222,16 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface { $country = CountryModel::query()->where('location_countries.id', $adv->country_id)->first(); $city = CityModel::query()->where('location_cities.id', $adv->city)->first(); + $district = DistrictModel::query()->where('location_districts.id', $adv->district)->first(); if ($country != null) { $adv->setAttribute('country_name', $country->name); } if ($city != null) { $adv->setAttribute('city_name', $city->name); } + if ($district != null) { + $adv->setAttribute('district_name', $district->name); + } return $adv; } @@ -460,14 +471,22 @@ class AdvRepository extends EntryRepository implements AdvRepositoryInterface return $advs->update(['finish_at' => $newDate]); } - public function getByUsersIDs($usersIDs) + public function getByUsersIDs($usersIDs, $status = 'approved', $withDraft = false) { - return $this + $ads = $this ->newQuery() ->whereIn('advs_advs.created_by_id', $usersIDs) - ->where('advs_advs.slug', '!=', "") - ->where('advs_advs.status', 'approved') ->where('advs_advs.finish_at', '>', date('Y-m-d H:i:s')); + + if ($status) { + $ads = $ads->where('advs_advs.status', 'approved'); + } + + if (!$withDraft) { + $ads = $ads->where('advs_advs.slug', '!=', ""); + } + + return $ads; } public function getPopular() diff --git a/addons/default/visiosoft/advs-module/src/Adv/Command/DeleteOptionConfiguration.php b/addons/default/visiosoft/advs-module/src/Adv/Command/DeleteOptionConfiguration.php new file mode 100644 index 000000000..3f8e0c3ad --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Command/DeleteOptionConfiguration.php @@ -0,0 +1,19 @@ +ad = $ad; + } + + public function handle(OptionConfigurationRepositoryInterface $optionConfigurationRepository) + { + $optionConfigurationRepository->deleteAdsConfigs($this->ad->id); + } +} diff --git a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php index 16984415e..1eaac9dac 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Contract/AdvRepositoryInterface.php @@ -45,7 +45,7 @@ interface AdvRepositoryInterface extends EntryRepositoryInterface public function extendAds($allAds, $isAdmin = false); - public function getByUsersIDs($usersIDs); + public function getByUsersIDs($usersIDs, $status = 'approved', $withDraft = false); public function getPopular(); 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 02b855771..ef1e7e90e 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php @@ -53,7 +53,8 @@ class AdvFormBuilder extends FormBuilder 'class' => 'hidden d-none mapVal' ], 'files', - 'popular_adv', + 'doc_files', + 'popular_adv', 'adv_day', 'product_options_value' ]; diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php index ecc68bbc4..45466ee3b 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableBuilder.php @@ -19,6 +19,11 @@ class AdvTableBuilder extends TableBuilder 'slug' => 'all', 'text' => 'streams::view.all', ], + 'advanced' => [ + 'view' => All::class, + 'slug' => 'advanced', + 'text' => 'module::view.advanced', + ], 'trash', 'unfinished' => [ 'view' => unfinished::class @@ -74,6 +79,7 @@ class AdvTableBuilder extends TableBuilder 'order_by' => [ 'id' => 'DESC', ], + 'table_view' => 'visiosoft.module.advs::admin/table/table' ]; /** @@ -81,6 +87,10 @@ class AdvTableBuilder extends TableBuilder * * @var array */ - protected $assets = []; + protected $assets = [ + 'scripts.js' => [ + 'visiosoft.module.advs::js/admin/advanced.js' + ], + ]; } diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php index 2854914eb..64f303c65 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/AdvTableColumns.php @@ -1,6 +1,7 @@ setColumns([ + $columns = [ 'cover_photo' => [ 'value' => function (EntryInterface $entry) { return ""; - }, + } ], 'name' => [ @@ -59,7 +60,36 @@ class AdvTableColumns 'created_by' => [ 'value' => 'entry.created_by.name', ], - ]); + ]; + + if ($builder->isActiveView('advanced')) { + + unset($columns['created_by'], $columns['country']); + $columns['is_get_adv'] = [ + 'attributes' => [ + 'html' => function (EntryModel $entry) { + $checked = ($entry->is_get_adv) ? 'checked' : ''; + return ''; + } + ], + 'class' => 'advs-price', + ]; + $columns['standard_price'] = [ + 'attributes' => [ + 'html' => function (EntryModel $entry) { + return ''; + } + ], + 'class' => 'advs-price', + ]; + $columns['price']['attributes'] = [ + 'html' => function (EntryModel $entry) { + return ''; + } + ]; + } + + $builder->setColumns($columns); } } diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php b/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php index 6c0e47ff3..c9fc56ce5 100644 --- a/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/Handler/ConvertCurrency.php @@ -13,7 +13,9 @@ class ConvertCurrency extends ActionHandler foreach ($selected as $id) { $entry = $model->newQuery()->find($id); - $model->foreignCurrency($entry->currency, $entry->price, $id, $settingRepository); + if ($entry) { + $model->foreignCurrency($entry->currency, $entry->price, $id, $settingRepository); + } } if ($selected) { $this->messages->success(trans('visiosoft.module.advs::message.currency_converted')); diff --git a/addons/default/visiosoft/advs-module/src/Adv/Table/Views/Advanced.php b/addons/default/visiosoft/advs-module/src/Adv/Table/Views/Advanced.php new file mode 100644 index 000000000..f32c3e23e --- /dev/null +++ b/addons/default/visiosoft/advs-module/src/Adv/Table/Views/Advanced.php @@ -0,0 +1,21 @@ +where('slug', ""); + } + +} diff --git a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php index 947630c53..2005dd80e 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModulePlugin.php @@ -120,4 +120,22 @@ class AdvsModulePlugin extends Plugin ), ]; } + + /** + * Get the filters. + * + * @return array + */ + public function getFilters() + { + return [ + new \Twig_SimpleFilter( + 'ksort', + function (array $array) { + ksort($array); + return $array; + } + ), + ]; + } } diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 88f672aa8..304b2f03a 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -46,6 +46,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@assetsClear', ], 'admin/advs-users/choose/{advId}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@choose', + 'admin/advs/ajax/advanced/advanced-update' => [ + 'as' => 'visiosoft.module.advs::ajax_advanced_update', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@advancedUpdate', + ], 'admin/class/actions/{id}/{type}' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@actions', diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php index 2cf4c14a2..6962e2e4c 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php @@ -204,4 +204,17 @@ class AdvsController extends AdminController { return Excel::download(new AdvsExport(), 'advs-' . time() . '.xlsx'); } + + public function advancedUpdate() + { + if ($this->request->has('advanced_column') and $this->request->has('advanced_entry_id') and $this->request->has('advanced_value')) { + $entry_id = $this->request->get('advanced_entry_id'); + $column = $this->request->get('advanced_column'); + $value = $this->request->get('advanced_value'); + if ($entry = $this->advRepository->find($entry_id)) { + $entry->setAttribute($column, $value); + $entry->save(); + } + } + } } diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php index 2115f408f..6c80d5b12 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/Admin/OptionConfigurationController.php @@ -1,29 +1,27 @@ getUnusedConfigs(); + + if (count($unusedConfigs)) { + $optionConfigurationRepository->deleteUnusedConfigs($unusedConfigs); + } + return $table->render(); } - /** - * Create a new entry. - * - * @param OptionConfigurationFormBuilder $form - * @return \Symfony\Component\HttpFoundation\Response - */ public function create(OptionConfigurationFormBuilder $form) { $form->setOption('redirect', route('visiosoft.module.advs::configrations.index')); 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 9ba164e6f..0ceb41a2f 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -1,5 +1,6 @@ adv_model->is_enabled('customfields')) { $features = app('Visiosoft\CustomfieldsModule\Http\Controller\cfController')->view($adv); } @@ -780,7 +782,8 @@ class AdvsController extends PublicController } } - $adv->is_get_adv = $request->is_get_adv; + $get_categories = in_array($adv->cat1, setting_value('visiosoft.module.advs::get_categories')); + $adv->is_get_adv = ($request->is_get_adv and $get_categories) ? true : false; $adv->save(); //algolia Search Module @@ -980,9 +983,13 @@ class AdvsController extends PublicController $this->adv_model->statusAds($id, $type); event(new ChangedStatusAd($ad));//Create Notify - $message = $type === 'approved' ? - trans('visiosoft.module.advs::message.approve_status_change') - : trans('visiosoft.module.advs::message.passive_status_change'); + if ($type === 'approved') { + $message = trans('visiosoft.module.advs::message.approve_status_change'); + } elseif ($type === 'sold') { + $message = trans('visiosoft.module.advs::message.sold_status_change'); + } else { + trans('visiosoft.module.advs::message.passive_status_change'); + } $this->messages->success($message); return back(); } @@ -1263,4 +1270,13 @@ class AdvsController extends PublicController $this->messages->success(trans('visiosoft.module.advs::message.extended', ['number' => $adsExtended])); return $this->redirect->back(); } + + public function sold($id, Request $request, AdvModel $advModel) + { + if ($request->sold == 'sold') { + $advModel->find($id)->update(['status' => 'sold']); + } elseif ($request->sold = 'not-sold') { + $advModel->find($id)->update(['status' => 'approved']); + } + } } \ No newline at end of file diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php index d483bd89c..400efc70f 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/Contract/OptionConfigurationRepositoryInterface.php @@ -7,4 +7,10 @@ interface OptionConfigurationRepositoryInterface extends EntryRepositoryInterfac public function createConfigration($ad_id,$price,$currency,$stock,$option_json); public function getConf($ad_id); + + public function getUnusedConfigs(); + + public function deleteUnusedConfigs($adsIDs); + + public function deleteAdsConfigs($adID); } diff --git a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php index a471830d6..8a315f90e 100644 --- a/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php +++ b/addons/default/visiosoft/advs-module/src/OptionConfiguration/OptionConfigurationRepository.php @@ -70,4 +70,24 @@ class OptionConfigurationRepository extends EntryRepository implements OptionCon return $configurations; } + + public function getUnusedConfigs() + { + return $this->newQuery() + ->leftJoin('advs_advs as ads', 'advs_option_configuration.parent_adv_id', 'ads.id') + ->whereNull('ads.id') + ->orWhereNotNull('deleted_at') + ->pluck('parent_adv_id') + ->all(); + } + + public function deleteUnusedConfigs($adsIDs) + { + return $this->newQuery()->whereIn('parent_adv_id', $adsIDs)->delete(); + } + + public function deleteAdsConfigs($adID) + { + return $this->newQuery()->where('parent_adv_id', $adID)->delete(); + } } diff --git a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig index 13fa936b5..7464925de 100644 --- a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig +++ b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/list-filter.twig @@ -5,8 +5,8 @@
diff --git a/addons/default/visiosoft/media-field_type/resources/js/upload.js b/addons/default/visiosoft/media-field_type/resources/js/upload.js index 6628f434b..60a15d064 100644 --- a/addons/default/visiosoft/media-field_type/resources/js/upload.js +++ b/addons/default/visiosoft/media-field_type/resources/js/upload.js @@ -3,6 +3,7 @@ Dropzone.autoDiscover = false; $("div#myDrop").dropzone({url: "/file/post"}); var uploaded = $('input[name="files"]').val().split(',').map(Number); +var docsUploaded = $('input[name="doc_files"]').val().split(',').map(Number); $(function () { @@ -16,12 +17,13 @@ $(function () { var dropzone = new Dropzone('.dropzone:not(data-initialized)', { paramName: 'upload', + maxFiles: imageCount, resizeWidth: settings_image['resize_width'], resizeHeight: settings_image['resize_height'], autoProcessQueue: true, parallelUploads: 1, resizeMethod: 'contain', - resizeQuality: 0.8, + resizeQuality: 0.9, url: REQUEST_ROOT_PATH + '/streams/media-field_type/handle', headers: { 'X-CSRF-TOKEN': CSRF_TOKEN @@ -33,8 +35,7 @@ $(function () { formData.append('folder', element.data('folder')); }, renameFile: function (file) { - let newName = new Date().getTime() + '_' + file.name; - return newName; + return new Date().getTime() + '_' + file.name.replace(/ /g, '_'); }, accept: function (file, done) { $.get(REQUEST_ROOT_PATH + '/streams/media-field_type/exists/' + element.data('folder'), {'file': file.name}, function (data) { @@ -67,23 +68,28 @@ $(function () { dropzone.on('success', function (file) { var response = JSON.parse(file.xhr.response); + var mimeType = response.mime_type.split('/') + if (mimeType[0] === 'image'){ + uploaded.push(response.id); - uploaded.push(response.id); + $('.media-selected-wrapper').load( + REQUEST_ROOT_PATH + '/streams/media-field_type/selected?uploaded=' + uploaded.join(','), + function () { + $('input[name="files"]').val(uploaded.join(',')) + } + ); - $('.media-selected-wrapper').load( - REQUEST_ROOT_PATH + '/streams/media-field_type/selected?uploaded=' + uploaded.join(','), - function () { - $('input[name="files"]').val(uploaded.join(',')) - } - ); + file.previewElement.querySelector('[data-dz-uploadprogress]').setAttribute('class', 'progress progress-success'); - file.previewElement.querySelector('[data-dz-uploadprogress]').setAttribute('class', 'progress progress-success'); + setTimeout(function () { - setTimeout(function () { - - addAppendByData(uploaded[0]) - file.previewElement.remove(); - }, 500); + addAppendByData(uploaded[0]) + file.previewElement.remove(); + }, 500); + } else { + docsUploaded.push(response.id); + $('input[name="doc_files"]').val(docsUploaded.join(',')) + } }); // When file fails to upload. @@ -109,6 +115,13 @@ function deleteImage(e, id) { $('.imageList').find('div[data-id="' + id + '"]').remove() } +function deleteDocs(id) { + var key_item = $.inArray(id, docsUploaded); + docsUploaded.splice(key_item, 1); + $('input[name="doc_files"]').val(docsUploaded.join(',')) + $('.doc_list').find('#' + id).remove() +} + function rotateImage(e, id) { e.preventDefault() @@ -150,4 +163,4 @@ function updateQueryStringParameter(uri, key, value) { } else { return uri + separator + key + "=" + value; } -} \ No newline at end of file +} diff --git a/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig b/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig index bb51d1f01..0b85c9875 100644 --- a/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig +++ b/addons/default/visiosoft/media-field_type/resources/views/upload/index.twig @@ -15,6 +15,11 @@