Skip to content

Commit ede4e7f

Browse files
erhanaskerhanask
authored
Merge pull request #128 from openclassify/vedatakdogan
update partial
2 parents 75a3ae2 + 0c34247 commit ede4e7f

File tree

2 files changed

+87
-86
lines changed

2 files changed

+87
-86
lines changed

‎resources/views/new-ad/new-create.twig‎

Lines changed: 1 addition & 86 deletions
Original file line numberDiff line numberDiff line change
@@ -109,92 +109,7 @@
109109
{{ addBlock('new-ad/fields', {'adv': adv, 'rawClassified': rawClassified})|raw }}
110110
{% endif %}
111111

112-
<div id="priceInput" class="d-flex mb-4 flex-wrap">
113-
<div class="mb-3 mr-2 mb-sm-0 select-price{{ hidePrice ? ' hidden' }}">
114-
<label>
115-
{{ form.fields.price.label|raw }}
116-
<span class="required">*</span>
117-
</label>
118-
119-
<div class="col-12 priceHidden d-none">
120-
{{ form.fields.price.setAttributes({
121-
'required' :true
122-
}).input|raw }}
123-
</div>
124-
125-
<div class="d-flex">
126-
{% set PriceValue = form.fields.price.value|split('.') %}
127-
<input type="text"
128-
class="mt-3 border rounded text-right priceField whole-price"
129-
placeholder="0" value="{{ PriceValue|first }}">
130-
{% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
131-
<input class="mt-3 border rounded text-center priceDecimalField decimal-price"
132-
placeholder="00" type="text" maxlength="{{ setting_value('visiosoft.field_type.decimal::decimal_length') }}" value="{{ PriceValue[1] }}">
133-
{% endif %}
134-
</div>
135-
</div>
136-
<div class="select-price">
137-
{% set HideStandardPrice = setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' : '' %}
138-
139-
<label>
140-
<span class="{{ HideStandardPrice }}">
141-
{{ form.fields.standard_price.label }}
142-
<span class="required">*</span>
143-
</span>
144-
</label>
145-
146-
<div class="col-12 standard-price-hidden d-none">
147-
{{ form.fields.standard_price.setAttributes({
148-
'required' :true
149-
}).input|raw }}
150-
</div>
151-
152-
<div class="d-flex flex-wrap">
153-
<div class="{{ (HideStandardPrice) ? HideStandardPrice : 'd-flex' }}">
154-
{% set standardPriceValue = form.fields.standard_price.value|split('.') %}
155-
<input class="mt-3 mr-1 border rounded text-right standard-price-field whole-price flex-fill"
156-
placeholder="0" value="{{ standardPriceValue|first }}"
157-
type="text">
158-
{% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
159-
<input class="mt-3 border rounded text-center standard-price-decimal decimal-price"
160-
placeholder="00" type="text"
161-
value="{{ standardPriceValue[1] }}"
162-
>
163-
{% endif %}
164-
</div>
165-
<select name="currency" class="mt-3 border rounded" id="currency" required>
166-
{% for currency in config_get('streams::currencies.enabled') %}
167-
<option value="{{ currency }}">
168-
{{ currency == "TRY" ? currency_symbol(currency) : currency }}
169-
</option>
170-
{% endfor %}
171-
</select>
172-
</div>
173-
</div>
174-
</div>
175-
176-
{% if setting_value("visiosoft.module.advs::show_tax_field") %}
177-
<div class="row mx-0 my-3">
178-
<div class="col-4 px-0">
179-
<label>
180-
{{ trans('visiosoft.module.advs::field.tax.name') }}
181-
<span class="required">*</span>
182-
</label>
183-
184-
<div class="py-2 pr-3">
185-
<div class="input-wrapper">
186-
<select class="custom-select form-control" name="tax">
187-
<option value="0" {{ (form.fields.tax.value == "0") ? 'selected':'' }}>0</option>
188-
<option value="1" {{ (form.fields.tax.value == "1") ? 'selected':'' }}>%1</option>
189-
<option value="8"{{ (form.fields.tax.value == "8") ? 'selected':'' }}>%8</option>
190-
<option value="18"{{ (form.fields.tax.value == "18") ? 'selected':'' }}>%18</option>
191-
<option value="20"{{ (form.fields.tax.value == "20") ? 'selected':'' }}>%20</option>
192-
</select>
193-
</div>
194-
</div>
195-
</div>
196-
</div>
197-
{% endif %}
112+
{% include 'visiosoft.module.advs::new-ad/price-area' %}
198113

199114
{% if setting_value("visiosoft.module.advs::show_finish_and_publish_date") %}
200115
<div class="row mx-0 my-3">

‎resources/views/new-ad/price-area.twig‎

Lines changed: 86 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,86 @@
1+
<div id="priceInput" class="d-flex mb-4 flex-wrap">
2+
<div class="mb-3 mr-2 mb-sm-0 select-price{{ hidePrice ? ' hidden' }}">
3+
<label>
4+
{{ form.fields.price.label|raw }}
5+
<span class="required">*</span>
6+
</label>
7+
8+
<div class="col-12 priceHidden d-none">
9+
{{ form.fields.price.setAttributes({
10+
'required' :true
11+
}).input|raw }}
12+
</div>
13+
14+
<div class="d-flex">
15+
{% set PriceValue = form.fields.price.value|split('.') %}
16+
<input type="text"
17+
class="mt-3 border rounded text-right priceField whole-price"
18+
placeholder="0" value="{{ PriceValue|first }}">
19+
{% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
20+
<input class="mt-3 border rounded text-center priceDecimalField decimal-price"
21+
placeholder="00" type="text" maxlength="{{ setting_value('visiosoft.field_type.decimal::decimal_length') }}" value="{{ PriceValue[1] }}">
22+
{% endif %}
23+
</div>
24+
</div>
25+
<div class="select-price">
26+
{% set HideStandardPrice = setting_value('visiosoft.module.advs::hide_standard_price_field') or setting_value('visiosoft.module.advs::market_place') != true ? ' d-none' : '' %}
27+
28+
<label>
29+
<span class="{{ HideStandardPrice }}">
30+
{{ form.fields.standard_price.label }}
31+
<span class="required">*</span>
32+
</span>
33+
</label>
34+
35+
<div class="col-12 standard-price-hidden d-none">
36+
{{ form.fields.standard_price.setAttributes({
37+
'required' :true
38+
}).input|raw }}
39+
</div>
40+
41+
<div class="d-flex flex-wrap">
42+
<div class="{{ (HideStandardPrice) ? HideStandardPrice : 'd-flex' }}">
43+
{% set standardPriceValue = form.fields.standard_price.value|split('.') %}
44+
<input class="mt-3 mr-1 border rounded text-right standard-price-field whole-price flex-fill"
45+
placeholder="0" value="{{ standardPriceValue|first }}"
46+
type="text">
47+
{% if setting_value('visiosoft.field_type.decimal::showDecimal') %}
48+
<input class="mt-3 border rounded text-center standard-price-decimal decimal-price"
49+
placeholder="00" type="text"
50+
value="{{ standardPriceValue[1] }}"
51+
>
52+
{% endif %}
53+
</div>
54+
<select name="currency" class="mt-3 border rounded" id="currency" required>
55+
{% for currency in config_get('streams::currencies.enabled') %}
56+
<option value="{{ currency }}">
57+
{{ currency == "TRY" ? currency_symbol(currency) : currency }}
58+
</option>
59+
{% endfor %}
60+
</select>
61+
</div>
62+
</div>
63+
</div>
64+
65+
{% if setting_value("visiosoft.module.advs::show_tax_field") %}
66+
<div class="row mx-0 my-3">
67+
<div class="col-4 px-0">
68+
<label>
69+
{{ trans('visiosoft.module.advs::field.tax.name') }}
70+
<span class="required">*</span>
71+
</label>
72+
73+
<div class="py-2 pr-3">
74+
<div class="input-wrapper">
75+
<select class="custom-select form-control" name="tax">
76+
<option value="0" {{ (form.fields.tax.value == "0") ? 'selected':'' }}>0</option>
77+
<option value="1" {{ (form.fields.tax.value == "1") ? 'selected':'' }}>%1</option>
78+
<option value="8"{{ (form.fields.tax.value == "8") ? 'selected':'' }}>%8</option>
79+
<option value="18"{{ (form.fields.tax.value == "18") ? 'selected':'' }}>%18</option>
80+
<option value="20"{{ (form.fields.tax.value == "20") ? 'selected':'' }}>%20</option>
81+
</select>
82+
</div>
83+
</div>
84+
</div>
85+
</div>
86+
{% endif %}

0 commit comments

Comments
 (0)