Merge branch '1.1' of http://git.digital-tps.tk/TPS/birzha into 1.1

2022-05-24 09:44:57 +03:00 · 2022-05-24 09:44:57 +03:00 · c80225882e
parent 87dc4413cd ce36fb2d1d
commit c80225882e
12 changed files with 92 additions and 20 deletions
--- a/modules/system/lang/en/validation.php
+++ b/modules/system/lang/en/validation.php
@ -158,6 +158,7 @@ return [
        'phone_verification_code_invalid' => 'Invalid sms code',
        'phone_already_exists' => 'This phone number has already been taken.',
        'email_already_exists' => 'This email has already been taken.',
+        'bank_address_one' => '744013, Türkmenistan, Aşgabat ş., Türkmenistanyň Gahrymany Atamyrat Nyýazow şaýoly, 154',
    ],

    /*
--- a/modules/system/lang/ru/validation.php
+++ b/modules/system/lang/ru/validation.php
@ -158,6 +158,7 @@ return [
        'phone_verification_code_invalid' => 'Неверный СМС код',
        'phone_already_exists' => 'Пользователь с таким номером уже существует.',
        'email_already_exists' => 'Пользователь с таким email уже существует.',
+        'bank_address_one' => '744013, Türkmenistan, Aşgabat ş., Türkmenistanyň Gahrymany Atamyrat Nyýazow şaýoly, 154',
    ],

    /*
--- a/modules/system/lang/tm/validation.php
+++ b/modules/system/lang/tm/validation.php
@ -160,6 +160,7 @@ return [
        'phone_verification_code_invalid' => 'Nädogry SMS kody',
        'phone_already_exists' => 'Bu belgi öňden hasaba alyndy.',
        'email_already_exists' => 'Bu el. bukja öňden hasaba alyndy.',
+        'bank_address_one' => '744013, Türkmenistan, Aşgabat ş., Türkmenistanyň Gahrymany Atamyrat Nyýazow şaýoly, 154',
    ],

    /*
--- a/plugins/ahmadfatoni/apigenerator/controllers/api/ProductsApiController.php
+++ b/plugins/ahmadfatoni/apigenerator/controllers/api/ProductsApiController.php
@ -50,7 +50,7 @@ class ProductsAPIController extends Controller
                'currency.translations:locale,model_id,attribute_data'
            ])
            ->approvedAndFreshEndDate()
-            ->orderBy('updated_at', $sortOrder);
+            ->orderBy('ends_at', $sortOrder);

        if($categoryId) { // fetch offers by the category of the product
            $category = Category::find($categoryId);
@ -64,7 +64,7 @@ class ProductsAPIController extends Controller
                    'currency.translations:locale,model_id,attribute_data'
                ])
                ->approvedAndFreshEndDate()
-                ->orderBy('updated_at', $sortOrder);
+                ->orderBy('ends_at', $sortOrder);
            } else {
                $query = null;
            }
@ -87,7 +87,7 @@ class ProductsAPIController extends Controller
                        'currency.translations:locale,model_id,attribute_data'
                    ])
                    ->approvedAndFreshEndDate()
-                    ->orderBy('updated_at', $sortOrder);
+                    ->orderBy('ends_at', $sortOrder);
            } else {
                $query = null;
            }
@ -101,7 +101,7 @@ class ProductsAPIController extends Controller
                'measure.translations:locale,model_id,attribute_data',
                'currency.translations:locale,model_id,attribute_data'
            ])
-            ->orderBy('updated_at', $sortOrder);
+            ->orderBy('ends_at', $sortOrder);
        }

        $data = $query ? $query->paginate($perPage) : null;
--- a/plugins/ahmadfatoni/apigenerator/controllers/api/TransactionsApiController.php
+++ b/plugins/ahmadfatoni/apigenerator/controllers/api/TransactionsApiController.php
@ -8,6 +8,7 @@ use October\Rain\Support\Facades\Event;
 use TPS\Birzha\Classes\TranslatedErrSucMsgResponseApi;
 use TPS\Birzha\Models\Payment;
 use TPS\Birzha\Classes\TransactionResource;
+use TPS\Birzha\Models\Settings;

 class TransactionsApiController extends KabinetAPIController
 {
@ -128,4 +129,22 @@ class TransactionsApiController extends KabinetAPIController
        return $newPayment;
    }

+    public function getBankInfo(Request $request) {
+        $data = $request->only(['locale']);
+        $validator = Validator::make($data, [
+            'locale' => 'required|in:ru,tm,en',
+        ]);
+
+        if($validator->fails()) {
+            return response()->json($validator->errors(), 400);
+        }
+
+        return response()->json([
+            'tax_code' => Settings::getValue('tax_code'),
+            'bab' => Settings::getValue('bab'),
+            'manat_account' => Settings::getValue('manat_account'),
+            'correspondent_account' => Settings::getValue('correspondent_account'),
+            'bank_address' => trans("validation.api.bank_address_one", [], $data['locale'])
+        ], 200);
+    }
 }
--- a/plugins/ahmadfatoni/apigenerator/routes.php
+++ b/plugins/ahmadfatoni/apigenerator/routes.php
@ -69,6 +69,8 @@ Route::group(['prefix' =>'api/v1','namespace' =>'AhmadFatoni\ApiGenerator\Contro

        Route::post('send-email-verification-link', 'EmailVerificationController@sendEmailVerificationLink');

+        Route::get('bank-info', 'TransactionsApiController@getBankInfo');
+
    });
 });

--- a/plugins/ahmadfatoni/apigenerator/template/routes.dot
+++ b/plugins/ahmadfatoni/apigenerator/template/routes.dot
@ -69,6 +69,8 @@ Route::group(['prefix' =>'api/v1','namespace' =>'AhmadFatoni\ApiGenerator\Contro

        Route::post('send-email-verification-link', 'EmailVerificationController@sendEmailVerificationLink');

+        Route::get('bank-info', 'TransactionsApiController@getBankInfo');
+
    });
 });

--- a/plugins/tps/birzha/components/Offers.php
+++ b/plugins/tps/birzha/components/Offers.php
@ -86,7 +86,7 @@ class Offers extends ComponentBase
        $productSlug = $this->property('productSlug');
        $offerId = $this->property('offerId');

-        $query = Product::where('status', 'approved')->where('ends_at','>=',\Carbon\Carbon::now())->orderBy('updated_at', $sortOrder);
+        $query = Product::where('status', 'approved')->where('ends_at','>=',\Carbon\Carbon::now())->orderBy('ends_at', $sortOrder);

        if($cSlug != '') { //fetch offers by the category of the product
            $category = Category::transWhere('slug', $cSlug, Session::get('rainlab.translate.locale'))->first();
--- a/plugins/tps/birzha/components/sliders/img_slider.htm
+++ b/plugins/tps/birzha/components/sliders/img_slider.htm
@ -1,10 +1,29 @@
 {% set slider = __SELF__.slider %}
+{% set lng = __SELF__.lng %}

 <div class="advert">
    {% for item in slider.slide_items %}
+
+    <!-- Ru -->
+    {% if lng == 'ru' %}
    <a href="{{ item.link ? item.link : '#' }}" class="advert_item">
-        <img src="{{ item.slide_img|media }}" alt="">
+        <img src="{{ item.slide_img_ru|media }}" alt="">
    </a>
+    {% endif %}
+
+    <!-- Tm -->
+    {% if lng == 'tm' %}
+    <a href="{{ item.link ? item.link : '#' }}" class="advert_item">
+        <img src="{{ item.slide_img_tm|media }}" alt="">
+    </a>
+    {% endif %}
+
+    <!-- En -->
+    {% if lng == 'en' %}
+    <a href="{{ item.link ? item.link : '#' }}" class="advert_item">
+        <img src="{{ item.slide_img_en|media }}" alt="">
+    </a>
+    {% endif %}
    {% endfor %}
 </div>

--- a/plugins/tps/birzha/components/sliders/text_slider.htm
+++ b/plugins/tps/birzha/components/sliders/text_slider.htm
@ -4,29 +4,42 @@
 <div class="intro_slider">
    {% for item in slider.slide_items %}
    <div class="slider_item">
+
+        <!-- Ru -->
+        {% if lng == 'ru' %}
        <div class="slider_content">
-            {% if lng == 'ru' %}
            <a href="{{ item.link ? item.link : '#' }}" class="slider_title">
                {{ item.slide_title_ru }}
            </a>
-            
-            {% endif %}
-            {% if lng == 'en' %}
+        </div>
+        <div class="slider_item-img">
+            <img src="{{ item.slide_img_ru|media }}" alt="">
+        </div>
+        {% endif %}
+
+        <!-- En -->
+        {% if lng == 'en' %}
+        <div class="slider_content">
            <a href="{{ item.link ? item.link : '#' }}" class="slider_title">
                {{ item.slide_title_en }}
            </a>
-            
-            {% endif %}
-            {% if lng == 'tm' %}
+        </div>
+        <div class="slider_item-img">
+            <img src="{{ item.slide_img_en|media }}" alt="">
+        </div>
+        {% endif %}
+
+        <!-- Tm -->
+        {% if lng == 'tm' %}
+        <div class="slider_content">
            <a href="{{ item.link ? item.link : '#' }}" class="slider_title">
                {{ item.slide_title_tm }}
            </a>
-            
-            {% endif %}
        </div>
        <div class="slider_item-img">
-            <img src="{{ item.slide_img|media }}" alt="">
+            <img src="{{ item.slide_img_tm|media }}" alt="">
        </div>
+        {% endif %}
    </div>
    {% endfor %}
    
--- a/plugins/tps/birzha/models/slider/fields.yaml
+++ b/plugins/tps/birzha/models/slider/fields.yaml
@ -35,8 +35,8 @@ fields:
                    label: 'Slide text EN'
                    span: auto
                    type: text
-                slide_img:
-                    label: 'Slide image'
+                slide_img_ru:
+                    label: 'Slide image RU'
                    mode: image
                    imageWidth: '80'
                    imageHeight: '80'
@ -46,7 +46,21 @@ fields:
                    label: 'Display time'
                    span: auto
                    type: number
+                slide_img_tm:
+                    label: 'Slide image TM'
+                    mode: image
+                    imageWidth: '80'
+                    imageHeight: '80'
+                    span: auto
+                    type: mediafinder
                link:
                    label: Link
                    span: auto
                    type: text
+                slide_img_en:
+                    label: 'Slide image EN'
+                    mode: image
+                    imageWidth: '80'
+                    imageHeight: '80'
+                    span: auto
+                    type: mediafinder
--- a/plugins/tps/birzha/views/mail/product_reviewed.htm
+++ b/plugins/tps/birzha/views/mail/product_reviewed.htm
@ -74,7 +74,7 @@ layout="birzha_empty"
        <!-- Ru -->
        <table class="mail" style="border: 1px solid #003197; border-radius: 5px; overflow: hidden; width: 100%; border-spacing: 0;">
            
-            <tr>
+            <tr style="background-image: url({{ asset('themes/birzha/assets/images/footer-bg.png') }})">
                <th class="header" style="padding: 0; position: relative;">
                    <div class="header_row" style=" display: flex; align-items: center; padding: 10px 20px;">
                        <div class="logo" style="width: 44px; height: 44px; margin-right: 20px; position: relative; z-index: 2;">
@ -142,7 +142,7 @@ layout="birzha_empty"
        <!-- Eng -->
        <table class="mail" style="border: 1px solid #003197; border-radius: 5px; overflow: hidden; width: 100%; border-spacing: 0;">
            
-            <tr>
+            <tr style="background-image: url({{ asset('themes/birzha/assets/images/footer-bg.png') }})">
                <th class="header" style="padding: 0; position: relative;">
                    <div class="header_row" style=" display: flex; align-items: center; padding: 10px 20px;">
                        <div class="logo" style="width: 44px; height: 44px; margin-right: 20px; position: relative; z-index: 2;">