From 67f1b0ded0e2e9a83a189a45607d792f574987b0 Mon Sep 17 00:00:00 2001 From: adonis Date: Sun, 21 Jun 2026 13:17:57 +0330 Subject: [PATCH] fix charge account --- .../Controllers/Admin/TahesabController.php | 4 +- database/sql/deploy_settings_const.sql | 7 ---- database/sql/remove_obsolete_wss_settings.sql | 38 +++++++++++++++++++ 3 files changed, 40 insertions(+), 9 deletions(-) create mode 100644 database/sql/remove_obsolete_wss_settings.sql diff --git a/app/Http/Controllers/Admin/TahesabController.php b/app/Http/Controllers/Admin/TahesabController.php index 7921656..ba22b6d 100644 --- a/app/Http/Controllers/Admin/TahesabController.php +++ b/app/Http/Controllers/Admin/TahesabController.php @@ -444,8 +444,8 @@ class TahesabController extends Controller "created_at" => Carbon::now(), ]); - $price = new ReportController(); - $prices = $price->lastPrice(); + $prices = app(ReportController::class)->lastPrice(request()); + $mazaneh = $isDeposit ? (int) $prices['buy'] : (int) $prices['sell']; $mablaghKol = (int) round($mazaneh * $amount); $sharh = !empty($data['desc']) diff --git a/database/sql/deploy_settings_const.sql b/database/sql/deploy_settings_const.sql index 2bb6b2e..57052bd 100644 --- a/database/sql/deploy_settings_const.sql +++ b/database/sql/deploy_settings_const.sql @@ -875,13 +875,6 @@ UPDATE `settings` SET `can_edit` = 0 WHERE `key` IN ( 'wss_enabled', 'sse_path', 'tahesab_port' ); --- montzar/ws منسوخ — روی پروژه‌های قدیمی غیرفعال شود -UPDATE `settings` SET `value` = '', `is_active` = 0, `can_edit` = 0 -WHERE `key` IN ( - 'wss_path', 'wss_trigger_host', 'wss_http_port', 'wss_socket_port', - 'wss_link', 'wss_trigger_path' -); - -- لوگو / PWA / favicon — فقط از دیپلوی؛ در پنل نمایش داده نمی‌شوند UPDATE `settings` SET `can_edit` = 0, `is_active` = 0 WHERE `key` IN ('logo_login', 'logo_register', 'title_pwa', 'title_fav'); diff --git a/database/sql/remove_obsolete_wss_settings.sql b/database/sql/remove_obsolete_wss_settings.sql new file mode 100644 index 0000000..2ee6473 --- /dev/null +++ b/database/sql/remove_obsolete_wss_settings.sql @@ -0,0 +1,38 @@ +-- حذف کلیدهای منسوخ montzar/WebSocket از settings +-- نگه‌داشته می‌شود: wss_enabled (سوئیچ SSE) + sse_path +-- اجرا روی پروژه‌های موجود بعد از مهاجرت به SSE لاراول + +-- اطمینان از کلیدهای فعال SSE +UPDATE `settings` SET + `value` = 'true', + `can_edit` = 0, + `is_active` = 1, + `title_fa` = COALESCE(NULLIF(TRIM(`title_fa`), ''), 'قیمت لحظه‌ای (SSE)'), + `description` = 'روشن: اپ به sse_path وصل می‌شود؛ خاموش: polling /api/price/last و /customer/product/list' +WHERE `key` = 'wss_enabled'; + +INSERT INTO `settings` (`key`, `value`, `title_fa`, `can_edit`, `is_active`, `description`, `type`) +SELECT 'sse_path', '/api/price/stream', 'مسیر SSE قیمت', 0, 1, + 'GET لاراول — استریم event:last و event:list', + 'text' +WHERE NOT EXISTS (SELECT 1 FROM `settings` WHERE `key` = 'sse_path' LIMIT 1); + +UPDATE `settings` SET + `value` = COALESCE(NULLIF(TRIM(`value`), ''), '/api/price/stream'), + `can_edit` = 0, + `is_active` = 1, + `title_fa` = COALESCE(NULLIF(TRIM(`title_fa`), ''), 'مسیر SSE قیمت'), + `description` = 'مسیر GET لاراول برای استریم قیمت — پیش‌فرض /api/price/stream' +WHERE `key` = 'sse_path'; + +-- حذف کلیدهای اضافی WebSocket/montzar +DELETE FROM `settings` +WHERE `key` IN ( + 'wss_path', + 'wss_trigger_host', + 'wss_trigger_scheme', + 'wss_http_port', + 'wss_socket_port', + 'wss_link', + 'wss_trigger_path' +);