bolda

WIP
2026-05-06 14:39:11 +05:00 · 2026-05-06 14:38:59 +05:00 · 2026-05-06 13:35:10 +05:00 · 2026-05-06 12:28:19 +05:00 · 2026-05-05 08:43:46 +05:00
7 changed files with 1169 additions and 1134 deletions
--- a/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php
+++ b/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php
@@ -350,22 +350,22 @@ class NovaSberPaymentOrder extends Resource
    public function actions(NovaRequest $request): array
    {
        return [
-            MakeSberPaymentAction::make()
-                ->icon('credit-card')
-                ->sole()
-                ->canSee(function ($request) {
-                    /** @var \App\Modules\SberPaymentOrder\Models\SberPaymentOrder $resource */
-                    $resource = $this->resource;
+            // MakeSberPaymentAction::make()
+            //     ->icon('credit-card')
+            //     ->sole()
+            //     ->canSee(function ($request) {
+            //         /** @var \App\Modules\SberPaymentOrder\Models\SberPaymentOrder $resource */
+            //         $resource = $this->resource;

-                    if (in_array($resource->status, [
-                        OrderRepo::PENDING,
-                        OrderRepo::CANCELLED,
-                    ])) {
-                        return false;
-                    }
+            //         if (in_array($resource->status, [
+            //             OrderRepo::PENDING,
+            //             OrderRepo::CANCELLED,
+            //         ])) {
+            //             return false;
+            //         }

-                    return true;
-                }),
+            //         return true;
+            //     }),
        ];
    }

--- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php
+++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php
@@ -128,7 +128,7 @@ class VisaMasterPaymentOrderFieldsForDetail
                Text::make(__('Töleg ugradyjynyň goýum hasaby'), function () use ($resource) {
                    return sprintf(
                        '<strong>%s</strong>',
-                        number_format($resource->sender_deposit_account, 0, '', '')
+                        $resource->sender_deposit_account && is_numeric($resource->sender_deposit_account) ? number_format($resource->sender_deposit_account, 0, '', '') : '0'
                    );
                })->asHtml(),

--- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php
+++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php
@@ -382,13 +382,12 @@ class NovaVisaMasterPaymentOrder extends Resource
                    $order = $this->resource;

                    if (in_array($order->status, [
-                        OrderRepo::PENDING,
-                        OrderRepo::CANCELLED,
+                        OrderRepo::COMPLETED,
                    ])) {
-                        return false;
+                        return true;
                    }

-                    return true;
+                    return false;
                }),
        ];
    }
--- a/app/Nova/Actions/MakePaymentNovaVisaMaster.php
+++ b/app/Nova/Actions/MakePaymentNovaVisaMaster.php
@@ -45,8 +45,14 @@ class MakePaymentNovaVisaMaster extends Action
     */
    public function handle(ActionFields $fields, Collection $models): mixed
    {
-        $payment_amount = $fields->get('payment_amount');
-        $usd_payment = $fields->get('usd_payment');
+        // $payment_amount = $fields->get('payment_amount');
+        // $usd_payment = $fields->get('usd_payment');
+
+        $usd_to_tmt = floatval(CurrencyRate::where('currency_from', 'USD')->where('currency_to', 'TMT')->first('value')?->value);
+        $max_value = number_format($usd_to_tmt * 250, 2);
+
+        $usd_payment = 250;
+        $payment_amount = $usd_payment * $usd_to_tmt;

        if (! $payment_amount || ! $usd_payment) {
            return Action::modal('modal-response', [
@@ -122,6 +128,7 @@ class MakePaymentNovaVisaMaster extends Action
        }

        $max_value = number_format($usd_to_tmt * 250, 2);
+        $payment_amount = floatval(number_format($max_value, 2, '.', '')) + 115;

        return [
            Heading::make(Blade::render(<<<HTML
--- a/app/Repos/System/Nova/NovaMenuRepo.php
+++ b/app/Repos/System/Nova/NovaMenuRepo.php
@@ -107,7 +107,6 @@ class NovaMenuRepo
                MenuItem::resource(CurrencyRate::class)->canSee(fn() => NovaPermissionRepo::isAdmin() || NovaPermissionRepo::isCurrencyMaintainer()),
                MenuItem::resource(NovaVisaMasterSetting::class)->canSee(fn() => NovaPermissionRepo::isAdmin() || NovaPermissionRepo::isCurrencyMaintainer()),
            ])->icon('currency-dollar')
-                ->canSee(NovaPermissionRepo::isCurrencyMaintainer())
                ->collapsedByDefault(),

            MenuSection::resource(OnlinePaymentHistoryResource::class)
--- a/composer.json
+++ b/composer.json
@@ -99,10 +99,6 @@
            "type": "vcs",
            "url": "https://github.com/anditsung/nova-locale-switcher"
        },
-        "1": {
-            "type": "vcs",
-            "url": "https://github.com/nurmuhammet-ali/nova-tabs"
-        },
        "2": {
            "type": "path",
            "url": "./nova-components/NovaCustomHtml"
--- a/composer.lock
+++ b/composer.lock
Author	SHA1	Message	Date
Mekan1206	cbe8950b40	bolda	2026-05-06 14:39:11 +05:00
Mekan1206	5aa5496209	WIP	2026-05-06 14:38:59 +05:00
Mekan1206	97b6561ad3	WIP	2026-05-06 13:35:10 +05:00
Mekan1206	c9a0021bc3	WIP	2026-05-06 12:28:19 +05:00
Mekan1206	a28c1d88ea	WIP	2026-05-05 08:43:46 +05:00