Merge branch 'sapar' into 1.1

plugins/tps/birzha/components/balance/default.htm

@@ -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">

plugins/tps/birzha/models/Settings.php

@@ -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

plugins/tps/birzha/models/settings/fields.yaml

@@ -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
+        

themes/birzha/assets/css/main.css

@@ -930,6 +930,31 @@ li {
     margin-right: 10px;
 }
 
+.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;
+}
+
+
 .header_img img {
     width: 100%;
     height: 100%;

themes/birzha/config/lang.yaml

@@ -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: Загрузить файл

themes/birzha/layouts/default.htm

@@ -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');
 }
 ?>
 ==