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

Merge remote-tracking branch 'github/1.1' into 1.1

This commit is contained in:
merdan 2021-11-15 15:41:55 +05:00
parent 5f182c96f3 f71a82b5e5
commit 23dd1bb1fa
10 changed files with 428 additions and 162 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
plugins/tps/birzha/components/balance/default.htm
View File

@ -56,13 +56,18 @@
<div class="bank">
<div class="bank_group">
<div class="bank_title">
{{'account.bank_details'|_}}:
{{ 'account.bank_tax_code'|_ }}:
</div>
<div class="bank_text">
- 1234-1234-1234-1234
{{ tax_code }}
</div>
</div>
<div class="bank_group">
<div class="bank_title">
{{ 'account.bank_manat_account'|_}}:
</div>
<div class="bank_text">
- 1234-1234-1234-1234
{{ manat_account }}
</div>
</div>
<div class="bank_group">
@ -75,12 +80,21 @@
</div>
<div class="bank_group">
<div class="bank_title">
{{'account.our_bank_details'|_}}:
{{ 'account.bank_bab'|_ }}:
</div>
<div class="bank_text">
- 1234-1234-1234-1234
{{ bab }}
</div>
</div>
<div class="bank_group">
<div class="bank_title">
{{ 'account.bank_correspondent_account'|_ }}:
</div>
<div class="bank_text">
{{ correspondent_account }}
</div>
</div>
</div>
<div class="post_upload_box">

2
plugins/tps/birzha/models/Settings.php
View File

@ -15,7 +15,7 @@ class Settings extends Model
public $settingsCode = 'birzha_settings';
public $translatable = ['address','site_name', 'short_name'];
public $translatable = ['address','site_name', 'short_name', 'bank_address'];
/**
* Get setting value

21
plugins/tps/birzha/models/settings/fields.yaml
View File

@ -54,3 +54,24 @@ tabs:
label: Product display duration
comment: In days
span: right
tax_code:
tab: Bank Info
label: Salgyt kody (Налоговый код)
span: left
bab:
tab: Bank Info
label: BAB (МФО)
span: right
manat_account:
tab: Bank Info
label: Manat hasaby (Манатный счёт)
span: left
correspondent_account:
tab: Bank Info
label: Korrespondent hasaby (Корреспондент счет)
span: right
bank_address:
tab: Bank Info
label: Bank address
span: left

22
shablon/js/main.js
View File

@ -88,19 +88,19 @@ function sleep(time) {
window.onclick = function (e) {
if (drop != undefined) {
if (document.querySelector('.profile_drop').classList.contains('active') && !e.target.closest('.profile_head')) {
document.querySelector('.profile_drop').classList.remove('active');
}
}
// drop.forEach(drop => {
// if (drop != undefined) {
// drop.classList.contains('active') && !e.target.closest('.profile_head');
// drop.classList.remove('active')
// if (drop != undefined) {
// if (drop.classList.contains('active') && !e.target.closest('.profile_head')) {
// drop.classList.remove('active');
// }
// }
// );
drop.forEach(drop => {
if (drop != undefined) {
drop.classList.contains('active') && !e.target.closest('.profile_head');
drop.classList.remove('active')
}
}
);
if (register != undefined) {
if (register.classList.contains('active') && !e.target.closest('.register_body')) {

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

@ -424,6 +424,29 @@ li {
line-height: 1.4;
}
.profile_info-group {
display: flex;
align-items: center;
margin-right: 10px;
}
.mobile_user-profile,
.mobile_profile-navs {
display: none;
}
.profile_icon {
width: 20px;
height: 20px;
}
.profile_icon img {
width: 100%;
height: 100%;
object-fit: contain;
-o-object-fit: contain;
}
.profile_bio {
position: relative;
}
@ -461,8 +484,8 @@ li {
justify-content: center;
position: absolute;
/* top: calc(100% + 52px); */
bottom: -440px;
top: calc(100% + 52px);
/* bottom: -440px; */
right: 0;
/* left: -30px; */
@ -596,6 +619,28 @@ li {
.balance_source.active {
display: block;
position: relative;
animation: open_balance .2s linear;
}
@keyframes open_balance {
0% {
/* margin-top: 0; */
top: 50px;
}
100% {
top: 0;
}
}
@-webkit-keyframes open_balance {
0% {
/* margin-top: 0; */
top: 50px;
}
100% {
top: 0;
}
}
.post_form-3 {
@ -623,22 +668,6 @@ li {
display: block;
}
.balance_source.active {
display: block;
position: relative;
animation: open_balance .2s linear;
}
@keyframes open_balance {
0% {
/* margin-top: 0; */
top: 50px;
}
100% {
top: 0;
}
}
.post_footer-text {
color: #E2E2E2;
font-size: 20px;
@ -1225,6 +1254,31 @@ li {
z-index: -1;
}
.link {
margin: 30px 0 0 0;
display: flex;
align-items: center;
justify-content: center;
}
.home_link {
display: block;
}
.home_link span {
display: block;
margin: 0 auto;
padding: 12px 40px;
background: var(--blue);
color: #fff;
font-size: 16px;
font-weight: 500;
line-height: 1.3;
border-radius: 5px;
cursor: pointer;
}
.slider_item {
width: 100%;
height: 480px;
@ -1580,7 +1634,7 @@ li {
font-size: var(--text-16);
font-weight: 400;
line-height: 1.4;
color: var(--rgba-black);
color: #a8a8a8;
}
.item_num {
@ -1801,13 +1855,13 @@ li {
}
.tab_link {
width: calc(25% - 40px);
width: calc(25% - 60px);
margin-right: 40px;
text-align: center;
border-radius: 10px;
background: var(--rgba-blue);
color: var(--blue);
padding: 35px 0;
padding: 35px 10px;
cursor: pointer;
font-size: var(--text-20);
@ -3936,7 +3990,8 @@ li {
}
.profile_drop {
bottom: -441px;
/* bottom: -441px; */
top: calc(100% + 52px);
}
}
@ -4016,7 +4071,7 @@ li {
}
.tab_link {
width: calc(50% - 40px);
width: calc(50% - 60px);
margin-bottom: 30px;
}
@ -4026,7 +4081,8 @@ li {
} */
.profile_drop {
bottom: -431px;
/* bottom: -431px; */
top: calc(100% + 41px);
}
/* Basket =============== */
@ -4267,6 +4323,124 @@ li {
display: none;
}
/* Mobile User links ==================== */
.profile {
display: none !important;
}
.mobile_user-profile {
display: block;
cursor: pointer;
width: 40px;
height: 40px;
}
.mobile_user-profile img {
width: 100%;
height: 100%;
object-fit: contain;
-o-object-fit: contain;
}
.mobile_profile-navs {
position: fixed;
top: 0;
right: -100%;
width: 100%;
height: 100%;
background: rgba(0, 0, 0, .5);
z-index: 10;
display: block;
transition: all .2s linear;
-ms-transition: all .2s linear;
-moz-transition: all .2s linear;
-o-transition: all .2s linear;
-webkit-transition: all .2s linear;
}
.mobile_profile-navs.active {
right: 0;
}
.mobile_profile-inner {
position: fixed;
top: 0;
right: -100%;
width: calc(70% - 60px);
height: 100%;
background: #fff;
padding: 30px;
overflow-y: auto;
-ms-overflow-style: none; /* IE 11 */
scrollbar-width: none; /* Firefox 64 */
transition: all .3s linear;
-ms-transition: all .3s linear;
-moz-transition: all .3s linear;
-o-transition: all .3s linear;
-webkit-transition: all .3s linear;
}
.mobile_profile-navs.active .mobile_profile-inner {
right: 0;
}
.mobile_profile-inner::-webkit-scrollbar {
display: none;
}
.mobile_user-name {
text-align: center;
width: 100%;
font-size: 20px;
font-weight: 700;
line-height: 1.4;
margin-bottom: 50px;
}
.mobile_user-item {
padding: 20px 10px;
display: flex;
align-items: center;
position: relative;
}
.mobile_user-item:nth-child(2)::before {
content: '';
position: absolute;
top: 0;
left: 0;
width: 100%;
height: 1px;
background: #003197;
}
.mobile_user-item::after {
content: '';
position: absolute;
bottom: 0;
left: 0;
width: 100%;
height: 1px;
background: #003197;
}
.mobile_user-item-icon {
width: 20px;
height: 20px;
margin-right: 15px;
}
.mobile_user-item-icon img {
width: 100%;
height: 100%;
object-fit: contain;
-o-object-fit: contain;
}
/* Mobile User links end ================= */
.info_block:last-child .header_contact:last-child {
display: none;
}
@ -4331,7 +4505,6 @@ li {
-moz-flex-direction: column;
-webkit-flex-direction: column;
justify-content: center;
}
.profile_head {
@ -4342,7 +4515,8 @@ li {
.profile_drop {
right: 0;
left: unset;
bottom: -416px;
/* bottom: -416px; */
top: calc(100% + 25px);
width: 320px;
}
@ -4637,7 +4811,7 @@ li {
}
.tab_link {
width: calc(50% - 20px);
width: calc(50% - 40px);
margin-bottom: 20px;
margin-right: 20px;
}
@ -4713,7 +4887,7 @@ li {
-webkit-flex-direction: column-reverse;
}
.profile_head .profile_item{
.profile_head .profile_item {
margin-top: 10px;
}
@ -4851,17 +5025,23 @@ li {
}
.post_form {
margin: 0px 0;
margin: 0;
}
.post_form-3 {
margin: 0;
}
.balance_tabs {
flex-direction: column;
-ms-flex-direction: column;
-moz-flex-direction: column;
}
.balance_link {
margin: 0 0 15px 0;
width: 100%;
padding: 15px;
width: 100%;
font-size: 16px;
}
@ -4870,18 +5050,12 @@ li {
padding: 15px 50px;
}
.balance_link:last-child {
margin: 0 !important;
}
.post_form-3 .bank {
margin-bottom: 25px;
}
.balance_tabs {
flex-direction: column;
-ms-flex-direction: column;
-moz-flex-direction: column;
.balance_link:last-child {
margin: 0 !important;
}
.post_input label {
@ -4923,7 +5097,8 @@ li {
.profile_drop {
width: 270px;
bottom: -445px;
/* bottom: -445px; */
top: calc(100% + 52px);
font-size: 14px;
right: unset;
left: 50%;
@ -5032,6 +5207,34 @@ li {
padding: 0 15px;
}
.mobile_user-profile {
width: 30px;
height: 30px;
}
.mobile_profile-inner {
width: calc(95% - 40px);
padding: 20px;
}
.mobile_user-name {
font-size: 18px;
margin-bottom: 25px;
}
.mobile_user-item {
padding: 15px 10px;
}
.mobile_user-item-icon {
width: 15px;
height: 15px;
}
.mobile_user-item-text {
font-size: 14px;
}
.links {
width: 70%;
}
@ -5118,20 +5321,9 @@ li {
font-size: 16px;
}
.profile_icon {
width: 15px;
height: 20px;
}
.profile_icon img {
width: 100%;
height: 100%;
object-fit: contain;
-o-object-fit: contain;
}
.profile_drop {
bottom: -420px;
/* bottom: -420px; */
top: calc(100% + 52px);
}
.category_search {
@ -5343,7 +5535,8 @@ li {
.profile_drop {
width: 300px;
bottom: -360px;
/* bottom: -360px; */
top: calc(100% + 52px);
font-size: 14px;
right: -72px;
margin-bottom: 0;
@ -5356,6 +5549,7 @@ li {
.logo_text {
font-size: 13px;
width: 200px;
}
.footer_img {
@ -5500,7 +5694,8 @@ li {
.profile_drop {
width: 240px;
bottom: -385px;
/* bottom: -385px; */
top: calc(100% + 52px);
font-size: 14px;
right: -42px;
padding-bottom: 30px;

4
themes/birzha/assets/images/svg/user-profile.svg Normal file
View File

@ -0,0 +1,4 @@
<svg width="61" height="61" viewBox="0 0 61 61" fill="none" xmlns="http://www.w3.org/2000/svg">
<path d="M30.3 0.300049C13.7152 0.300049 0.299988 13.7153 0.299988 30.3001C0.299988 46.8848 13.7152 60.3 30.3 60.3C46.8848 60.3 60.3 46.8848 60.3 30.3001C60.3 13.7153 46.8848 0.300049 30.3 0.300049ZM30.3 57.4254C15.3368 57.4254 3.17468 45.2632 3.17468 30.3001C3.17468 15.3369 15.3368 3.17474 30.3 3.17474C45.2631 3.17474 57.4253 15.3369 57.4253 30.3001C57.4253 45.2632 45.2631 57.4254 30.3 57.4254Z" fill="#003197"/>
<path d="M37.671 30.0789C38.9978 28.4573 39.7349 26.3934 39.7349 24.1821C39.7349 18.9487 35.4597 14.7472 30.3 14.7472C25.0666 14.7472 20.8651 19.0224 20.8651 24.1821C20.8651 26.3934 21.6759 28.4573 22.929 30.0789C18.2853 32.9536 15.1157 37.7447 14.4523 43.1993L17.2533 43.5678C17.843 38.7767 20.8651 34.4278 25.0666 32.0691C26.5408 33.0273 28.3098 33.617 30.2263 33.617C32.1428 33.617 33.9118 33.0273 35.386 32.0691C39.6612 34.4278 42.6096 38.7767 43.1993 43.5678L46.0002 43.1993C45.4843 37.7447 42.3147 32.9536 37.671 30.0789ZM23.7398 24.1821C23.7398 20.5703 26.6882 17.6219 30.3 17.6219C33.9118 17.6219 36.8602 20.5703 36.8602 24.1821C36.8602 27.7939 33.9118 30.7423 30.3 30.7423C26.6882 30.7423 23.7398 27.7939 23.7398 24.1821Z" fill="#003197"/>
</svg>
Side by Side

After

Width:  |  Height:  |  Size: 1.2 KiB

24
themes/birzha/assets/js/main.js
View File

@ -9,7 +9,7 @@ const selectElement = function (element) {
// selector end=============
let drop = document.querySelectorAll('.profile_drop');
let profile_head = document.querySelectorAll('.profile_bio');
let profile_head = document.querySelectorAll('.profile_head');
let register = document.querySelector('.register');
let register_btn = document.querySelectorAll('.register_btn');
let log_in = document.querySelectorAll('.log_in');
@ -38,6 +38,9 @@ let register_content_2 = document.querySelector('.register_content_2');
let seller_btn = document.querySelector('.seller_btn');
let seller_info = document.querySelector('.seller_info');
let mobile_user_profile = document.querySelector('.mobile_user-profile');
let mobile_profile_navs = document.querySelector('.mobile_profile-navs');
@ -86,8 +89,8 @@ function sleep(time) {
window.onclick = function (e) {
// if (drop != undefined) {
// if (document.querySelector('.profile_drop').classList.contains('active') && !e.target.closest('.profile_head')) {
// document.querySelector('.profile_drop').classList.remove('active');
// if (drop.classList.contains('active') && !e.target.closest('.profile_head')) {
// drop.classList.remove('active');
// }
// }
@ -119,6 +122,12 @@ window.onclick = function (e) {
}
}
if (mobile_profile_navs != undefined) {
if (mobile_profile_navs.classList.contains('active') && !e.target.closest('.mobile_profile-inner')) {
mobile_profile_navs.classList.remove('active');
}
}
if (seller_info != undefined) {
if (seller_info.classList.contains('active') && !e.target.closest('.seller_inner')) {
seller_info.classList.remove('active');
@ -162,6 +171,15 @@ if (profile_head != undefined) {
});
}
if (mobile_user_profile != undefined) {
mobile_user_profile.addEventListener('click', function () {
sleep(2).then(() => {
mobile_profile_navs.classList.add('active');
});
});
}
if (register_btn != undefined) {
register_btn.forEach(x => {
x.addEventListener('click', function () {

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

@ -28,6 +28,10 @@ en:
account.bank_details: Банковские реквизиты
account.bank_address: Bank address
account.bank_1: 744000, Туркменистан г.Ашгабат, Арчабиль шаелы 52
account.bank_tax_code: Salgyt kody
account.bank_manat_account: Manat hasaby
account.bank_correspondent_account: Korrespondent hasaby
account.bank_bab: BAB
account.our_bank_details: Our реквизиты
account.amount: Сумма
account.upload_file: Загрузить файл
@ -157,6 +161,10 @@ ru:
account.bank_details: Банковские реквизиты
account.bank_address: Bank address
account.bank_1: 744000, Туркменистан г.Ашгабат, Арчабиль шаелы 52
account.bank_tax_code: Налоговый код
account.bank_manat_account: Манатный счёт
account.bank_correspondent_account: Корреспондент счет
account.bank_bab: МФО
account.our_bank_details: Our реквизиты
account.amount: Сумма
account.upload_file: Загрузить файл
@ -286,6 +294,10 @@ tm:
account.bank_details: Банковские реквизиты
account.bank_address: Bank address
account.bank_1: 744000, Туркменистан г.Ашгабат, Арчабиль шаелы 52
account.bank_tax_code: Salgyt kody
account.bank_manat_account: Manat hasaby
account.bank_correspondent_account: Korrespondent hasaby
account.bank_bab: BAB
account.our_bank_details: Our реквизиты
account.amount: Сумма
account.upload_file: Загрузить файл

4
themes/birzha/layouts/default.htm
View File

@ -25,6 +25,10 @@ function onStart(){
$this['email'] = TPS\Birzha\Models\Settings::getValue('email');
$this['address'] = TPS\Birzha\Models\Settings::getValue('address');
$this['short_name'] = TPS\Birzha\Models\Settings::getValue('short_name');
$this['tax_code'] = TPS\Birzha\Models\Settings::getValue('tax_code');
$this['bab'] = TPS\Birzha\Models\Settings::getValue('bab');
$this['manat_account'] = TPS\Birzha\Models\Settings::getValue('manat_account');
$this['correspondent_account'] = TPS\Birzha\Models\Settings::getValue('correspondent_account');
}
?>
==

174
themes/birzha/partials/header.htm
View File

@ -102,9 +102,10 @@ code = "main-top"
</div>
{% else %}
<div class="head_group">
<div class="profile_head">
<a href="{{ 'kabinet/messages'|page }}" class="profile_item p-0" style="cursor: pointer;">
<div class="profile">
<a href="{{ 'kabinet/messages'|page }}" class="profile_info-group">
<div class="profile_icon">
<img src="{{'assets/images/svg/inbox.svg'|theme}}" alt="">
</div>
@ -113,7 +114,7 @@ code = "main-top"
</div>
</a>
<div class="profile_item p-0">
<div class="profile_info-group">
<div class="profile_icon">
<img src="{{'assets/images/svg/coins.svg'|theme}}" alt="">
</div>
@ -121,9 +122,6 @@ code = "main-top"
{{user.getBalance}} TMT
</div>
</div>
</div>
<div class="profile">
<div class="profile_bio">
<div class="profile_head">
<div class="profile_icon">
@ -187,6 +185,86 @@ code = "main-top"
</div>
</div>
<div class="mobile_user-profile">
<div class="open_profile-icon">
<img src="{{'assets/images/svg/user-profile.svg'|theme}}" alt="">
</div>
</div>
{% if user %}
<div class="mobile_profile-navs">
<div class="mobile_profile-inner">
<div class="mobile_user-name">
{{user.name ? user.name : user.email}}
</div>
<div class="mobile_user-item">
<div class="mobile_user-item-icon">
<img src="{{'assets/images/svg/coins.svg'|theme}}" alt="">
</div>
<p class="mobile_user-item-text">
{{user.balance}} TMT
</p>
</div>
<a href="{{ 'kabinet/messages'|page }}" class="mobile_user-item">
<div class="mobile_user-item-icon">
<img src="{{'assets/images/svg/inbox.svg'|theme}}" alt="">
</div>
<p class="mobile_user-item-text">
{{ 'auth.messages'|_ }}
</p>
</a>
<a href="{{'kabinet/profile'|page}}" class="mobile_user-item">
<div class="mobile_user-item-icon">
<img src="{{'assets/images/svg/user-plus.svg'|theme}}" alt="">
</div>
<p class="mobile_user-item-text">
{{ 'auth.personal_data'|_ }}
</p>
</a>
<a href="{{'kabinet/my_offers'|page}}" class="mobile_user-item">
<div class="mobile_user-item-icon">
<img src="{{'assets/images/svg/clipboard.svg'|theme}}" alt="">
</div>
<p class="mobile_user-item-text">
{{ 'auth.my_announces'|_ }}
</p>
</a>
<a href="#" class="mobile_user-item">
<div class="mobile_user-item-icon">
<img src="{{'assets/images/svg/add-blue.svg'|theme}}" alt="">
</div>
<p class="mobile_user-item-text">
{{ 'auth.add_announce'|_ }}
</p>
</a>
<a href="{{ 'kabinet/add_offer'|page }}" class="mobile_user-item">
<div class="mobile_user-item-icon">
<img src="{{'assets/images/wallet.png'|theme}}" alt="">
</div>
<p class="mobile_user-item-text">
Fill up balance
</p>
</a>
<a href="#" data-request="onLogout" data-request-data="redirect: '/'" class="mobile_user-item">
<div class="mobile_user-item-icon">
<img src="{{'assets/images/svg/log-out.svg'|theme}}" alt="">
</div>
<p class="mobile_user-item-text">
{{ 'auth.logout'|_ }}
</p>
</a>
</div>
</div>
{% endif %}
</div>
{% endif %}
</div>
@ -227,87 +305,7 @@ code = "main-top"
</div>
</div>
</div>
{% else %}
<div class="mobile_profile">
<div class="profile_bio">
<div class="profile_head">
<div class="profile_icon">
<img src="{{'assets/images/svg/user-plus.svg'|theme}}" alt="">
</div>
<div class="profile_text">
{{user.name}}
</div>
<div class="prodile_arrow">
<img src="{{'assets/images/svg/arrow-down.svg'|theme}}" alt="">
</div>
</div>
<div class="profile_drop">
<!-- <div class="profile_item">
<div class="profile_icon">
<img src="{{'assets/images/svg/coins.svg'|theme}}" alt="">
</div>
<div class="profile_text">
{{'account.balance'|_}}: {{user.balance}} TMT
</div>
</div> -->
<a href="{{'kabinet/profile'|page}}" class="profile_item">
<div class="profile_icon">
<img src="{{'assets/images/svg/user-plus.svg'|theme}}" alt="">
</div>
<div class="profile_text">
{{ 'auth.personal_data'|_ }}
</div>
</a>
<a href="{{'kabinet/my_offers'|page}}" class="profile_item">
<div class="profile_icon">
<img src="{{'assets/images/svg/clipboard.svg'|theme}}" alt="">
</div>
<div class="profile_text">
{{ 'auth.my_announces'|_ }}
</div>
</a>
<!-- <a href="{{ 'kabinet/messages'|page }}" class="profile_item">
<div class="profile_icon">
<img src="{{'assets/images/svg/inbox.svg'|theme}}" alt="">
</div>
<div class="profile_text">
{{ 'auth.messages'|_ }}
</div>
</a> -->
<a href="{{ 'kabinet/balance'|page }}" class="profile_item">
<div class="profile_icon">
<img src="{{'assets/images/svg/inbox.svg'|theme}}" alt="">
</div>
<div class="profile_text">
{{'account.fill_up_balance'|_}}
</div>
</a>
<a href="#" data-request="onLogout" data-request-data="redirect: '/'" class="profile_item">
<div class="profile_icon">
<img src="{{'assets/images/svg/log-out.svg'|theme}}" alt="">
</div>
<div class="profile_text">
{{ 'auth.logout'|_ }}
</div>
</a>
</div>
</div>
<a href="{{ 'kabinet/add_offer'|page }}" class="add_post_btn">
<div class="post_icon">
<img src="{{'assets/images/svg/add.svg'|theme}}" alt="">
</div>
<div class="post_text">
{{ 'auth.add_announce'|_ }}
</div>
</a>
</div>
{% endif %}
</div>
</div>