From 0003bc52dae7befa30eada79b8100a2451bcbb10 Mon Sep 17 00:00:00 2001 From: root Date: Mon, 22 Jul 2024 13:18:39 +0000 Subject: [PATCH] server update --- app/Logging/CustomLogFormatter.php | 27 +++++++++++++++++++ config/app.php | 2 +- config/logging.php | 1 + config/mail.php | 4 ++- plugins/tps/shops/models/sale/fields.yaml | 4 +++ ...builder_table_update_tps_shops_sales_3.php | 23 ++++++++++++++++ plugins/tps/shops/updates/version.yaml | 3 +++ themes/berkarar/layouts/default.htm | 4 +-- themes/berkarar/pages/sale.htm | 8 ++++++ themes/berkarar/partials/home/movies.htm | 6 ++--- themes/berkarar/partials/site/footer.htm | 2 +- themes/berkarar/partials/site/navigation.htm | 12 ++++++--- 12 files changed, 85 insertions(+), 11 deletions(-) create mode 100644 app/Logging/CustomLogFormatter.php create mode 100644 plugins/tps/shops/updates/builder_table_update_tps_shops_sales_3.php diff --git a/app/Logging/CustomLogFormatter.php b/app/Logging/CustomLogFormatter.php new file mode 100644 index 0000000..be016d0 --- /dev/null +++ b/app/Logging/CustomLogFormatter.php @@ -0,0 +1,27 @@ +getHandlers() as $handler) { + $handler->setFormatter(new LineFormatter(null, null, true, true)); + $handler->pushProcessor(function ($record) { + $record['extra']['ip'] = request()->ip(); + return $record; + }); + } + } +} + diff --git a/config/app.php b/config/app.php index 25f116d..f083c50 100644 --- a/config/app.php +++ b/config/app.php @@ -16,7 +16,7 @@ return [ | */ - 'debug' => true, + 'debug' => false, //true /* |-------------------------------------------------------------------------- diff --git a/config/logging.php b/config/logging.php index bdc61c4..109050a 100644 --- a/config/logging.php +++ b/config/logging.php @@ -46,6 +46,7 @@ return [ 'driver' => 'single', 'path' => storage_path('logs/info.log'), 'level' => 'debug', + 'tap' => App\Logging\CustomLogFormatter::class, ], 'daily' => [ diff --git a/config/mail.php b/config/mail.php index 7773efd..c34d31c 100644 --- a/config/mail.php +++ b/config/mail.php @@ -16,7 +16,9 @@ return [ | */ - 'driver' => 'smtp', + //'driver' => 'smtp', + + 'driver' => 'sendmail', /* |-------------------------------------------------------------------------- diff --git a/plugins/tps/shops/models/sale/fields.yaml b/plugins/tps/shops/models/sale/fields.yaml index 8a401f2..320307d 100644 --- a/plugins/tps/shops/models/sale/fields.yaml +++ b/plugins/tps/shops/models/sale/fields.yaml @@ -39,3 +39,7 @@ fields: extension: auto span: auto type: fileupload + store_number: + label: 'Номер магазина' + span: auto + type: text diff --git a/plugins/tps/shops/updates/builder_table_update_tps_shops_sales_3.php b/plugins/tps/shops/updates/builder_table_update_tps_shops_sales_3.php new file mode 100644 index 0000000..e6fad5f --- /dev/null +++ b/plugins/tps/shops/updates/builder_table_update_tps_shops_sales_3.php @@ -0,0 +1,23 @@ +string('store_number'); + }); + } + + public function down() + { + Schema::table('tps_shops_sales', function($table) + { + $table->dropColumn('store_number'); + }); + } +} diff --git a/plugins/tps/shops/updates/version.yaml b/plugins/tps/shops/updates/version.yaml index 2983239..3c93687 100644 --- a/plugins/tps/shops/updates/version.yaml +++ b/plugins/tps/shops/updates/version.yaml @@ -96,3 +96,6 @@ 1.0.33: - 'Updated table tps_shops_rentals_and_sales' - builder_table_update_tps_shops_rentals_and_sales.php +1.0.34: + - 'Updated table tps_shops_sales' + - builder_table_update_tps_shops_sales_3.php diff --git a/themes/berkarar/layouts/default.htm b/themes/berkarar/layouts/default.htm index 1f314d9..9d81539 100644 --- a/themes/berkarar/layouts/default.htm +++ b/themes/berkarar/layouts/default.htm @@ -97,7 +97,7 @@ function onStart(){ {{'Berkarar'|_}} - + {% styles %} @@ -140,4 +140,4 @@ function onStart(){ - \ No newline at end of file + diff --git a/themes/berkarar/pages/sale.htm b/themes/berkarar/pages/sale.htm index 69a1bf2..7992386 100644 --- a/themes/berkarar/pages/sale.htm +++ b/themes/berkarar/pages/sale.htm @@ -113,6 +113,14 @@ function onStart(){ {{sale.shop.instagram_name}} + +
+ + {{sale.store_number}} +
+
{{sale.name}} diff --git a/themes/berkarar/partials/home/movies.htm b/themes/berkarar/partials/home/movies.htm index 34cb852..b011055 100644 --- a/themes/berkarar/partials/home/movies.htm +++ b/themes/berkarar/partials/home/movies.htm @@ -19,7 +19,7 @@ function onStart(){ {{'Berkarar Кинотеатр'|_}} - @berkarar_cinema + @berkarar_kinoteatr
@@ -225,4 +225,4 @@ function onStart(){ movieBox.insertAdjacentHTML("beforeend", content); movieBox.classList.add("active"); } - \ No newline at end of file + diff --git a/themes/berkarar/partials/site/footer.htm b/themes/berkarar/partials/site/footer.htm index 2f92ba3..f32b97f 100644 --- a/themes/berkarar/partials/site/footer.htm +++ b/themes/berkarar/partials/site/footer.htm @@ -38,7 +38,7 @@ {{'Новости и акции'|_}}
  • - {{'Все магазины'|_}} + {{'Все магазины'|_}}
  • {{'Подробней о нас'|_}} diff --git a/themes/berkarar/partials/site/navigation.htm b/themes/berkarar/partials/site/navigation.htm index 53fb349..c616524 100644 --- a/themes/berkarar/partials/site/navigation.htm +++ b/themes/berkarar/partials/site/navigation.htm @@ -15,7 +15,10 @@ function onStart(){ {{'Новости и акции'|_}}
  • - {{'Все магазины'|_}} + {{'Все магазины'|_}} +
    • +
  • + {{'Аренда и Продажа'|_}}
  • {{'Подробней о нас'|_}} @@ -148,7 +151,10 @@ function onStart(){ {{'Новости и акции'|_}}
  • - {{'Все магазины'|_}} + {{'Все магазины'|_}} +
    • +
  • + {{'Аренда и Продажа'|_}}
  • {{'Подробней о нас'|_}} @@ -236,4 +242,4 @@ function onStart(){ - + \ No newline at end of file