hotstovejer/openclassify
0
0
Fork 0
mirror of https://github.com/openclassify/openclassify.git synced 2026-01-24 22:11:01 -06:00
Code Issues Actions Packages Projects Releases Wiki Activity

Merge pull request #810 from openclassify/dia

Browse Source 
#2725 [advs-module] Add option to remove decimal field when creating …
This commit is contained in:
Fatih Alp 2020-11-23 17:29:54 +03:00 committed by GitHub
commit a1a9a32e2a
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 11 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
addons/default/visiosoft/advs-module/resources/views/new-ad/new-create.twig
View File

@ -102,10 +102,12 @@
<div class="col-8 pr-0 col-md-3"> <div class="col-8 pr-0 col-md-3">
<input class="form-control priceField whole-price" value="{{ PriceValue|first }}"> <input class="form-control priceField whole-price" value="{{ PriceValue|first }}">
</div> </div>
<div class="col-4 col-md-1"> {% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
<input class="form-control priceDecimalField decimal-price" placeholder="00" maxlength="2" <div class="col-4 col-md-1">
value="{{ PriceValue[1] }}"> <input class="form-control priceDecimalField decimal-price" placeholder="00" maxlength="2"
</div> value="{{ PriceValue[1] }}">
</div>
{% endif %}
<div class="col-sm-3 col-xs-6"> <div class="col-sm-3 col-xs-6">
<select name="currency" class="custom-select form-control" data-field="currency" <select name="currency" class="custom-select form-control" data-field="currency"
data-field_name="currency" data-provides="anomaly.field_type.select" data-field_name="currency" data-provides="anomaly.field_type.select"

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

@ -491,6 +491,7 @@ class AdvsController extends PublicController
return $this->redirect->route('visiosoft.module.advs::list'); return $this->redirect->route('visiosoft.module.advs::list');
} }
$complaints = null;
if ($this->adv_model->is_enabled('complaints')) { if ($this->adv_model->is_enabled('complaints')) {
$complaints = ComplaintsComplainTypesEntryModel::all(); $complaints = ComplaintsComplainTypesEntryModel::all();
} }
@ -580,7 +581,7 @@ class AdvsController extends PublicController
if ($adv->created_by_id == isset(auth()->user()->id) or $adv->status == "approved") { if ($adv->created_by_id == isset(auth()->user()->id) or $adv->status == "approved") {
return $this->view->make('visiosoft.module.advs::ad-detail/detail', compact('adv', 'complaints', return $this->view->make('visiosoft.module.advs::ad-detail/detail', compact('adv', 'complaints',
'recommended_advs', 'categories', 'features', 'comments', 'qrSRC', 'options', 'configurations')); 'recommended_advs', 'categories', 'features', 'options', 'configurations'));
} else { } else {
return back(); return back();
} }
@ -624,7 +625,7 @@ class AdvsController extends PublicController
} }
return $this->view->make('visiosoft.module.advs::new-ad/preview/preview', return $this->view->make('visiosoft.module.advs::new-ad/preview/preview',
compact('adv', 'categories', 'features', 'isActiveDopings', 'configurations')); compact('adv', 'categories', 'features', 'isActiveDopings'));
} }
public function getLocations() public function getLocations()
@ -920,6 +921,7 @@ class AdvsController extends PublicController
$options = $this->optionRepository->findAllBy('adv_id', $id); $options = $this->optionRepository->findAllBy('adv_id', $id);
//Cloudinary Module //Cloudinary Module
$Cloudinary = null;
$isActiveCloudinary = $this->adv_model->is_enabled('cloudinary'); $isActiveCloudinary = $this->adv_model->is_enabled('cloudinary');
if ($isActiveCloudinary) { if ($isActiveCloudinary) {
$CloudinaryModel = new VideoModel(); $CloudinaryModel = new VideoModel();
@ -939,7 +941,7 @@ class AdvsController extends PublicController
return $this->view->make( return $this->view->make(
'visiosoft.module.advs::new-ad/new-create', 'visiosoft.module.advs::new-ad/new-create',
compact('id', 'cats_d', 'cats', 'Cloudinary', 'cities', 'adv', 'custom_fields', 'options') compact('id', 'cats_d', 'cats', 'Cloudinary', 'adv', 'custom_fields', 'options')
); );
} }