From af16a58773c9bf10f22a21e90f23fd673de753d6 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 7 Aug 2019 12:51:13 +0300 Subject: [PATCH 1/4] Fixed Home Add Cart Icon --- .../src/AdvsModuleServiceProvider.php | 4 ++++ .../src/Http/Controller/advsController.php | 16 ++++++++++++++++ .../resources/views/indexes/index.twig | 6 +++--- 3 files changed, 23 insertions(+), 3 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 0661199a7..4bb696738 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -161,6 +161,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'advs/delete/{id}' => 'Visiosoft\AdvsModule\Http\Controller\advsController@softDeleteAdv', 'check_user' => 'Visiosoft\AdvsModule\Http\Controller\advsController@checkUser', 'keySearch' => 'Visiosoft\AdvsModule\Http\Controller\AjaxController@keySearch', + 'adv/addCart/{id}' => [ + 'as' => 'adv_AddCart', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@advAddCart', + ], 'ajax/StockControl' => [ 'as' => 'adv_stock_control_ajax', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@stockControl', 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 10f990521..723d7bdf1 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -812,6 +812,22 @@ class AdvsController extends PublicController } } + public function advAddCart($id) + { + $quantity = 1; + $thisModel = new AdvModel(); + $adv = $thisModel->isAdv($id); + $response = array(); + if ($adv) { + $cart = $thisModel->addCart($adv, $quantity); + $response['status'] = "success"; + } else { + $response['status'] = "error"; + $response['msg'] = trans('visiosoft.module.advs::message.error_added_cart'); + } + return redirect('/cart/'); + } + public function addCart(Request $request) { $id = $request->id; diff --git a/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig b/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig index b19ecfc24..2fb326540 100644 --- a/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig +++ b/addons/default/visiosoft/default-theme/resources/views/indexes/index.twig @@ -146,7 +146,7 @@
{% if adv.is_get_adv == "1" %} - {% endif %} @@ -235,7 +235,7 @@
{% if adv.is_get_adv == "1" %} - {% endif %} @@ -297,7 +297,7 @@
{% if adv.is_get_adv == "1" %} - {% endif %} From 37d43195710e09c4b0183bad887eab9389162b62 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 7 Aug 2019 13:31:04 +0300 Subject: [PATCH 2/4] Fixed CustomField Range Field Type && Added Admin Panel Settings Assets Clear --- .../advs-module/resources/lang/en/section.php | 3 +++ .../default/visiosoft/advs-module/src/AdvsModule.php | 4 ++++ .../advs-module/src/AdvsModuleServiceProvider.php | 10 ++++++++++ .../src/Http/Controller/Admin/AdvsController.php | 10 ++++++++++ 4 files changed, 27 insertions(+) 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 f93c4d4f2..2034fdc7b 100644 --- a/addons/default/visiosoft/advs-module/resources/lang/en/section.php +++ b/addons/default/visiosoft/advs-module/resources/lang/en/section.php @@ -33,5 +33,8 @@ return [ ], 'fields' => [ 'title' => 'Custom Fields' + ], + 'assets_clear' => [ + 'name' => 'Assets Clear' ] ]; diff --git a/addons/default/visiosoft/advs-module/src/AdvsModule.php b/addons/default/visiosoft/advs-module/src/AdvsModule.php index bfcc92093..3512f71d5 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModule.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModule.php @@ -32,6 +32,10 @@ class AdvsModule extends Module ], ], ], + 'assets_clear' => [ + 'title' => 'visiosoft.module.advs::section.assets_clear.name', + 'href' => '/admin/assets/clear', + ] // 'custom_fields' => [ // 'buttons' => [ // 'new_custom_field', diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index 4bb696738..b4c98be50 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -181,6 +181,10 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'as' => 'visiosoft.module.advs::view_type', 'uses' => 'Visiosoft\AdvsModule\Http\Controller\advsController@viewType', ], + 'admin/assets/clear' => [ + 'as' => 'assets_clear', + 'uses' => 'Visiosoft\AdvsModule\Http\Controller\Admin\AdvsController@assetsClear', + ], ]; /** @@ -313,7 +317,13 @@ class AdvsModuleServiceProvider extends AddonServiceProvider 'title' => 'visiosoft.module.advs::button.general_settings', 'href' => '/admin/settings/modules/visiosoft.module.advs', ]; + $slug2 = 'assets_clear'; + $section2 = [ + 'title' => 'visiosoft.module.advs::section.assets_clear.name', + 'href' => '/admin/assets/clear', + ]; $addonCollection->get('anomaly.module.settings')->addSection($slug, $section); + $addonCollection->get('anomaly.module.settings')->addSection($slug2, $section2); } /** 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 eae6268ae..4e87c91b7 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 @@ -2,10 +2,12 @@ use Anomaly\SettingsModule\Setting\Contract\SettingRepositoryInterface; +use Anomaly\Streams\Platform\Application\Application; use Anomaly\Streams\Platform\Entry\Contract\EntryInterface; use Anomaly\Streams\Platform\Model\Advs\AdvsAdvsEntryModel; use Anomaly\Streams\Platform\Model\Cats\CatsCategoryEntryModel; use Anomaly\Streams\Platform\Model\Users\UsersUsersEntryModel; +use Illuminate\Filesystem\Filesystem; use Visiosoft\AdvsModule\Adv\Table\Filter\CategoryFilterQuery; use Visiosoft\AdvsModule\Adv\Table\Filter\CityFilterQuery; use Visiosoft\AdvsModule\Adv\Table\Filter\UserFilterQuery; @@ -169,4 +171,12 @@ class AdvsController extends AdminController $events->dispatch(new ChangeStatusAd($id, $settings));//Create Notify return back(); } + + public function assetsClear(Filesystem $files, Application $application) + { + $directory = 'assets'; + $files->deleteDirectory($directory = $application->getAssetsPath($directory), true); + echo "

Success

" . "
"; + echo "Return Admin Panel"; + } } From 077bc02a72f87debb68359ab916f8518fb23fe13 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 8 Aug 2019 14:21:53 +0300 Subject: [PATCH 3/4] added user adv listing page banner default --- .../profile-module/src/ProfileModuleSeeder.php | 16 ++++++++++++++++ 1 file changed, 16 insertions(+) diff --git a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php index ef8ad0d1e..9d9fbaaf5 100644 --- a/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php +++ b/addons/default/visiosoft/profile-module/src/ProfileModuleSeeder.php @@ -3,6 +3,9 @@ use Anomaly\FilesModule\Disk\Contract\DiskRepositoryInterface; use Anomaly\FilesModule\Folder\Contract\FolderRepositoryInterface; use Anomaly\Streams\Platform\Database\Seeder\Seeder; +use Illuminate\Database\Eloquent\Model; +use Chumper\Zipper\Zipper; + use Illuminate\Support\Facades\DB; @@ -57,6 +60,19 @@ class ProfileModuleSeeder extends Seeder ], ] ); + + + + $repository = "https://raw.githubusercontent.com/openclassify/Openclassify-Demo-Data/master/"; + file_put_contents(__DIR__ . "/advListingPage.sql", fopen($repository . "advListingPage.sql", 'r')); + file_put_contents("adv_listing_page.zip", fopen($repository . "adv_listing_page.zip", 'r')); + $zipper = new Zipper(); + $zipper->make('adv_listing_page.zip')->folder('adv_listing_page')->extractTo(base_path() . '/public/app/default/files-module/local/adv_listing_page/'); + $zipper->close(); + + Model::unguard(); + DB::unprepared(file_get_contents(__DIR__ . '/advListingPage.sql')); + Model::reguard(); } } \ No newline at end of file From f01625d79ce4be71fd87244707356af2d808765c Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 8 Aug 2019 16:11:56 +0300 Subject: [PATCH 4/4] #321 --- .../visiosoft/advs-module/resources/js/list-item.js | 7 ------- 1 file changed, 7 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/list-item.js b/addons/default/visiosoft/advs-module/resources/js/list-item.js index 04cb9d9e8..d2207400c 100644 --- a/addons/default/visiosoft/advs-module/resources/js/list-item.js +++ b/addons/default/visiosoft/advs-module/resources/js/list-item.js @@ -1,9 +1,5 @@ -$('#complaints').on('click', function () { - $('#complaints_modal').modal('toggle'); -}); - $('#message').on('click', function () { if ($('#adv_id').data('content') == $('#message').data('content')) { alert("You can't send messages to your own ad.") @@ -32,9 +28,6 @@ $('#message-button').on('click', function () { }); }); -$('#complaint-radio').on('click', function () { - $(this).closest("textarea").toggle(); -}); function openVideo(){