From a3d22d972b48ae1ae0dfd514f003e6d015a0a68d Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 24 Feb 2021 12:16:05 +0300 Subject: [PATCH 1/3] completed checkout for customer without translate --- .../OptionConfigurationController.php | 6 ++-- .../src/Http/Controller/advsController.php | 31 ++++++++----------- 2 files changed, 15 insertions(+), 22 deletions(-) diff --git a/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php index 6c1b0a8ba..14d1b456c 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php @@ -46,12 +46,10 @@ class OptionConfigurationController extends PublicController { $conf->name = $conf->getName(); - $this->adv_model->authControl(); - if ($conf->stock < $this->request->quantity){ - return redirect()->back()->with('warning', [trans('visiosoft.module.carts::message.error1in2')]); + return redirect()->back()->with('warning', [trans('visiosoft.module.carts::message.error1in2')]); }else{ - $cart = $this->dispatch(new GetCart()); + $cart = $this->dispatch(new GetCart()); $cart->add($conf, $this->request->quantity); return $this->redirect->to(route('visiosoft.module.carts::cart')); } 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 a5a7a9389..fc02329eb 100644 --- a/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php +++ b/addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php @@ -1189,26 +1189,21 @@ class AdvsController extends PublicController public function addCart(Request $request) { - if (\auth()->check()) { - $id = $request->id; - $quantity = $request->quantity; - $name = $request->name; - $thisModel = new AdvModel(); - $adv = $thisModel->isAdv($id); - $response = array(); - if ($adv) { - $cart = $thisModel->addCart($adv, $quantity, $name); - $response['status'] = "success"; - $count = $cart->getItems()->count; - $response['count'] = $count; - } else { - $response['status'] = "error"; - $response['msg'] = trans('visiosoft.module.advs::message.error_added_cart'); - } + $id = $request->id; + $quantity = $request->quantity; + $name = $request->name; + $thisModel = new AdvModel(); + $adv = $thisModel->isAdv($id); + $response = array(); + if ($adv) { + $cart = $thisModel->addCart($adv, $quantity, $name); + $response['status'] = "success"; + $count = $cart->getItems()->count; + $response['count'] = $count; } else { - $response['status'] = "guest"; + $response['status'] = "error"; + $response['msg'] = trans('visiosoft.module.advs::message.error_added_cart'); } - return $response; } From 0b0bf71f5d5b4486ba0019c349c8fa7b0fc862b0 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Wed, 24 Feb 2021 17:04:19 +0300 Subject: [PATCH 2/3] fixed AdBlock error --- .../visiosoft/advs-module/resources/js/admin/advanced.js | 6 +++--- .../advs-module/resources/views/admin/table/table.twig | 2 +- .../advs-module/src/AdvsModuleServiceProvider.php | 4 ++-- .../src/Http/Controller/Admin/AdvsController.php | 8 ++++---- 4 files changed, 10 insertions(+), 10 deletions(-) diff --git a/addons/default/visiosoft/advs-module/resources/js/admin/advanced.js b/addons/default/visiosoft/advs-module/resources/js/admin/advanced.js index c94938966..b7b832bab 100644 --- a/addons/default/visiosoft/advs-module/resources/js/admin/advanced.js +++ b/addons/default/visiosoft/advs-module/resources/js/admin/advanced.js @@ -24,9 +24,9 @@ if (getUrlParameter('view') === "advanced") { } crudAjax({ - 'advanced_column': advanced_column, - 'advanced_entry_id': advanced_entry_id, - 'advanced_value': advanced_value + 'edit_column': advanced_column, + 'edit_entry_id': advanced_entry_id, + 'edit_value': advanced_value }, advanced_update_url, 'POST') }) } \ 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 index c600670e8..ac310ce5b 100644 --- a/addons/default/visiosoft/advs-module/resources/views/admin/table/table.twig +++ b/addons/default/visiosoft/advs-module/resources/views/admin/table/table.twig @@ -86,5 +86,5 @@ {% endif %} diff --git a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php index ccfcbb300..556294a6e 100644 --- a/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php +++ b/addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php @@ -50,8 +50,8 @@ 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', + 'admin/ajax/multiple/multiple-update' => [ + 'as' => 'visiosoft.module.advs::ajax_multiple_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 6962e2e4c..82244905c 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 @@ -207,10 +207,10 @@ class AdvsController extends AdminController 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 ($this->request->has('edit_column') and $this->request->has('edit_entry_id') and $this->request->has('edit_value')) { + $entry_id = $this->request->get('edit_entry_id'); + $column = $this->request->get('edit_column'); + $value = $this->request->get('edit_value'); if ($entry = $this->advRepository->find($entry_id)) { $entry->setAttribute($column, $value); $entry->save(); From a71d4c34c3253a3eab4c12d6ab835247cf712e24 Mon Sep 17 00:00:00 2001 From: vedatakd Date: Thu, 25 Feb 2021 17:22:31 +0300 Subject: [PATCH 3/3] fixed country error --- .../resources/views/ads-list/partials/location-fields.twig | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig index 48771252c..a347159e5 100644 --- a/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig +++ b/addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig @@ -124,5 +124,5 @@