TPS/birzha
TPS
/
birzha
5
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

fix: market type field output, translate & other issues

This commit is contained in:
saparatayev 2021-10-21 18:17:29 +05:00
parent 22ca2e3842
commit dfc7a4f084
7 changed files with 133 additions and 72 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
modules/system/lang/en/validation.php
View File

@ -169,6 +169,7 @@ return [
'description_en' => 'Description EN',
'description_tm' => 'Description TM',
'bank_file' => 'File from bank',
'market_type' => 'Market type',
],
];

1
modules/system/lang/ru/validation.php
View File

@ -169,6 +169,7 @@ return [
'description_en' => 'Описание EN',
'description_tm' => 'Описание TM',
'bank_file' => 'Файл из банка',
'market_type' => 'Тип рынка',
],
];

1
modules/system/lang/tm/validation.php
View File

@ -171,6 +171,7 @@ return [
'description_en' => 'Beýany EN',
'description_tm' => 'Beýany TM',
'bank_file' => 'Bankdan faýl',
'market_type' => 'Bazaryň gornüşi',
],
];

12
plugins/tps/birzha/components/offerform/default.htm
View File

@ -25,7 +25,7 @@
<!-- ru name -->
<div class="post_input">
<label>{{'account.lot_title'|_}} (RU) <span>*</span></label>
<input type="text" name="name_ru" data-belongsto="product" placeholder="{{'page.example'|_}}: {{'account.lot_title_example'|_}}"
<input type="text" name="name_ru" data-belongsto="product" placeholder="{{'page.example'|_}}: Гидравлическое масло"
{% if productForEditing %}
value="{{ productForEditing.lang('ru').name }}"
{% endif %}
@ -35,7 +35,7 @@
<!-- en name -->
<div class="post_input">
<label>{{'account.lot_title'|_}} (EN) <span>*</span></label>
<input type="text" name="name_en" data-belongsto="product" placeholder="{{'page.example'|_}}: {{'account.lot_title_example'|_}}"
<input type="text" name="name_en" data-belongsto="product" placeholder="{{'page.example'|_}}: Hydraulic oil"
{% if productForEditing %}
value="{{ productForEditing.lang('en').name }}"
{% endif %}
@ -45,7 +45,7 @@
<!-- tm name -->
<div class="post_input">
<label>{{'account.lot_title'|_}} (TM) <span>*</span></label>
<input type="text" name="name_tm" data-belongsto="product" placeholder="{{'page.example'|_}}: {{'account.lot_title_example'|_}}"
<input type="text" name="name_tm" data-belongsto="product" placeholder="{{'page.example'|_}}: Gidrawlika ýagy"
{% if productForEditing %}
value="{{ productForEditing.lang('tm').name }}"
{% endif %}
@ -111,17 +111,17 @@
<label>Market type <span>*</span> </label>
<div class="my-select">
<select name="market_type" data-belongsto="product">
<option value="0">Выберите тип</option>
<option value="0">{{'page.market_type'|_}}</option>
<option value="in"
{% if productForEditing and productForEditing.market_type == 'in' %}
selected
{% endif %}
>Внутренний</option>
>{{'page.market_type_option_in'|_}}</option>
<option value="out"
{% if productForEditing and productForEditing.market_type == 'out' %}
selected
{% endif %}
>Внешний</option>
>{{'page.market_type_option_out'|_}}</option>
</select>
<span class="error_span" data-validate-for="market_type" style="color: red;"></span>
</div>

137
plugins/tps/birzha/components/singleoffer/default.htm
View File

@ -23,74 +23,89 @@
</div>
</div>
<div class="detail_info">
<div class="detail_about">
<div class="detail_title">
{{offer.name}}
</div>
<div class="detail_row">
<div class="detail_name">
{{'page.prod_no'|_}}:
</div>
<div class="detail_value">
№ {{offer.id}}
</div>
</div>
<div class="detail_row">
<div class="detail_name">
{{'page.prod_amount_2'|_}} :
</div>
<div class="detail_value">
{{offer.quantity}} {{offer.measure.code}}.
</div>
</div>
<div class="detail_row">
<div class="detail_name">
{{'page.prod_price_2'|_}}:
</div>
<div class="detail_value">
{{offer.price}} {{offer.currency.code}} / 1 {{offer.measure.code}}.
</div>
</div>
<div class="detail_row">
<div class="detail_name">
{{'page.prod_startdate'|_}}:
</div>
<div class="detail_value green">
{{offer.created_at|date('d/m/Y')}}
</div>
</div>
<div class="detail_title">
{{offer.name}}
</div>
<div class="detail_other">
<div class="detail_row">
<div class="detail_name">
{{'page.prod_mark'|_}}:
<div class="detail_info-inner">
<div class="detail_about">
<div class="detail_row">
<div class="detail_name">
{{'page.prod_no'|_}}:
</div>
<div class="detail_value">
№ {{offer.id}}
</div>
</div>
<div class="detail_value">
{{offer.mark}}
<div class="detail_row">
<div class="detail_name">
{{'page.prod_amount_2'|_}} :
</div>
<div class="detail_value">
{{offer.quantity}} {{offer.measure.code}}.
</div>
</div>
<div class="detail_row">
<div class="detail_name">
{{'page.prod_price_2'|_}}:
</div>
<div class="detail_value">
{{offer.price}} {{offer.currency.code}} / 1 {{offer.measure.code}}.
</div>
</div>
<div class="detail_row">
<div class="detail_name">
{{'page.prod_startdate'|_}}:
</div>
<div class="detail_value green">
{{offer.created_at|date('d/m/Y')}}
</div>
</div>
<div class="detail_row">
<div class="detail_name">
{{'page.prod_finishdate'|_}}:
</div>
<div class="detail_value red">
{{offer.ends_at|date('d/m/Y')}}
</div>
</div>
</div>
<div class="detail_row">
<div class="detail_name">
{{'page.prod_vendor'|_}}:
<div class="detail_other">
<div class="detail_row">
<div class="detail_name">
{{'page.prod_mark'|_}}:
</div>
<div class="detail_value">
{{offer.mark}}
</div>
</div>
<div class="detail_value">
{{offer.manufacturer}}
<div class="detail_row">
<div class="detail_name">
{{'page.prod_vendor'|_}}:
</div>
<div class="detail_value">
{{offer.manufacturer}}
</div>
</div>
</div>
<div class="detail_row">
<div class="detail_name">
{{'page.prod_vendor_country'|_}} :
<div class="detail_row">
<div class="detail_name">
{{'page.prod_vendor_country'|_}} :
</div>
<div class="detail_value">
{{offer.country.name}}
</div>
</div>
<div class="detail_value">
{{offer.country.name}}
</div>
</div>
<div class="detail_row">
<div class="detail_name">
{{'page.prod_finishdate'|_}}:
</div>
<div class="detail_value red">
{{offer.ends_at|date('d/m/Y')}}
<div class="detail_row">
<div class="detail_name">
{{'page.market_type'|_}}
</div>
<div class="detail_value">
{% if offer.market_type == 'in' %}
{{'page.market_type_option_in'|_}}
{% endif %}
{% if offer.market_type == 'out' %}
{{'page.market_type_option_out'|_}}
{% endif %}
</div>
</div>
</div>
</div>

44
themes/birzha/assets/css/main.css
View File

@ -1770,10 +1770,16 @@ li {
}
.detail_info {
/* display: flex; */
/* align-items: flex-end; */
/* justify-content: space-between; */
width: calc(100% - 50px);
margin-left: 50px;
}
.detail_info-inner {
display: flex;
align-items: flex-end;
justify-content: space-between;
width: 100%;
}
.detail_gallery {
@ -1821,15 +1827,16 @@ li {
-o-object-fit: cover;
}
.detail_about {
/* .detail_about {
margin-left: 50px;
}
} */
.detail_title {
font-size: var(--text-32);
font-weight: 700;
line-height: 1.4;
margin-bottom: 30px;
width: 100%;
}
.detail_row {
@ -1852,7 +1859,7 @@ li {
font-size: var(--text-20);
font-weight: 400;
line-height: 1.4;
color: var(--blue);
}
.green {
@ -3605,6 +3612,18 @@ li {
width: 575px;
}
.detail_info {
margin-left: 0;
}
.detail_info-inner {
justify-content: unset;
}
.detail_other {
margin-left: 50px;
}
}
@media(max-width: 1400px) {
@ -4666,6 +4685,17 @@ li {
margin: 0 0 12px 10px;
}
.detail_info-inner {
flex-direction: column;
-ms-flex-direction: column;
-moz-flex-direction: column;
-o-flex-direction: column;
-webkit-flex-direction: column;
}
.detail_info {
margin-left: 0;
}
}
@media(max-width: 600px) {
@ -4873,6 +4903,10 @@ li {
.seller_row {
margin-bottom: 10px;
}
.detail_other {
margin-left: 30px;
}
}
@media(max-width: 500px) {

9
themes/birzha/config/lang.yaml
View File

@ -78,6 +78,9 @@ en:
page.prod_mark: Product mark
page.prod_vendor: Manufacturer
page.prod_vendor_country: Manufactured country
page.market_type: Market type
page.market_type_option_in: Внутренний
page.market_type_option_out: Внешний
page.contact_us: Обратная связь
page.your_firstname: Ваше имя
page.your_lastname: Ваша фамилия
@ -196,6 +199,9 @@ ru:
page.prod_mark: Марка товара
page.prod_vendor: Производитель
page.prod_vendor_country: Страна производителя
page.market_type: Market type
page.market_type_option_in: Внутренний
page.market_type_option_out: Внешний
page.contact_us: Обратная связь
page.your_firstname: Ваше имя
page.your_lastname: Ваша фамилия
@ -336,6 +342,9 @@ tm:
page.prod_mark: Марка товара
page.prod_vendor: Производитель
page.prod_vendor_country: Страна производителя
page.market_type: Market type
page.market_type_option_in: Внутренний
page.market_type_option_out: Внешний
page.prod_desc: Описание
page.prod_amount_2: Количество товара
page.prod_price_2: Стартовая цена за единицу