hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-02-10 23:36:08 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #969 from openclassify/vedatakd

Browse Source 
Fixed AdBlock error
This commit is contained in:
Muammer Top 2021-02-26 15:40:25 +03:00 committed by GitHub
commit b95d4ebf87
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
7 changed files with 26 additions and 33 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
addons/default/visiosoft/advs-module/resources/js/admin/advanced.js
View File

@ -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')
})
}

2
addons/default/visiosoft/advs-module/resources/views/admin/table/table.twig
View File

@ -86,5 +86,5 @@
{% endif %}
</div>
<script>
var advanced_update_url = "{{ url_route('visiosoft.module.advs::ajax_advanced_update') }}";
var advanced_update_url = "{{ url_route('visiosoft.module.advs::ajax_multiple_update') }}";
</script>

4
addons/default/visiosoft/advs-module/src/AdvsModuleServiceProvider.php
View File

@ -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',

8
addons/default/visiosoft/advs-module/src/Http/Controller/Admin/AdvsController.php
View File

@ -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();

6
addons/default/visiosoft/advs-module/src/Http/Controller/OptionConfigurationController.php
View File

@ -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'));
}

31
addons/default/visiosoft/advs-module/src/Http/Controller/advsController.php
View File

@ -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;
}

2
addons/default/visiosoft/location-module/resources/views/ads-list/partials/location-fields.twig
View File

@ -124,5 +124,5 @@
<script>
var null_msg = "{{ trans('visiosoft.module.location::message.null_msg') }}!"
var defaultCountry = {{ defaultCountry }}
var defaultCountry = "{{ defaultCountry }}"
</script>