Merge remote-tracking branch 'origin/master'

# Conflicts:
#	addons/default/visiosoft/advs-module/resources/views/list/gallery.twig
This commit is contained in:
Metehan Celik 2021-12-29 18:12:00 +03:00
commit 41e6ce00cb
5 changed files with 29 additions and 0 deletions

View File

@ -11,12 +11,15 @@
{% for adv in advs %}
<div class="col-xl-4 col-6 p-sm-3 p-0">
<div class="d-flex flex-column product-hb gallery-card pb-3 px-1 pt-1 border shadow-sm rounded">
<div class="product-image-hb p-sm-3 p-1">
<div class="d-flex flex-column product-hb gallery-card border border-top-0 pb-3 px-md-1 px-0 pt-1 shadow-sm rounded">
{{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs', 'comparisons'])|raw }}
<div class="product-image-hb p-sm-3 p-1 mt-lg-2 mt-4">
<a href="{{ adv.detail_url }}">
<img class="product-image-in" src="{{ adv.cover_photo }}" alt="{{ adv.name }}">
</a>
{{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['favs'])|raw }}
</div>
<div class="product-info-hb d-flex flex-column px-lg-3 px-2 mt-3">
<a href="{{ adv.detail_url }}" class="product-name-hb text-decoration-none line-clamp text-dark">
@ -28,8 +31,10 @@
</p>
{% endif %}
{% if showPrice %}
<div class="product-price-hb rounded d-flex align-items-center px-lg-3 px-2 mt-2 text-dark justify-content-between">
<div class="product-price-hb rounded d-flex align-items-center mt-2 bg-secondary-md bg-none text-dark">
{{ adv.price != '0' ? currency_format(adv.price,adv.currency) : trans('visiosoft.module.advs::field.free') }}
{{ addBlock('list/extra-actions', {'ad': adv, 'vars': _context}, ['comparisons'])|raw }}
</div>
<p class="pb-1">Bu ürünün farklı seçenekleri vardır.</p>
<div class="review">

View File

@ -0,0 +1,6 @@
<?php
return [
'account_is_not_activated' => 'Ihr Account wurde noch nicht aktiviert. Bitte überprüfen Sie Ihren E-Mail-Posteingang.',
'account_is_disabled' => 'Ihr Account wurde deaktiviert.',
];

View File

@ -0,0 +1,6 @@
<?php
return [
'account_is_not_activated' => 'Your account has not been activated. Please check your email inbox.',
'account_is_disabled' => 'Your account has been disabled.',
];

View File

@ -0,0 +1,6 @@
<?php
return [
'account_is_not_activated' => 'Votre compte n\'a pas encore été activé. Veuillez vérifier votre boîte e-mail.',
'account_is_disabled' => 'Votre compte a été désactivé.',
];

View File

@ -0,0 +1,6 @@
<?php
return [
'not_activated' => '您的账号还未激活。 请检查您的电子邮件收件箱。',
'disabled' => '您的账号已经被禁用。',
];