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 branch 'dia' of https://github.com/openclassify/openclassify

Browse Source
This commit is contained in:
Diatrex 2021-04-26 10:04:48 +03:00
commit bcc7625d1b
3 changed files with 89 additions and 110 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

39
addons/default/visiosoft/advs-module/resources/css/new-create-new.scss
View File

@ -23,7 +23,7 @@
} }
#reachInfo { #reachInfo {
font-family: Poppins; font-family: 'Poppins', sans-serif;
margin-bottom: 2rem; margin-bottom: 2rem;
p { p {
@ -42,7 +42,7 @@
} }
#contactSummary { #contactSummary {
font-family: Poppins; font-family: 'Poppins', sans-serif;
margin-bottom: 2rem; margin-bottom: 2rem;
label { label {
@ -89,7 +89,7 @@
} }
label { label {
font-family: Poppins; font-family: 'Poppins', sans-serif;
font-size: 14px; font-size: 14px;
color: #4A4A4A; color: #4A4A4A;
font-weight: 500; font-weight: 500;
@ -159,11 +159,7 @@
width: 47.5%; width: 47.5%;
input { input {
&:first-child { &.decimal-price {
width: 83%;
}
&:last-child {
width: 17%; width: 17%;
} }
} }
@ -178,6 +174,33 @@
select { select {
width: 17%; width: 17%;
padding: 1.1rem 1rem;
}
}
}
}
#simpleOptionsInput {
.select2-selection {
box-shadow: 0 1px 2px rgba(0, 0, 0, .04);
font-size: 17px;
padding: 1.1rem 1.5rem;
color: #707070;
border: 0;
margin-top: 1rem;
.select2-selection__rendered {
padding: 0;
display: flex;
margin: 0;
flex-wrap: wrap;
.select2-selection__choice {
float: none;
}
.select2-search__field {
padding: 0;
} }
} }
} }

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

@ -1,6 +1,9 @@
{% extends layout('new-create') %} {% extends layout('new-create') %}
{% block styles %} {% block styles %}
<link rel="preconnect" href="https://fonts.gstatic.com">
<link href="https://fonts.googleapis.com/css2?family=Poppins:ital,wght@0,100;0,200;0,300;0,400;0,500;0,600;0,700;0,800;0,900;1,100;1,200;1,300;1,400;1,500;1,600;1,700;1,800;1,900&display=swap" rel="stylesheet">
<style> <style>
{{ asset_inline("visiosoft.module.advs::css/new-create.css") }} {{ asset_inline("visiosoft.module.advs::css/new-create.css") }}
{{ asset_inline("visiosoft.module.advs::css/new-create-new.scss") }} {{ asset_inline("visiosoft.module.advs::css/new-create-new.scss") }}
@ -79,12 +82,26 @@
{% endif %} {% endif %}
<div id="priceInput" class="d-flex justify-content-between mb-4"> <div id="priceInput" class="d-flex justify-content-between mb-4">
<div> <div class="select-price{{ hidePrice ? ' hidden' }}">
<label>Fiyat</label> <label>
{{ form.fields.price.label|raw }}
<span class="required">*</span>
</label>
<div class="col-12 priceHidden d-none">
{{ form.fields.price.setAttributes({
'required' :true
}).input|raw }}
</div>
<div class="d-flex"> <div class="d-flex">
<input type="text" class="mt-3 border-0 text-right" placeholder="0"> {% set PriceValue = form.fields.price.value|split('.') %}
<input type="text" class="mt-3 border-0 ml-2 text-center" <input type="text" class="mt-3 border-0 text-right priceField whole-price flex-fill"
placeholder="00"> placeholder="0" value="{{ PriceValue|first }}">
{% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
<input class="mt-3 border-0 ml-2 text-center priceDecimalField decimal-price"
placeholder="00" type="text" value="{{ PriceValue[1] }}">
{% endif %}
</div> </div>
</div> </div>
<div class="{{ setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? 'd-none' }}"> <div class="{{ setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? 'd-none' }}">
@ -93,107 +110,56 @@
<span class="required">*</span> <span class="required">*</span>
</label> </label>
<div class="d-flex"> <div class="d-flex">
{# TODO add decimal input to standard price#}
{# {% set standardPriceValue = form.fields.standard_price.value|split('.') %}#}
{# <div class="col-8 pr-0 col-md-3">#}
{# <input class="form-control standard-price-field whole-price"#}
{# value="{{ standardPriceValue|first }}">#}
{# </div>#}
{# <div class="col-4 col-md-1">#}
{# <input class="form-control standard-price-decimal-field decimal-price"#}
{# placeholder="00" maxlength="2"#}
{# value="{{ standardPriceValue[1] }}">#}
{# </div>#}
{{ form.fields.standard_price.setAttributes({ {{ form.fields.standard_price.setAttributes({
'class': 'mt-3 border-0',
'required': true, 'required': true,
'class': 'mt-3 border-0',
}).input|raw }} }).input|raw }}
<select name="currency" class="mt-3 border-0 ml-2" id="currency" required> <select name="currency" class="mt-3 border-0 ml-2" id="currency" required>
<option value="tl">TL</option> {% for currency in config_get('streams::currencies.enabled') %}
<option value="{{ currency }}">
{{ currency == "TRY" ? currency_symbol(currency) : currency }}
</option>
{% endfor %}
</select> </select>
{% for currency in config_get('streams::currencies.enabled') %}
<option value="{{ currency }}">
{% if currency == "TRY" %}
{{ currency_symbol(currency) }}
{% else %}
{{ currency }}
{% endif %}
</option>
{% endfor %}
</select>
</div>
</div> </div>
</div> </div>
</div> </div>
<label class="w-100">
Opsiyonlar
<input type="text" class="d-block mt-3 w-100 border-0">
</label>
</div>
{% set standardPriceValue = form.fields.standard_price.value|split('.') %}
<div class="col-8 pr-0 col-md-3">
<input class="form-control standard-price-field whole-price"
value="{{ standardPriceValue|first }}">
</div>
<div class="col-4 col-md-1">
<input class="form-control standard-price-decimal-field decimal-price"
placeholder="00" maxlength="2"
value="{{ standardPriceValue[1] }}">
</div>
</div>
<div class="row form-group select-price{{ hidePrice ? ' hidden' }}">
<label class="col-sm-2 col-xs-12">
{{ form.fields.price.label|raw }}
<span class="required">*</span>
</label>
<div class="col-12 priceHidden d-none">
{{ form.fields.price.setAttributes({
'required' :true
}).input|raw }}
</div>
{% set PriceValue = form.fields.price.value|split('.') %}
<div class="col-6 col-sm-7 pr-0 col-md-3">
<input class="form-control priceField whole-price"
value="{{ PriceValue|first }}">
</div>
{% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
<div class="col-4 col-md-1">
<input class="form-control priceDecimalField decimal-price" placeholder="00"
maxlength="2"
value="{{ PriceValue[1] }}">
</div>
{% endif %}
</div>
{% if not setting_value('visiosoft.module.advs::hide_options_field') %} {% if not setting_value('visiosoft.module.advs::hide_options_field') %}
{% if not setting_value('visiosoft.module.advs::detailed_product_options') %} {% if not setting_value('visiosoft.module.advs::detailed_product_options') %}
<div class="row form-group select-options"> <div id="simpleOptionsInput" class="w-100 select-options">
<label for="selectOptions" class="col-sm-2"> <label for="selectOptions">
{{ trans('visiosoft.module.advs::field.options') }} {{ trans('visiosoft.module.advs::field.options') }}
</label> </label>
<div class="col-sm-10"> <select id="selectOptions" type="text" multiple="multiple" name="options[]"
<select id="selectOptions" class="form-control options-tags" class="d-block mt-3 w-100 border-0 options-tags">
multiple="multiple" {% if count(options) %}
name="options[]"> {% for option in options %}
{% if count(options) %} <option id="advOption{{ option.id }}"
{% for option in options %} selected="selected">{{ option.name }}</option>
<option id="advOption{{ option.id }}" {% endfor %}
selected="selected">{{ option.name }}</option> {% endif %}
{% endfor %} </select>
{% endif %}
</select>
</div>
{% if auth_check() and auth_user().hasRole('admin') %}
<div class="col-12 text-right py-2">
<p class="text-muted">
<i class="fa fa-exclamation-triangle"></i>
{{ trans('visiosoft.module.advs::message.disabled_detailed_options_for_admin_role') }}
</p>
</div>
{% endif %}
</div> </div>
{% if auth_check() and auth_user().hasRole('admin') %}
<div class="col-12 text-right py-2">
<p class="text-muted d-flex align-items-center justify-content-end">
<i class="fa fa-exclamation-triangle mr-2"></i>
{{ trans('visiosoft.module.advs::message.disabled_detailed_options_for_admin_role') }}
</p>
</div>
{% endif %}
{% else %} {% else %}
<div class="row form-group product-options"> <div class="row form-group product-options">
<label for="productOptions" class="col-sm-2"> <label for="productOptions" class="col-sm-2">

10
addons/default/visiosoft/advs-module/src/Adv/Form/AdvFormBuilder.php
View File

@ -9,24 +9,14 @@ class AdvFormBuilder extends FormBuilder
protected $category = null; protected $category = null;
protected $rules = [];
protected $skips = [ protected $skips = [
'slug' 'slug'
]; ];
protected $actions = [];
protected $buttons = [ protected $buttons = [
'cancel', 'cancel',
]; ];
protected $options = [];
protected $sections = [];
protected $assets = [];
public function __construct(Form $form) public function __construct(Form $form)
{ {
parent::__construct($form); parent::__construct($form);