From ea9b028c231679d23d7d8f2bd47dc27e6294cec1 Mon Sep 17 00:00:00 2001
From: Nurmuhammet Allanov <nurmuhammet@mail.com>
Date: Mon, 8 Sep 2025 11:55:05 +0500
Subject: [PATCH] wip

---
 .../SberPaymentOrderFieldsForDetail.php       | 24 ++++----
 .../Nova/Resources/NovaSberPaymentOrder.php   | 55 +++++++++++--------
 ..._08_113914_change_sber_payments_sender.php | 34 ++++++++++++
 3 files changed, 77 insertions(+), 36 deletions(-)
 create mode 100644 database/migrations/2025_09_08_113914_change_sber_payments_sender.php

diff --git a/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/SberPaymentOrderFieldsForDetail.php b/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/SberPaymentOrderFieldsForDetail.php
index cea2ce1..1706176 100644
--- a/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/SberPaymentOrderFieldsForDetail.php
+++ b/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/SberPaymentOrderFieldsForDetail.php
@@ -73,20 +73,20 @@ class SberPaymentOrderFieldsForDetail
             ]),
             new Panel(__('Payment'), [
                 Text::make(__('Payment sender data'), function () use ($resource) {
-                    if (is_array($resource->sender_datas)) {
-                        $data = $resource->sender_datas[0];
-
-                        return sprintf('%s %s', $data['passport_serie'], $data['full_name']);
-                    }
-                }),
+                    return sprintf(
+                        '<strong>%s-%s %s</strong>', 
+                        $resource->sender_passport_serie, 
+                        $resource->sender_passport_number, 
+                        $resource->sender_full_name
+                    );
+                })->asHtml(),
 
                 Text::make(__('Töleg ugradyjynyň goýum hasaby'), function () use ($resource) {
-                    if (is_array($resource->sender_datas)) {
-                        $data = $resource->sender_datas[0];
-
-                        return number_format($data['deposit_account'], 0, '', '');
-                    }
-                }),
+                    return sprintf(
+                        '<strong>%s</strong>', 
+                        number_format($resource->sender_deposit_account, 0, '', '')
+                    );
+                })->asHtml(),
 
                 SimpleRepeatable::make(__('Payee information'), 'payment_reciever', [
                     Select::make(__('Passport serie'), 'passport_serie')
diff --git a/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php b/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php
index 6cf2bb8..9c76f30 100644
--- a/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php
+++ b/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php
@@ -253,31 +253,38 @@ class NovaSberPaymentOrder extends Resource
                     ->hideFromIndex(),
             ]),
 
-            new Panel(__('Payment'), [
-                SimpleRepeatable::make(__('Payment sender data'), 'sender_datas', [
-                    Select::make(__('Passport serie'), 'passport_serie')
-                        ->displayUsingLabels()
-                        ->searchable()
-                        ->options(PassportRepo::values())
-                        ->rules('required')
-                        ->sortable(),
-
-                    NovaInputmask::make(__('Passport number'), 'passport_number')
-                        ->mask('999999')
-                        ->rules('required', 'max:255'),
-
-                    Text::make(
-                        name: sprintf('%s %s %s', __('Name'), __('Surname'), __('Patronic name')),
-                        attribute: 'full_name'
-                    )
-                        ->rules('required', 'max:255'),
-
-                    Text::make(
-                        name: __('Goýum hasaby'),
-                        attribute: 'deposit_account'
-                    ),
-                ])->minRows(1)->rules('required'),
+            new Panel(__('Payment sender data'), [
+                Select::make(__('Passport serie'), 'sender_passport_serie')
+                    ->displayUsingLabels()
+                    ->searchable()
+                    ->options(PassportRepo::values())
+                    ->rules('required')
+                    ->fullWidth()
+                    ->sortable(),
+                    
+                NovaInputmask::make(__('Passport number'), 'sender_passport_number')
+                    ->mask('999999')
+                    ->fullWidth()
+                    ->rules('required', 'max:255'),
+                
+                Text::make(
+                    name: sprintf('%s %s %s', __('Name'), __('Surname'), __('Patronic name')),
+                    attribute: 'sender_full_name'
+                )
+                    ->fullWidth()
+                    ->rules('required', 'max:255'),
+                
+                Text::make(
+                    name: __('Goýum hasaby'),
+                    attribute: 'sender_deposit_account'
+                )->fullWidth()
+                    ->rules('required', 'string', 'max:255')
+                    ->fillUsing(function ($request, $model, $attribute) {
+                        $model->sender_deposit_account = strval($request->sender_deposit_account);
+                    }),
+            ]),
 
+            new Panel(__('Payee information'), [
                 SimpleRepeatable::make(__('Payee information'), 'payment_reciever', [
                     Select::make(__('Passport serie'), 'passport_serie')
                         ->displayUsingLabels()
diff --git a/database/migrations/2025_09_08_113914_change_sber_payments_sender.php b/database/migrations/2025_09_08_113914_change_sber_payments_sender.php
new file mode 100644
index 0000000..26ac2e4
--- /dev/null
+++ b/database/migrations/2025_09_08_113914_change_sber_payments_sender.php
@@ -0,0 +1,34 @@
+<?php
+
+use Illuminate\Database\Migrations\Migration;
+use Illuminate\Database\Schema\Blueprint;
+use Illuminate\Support\Facades\Schema;
+
+return new class extends Migration
+{
+    /**
+     * Run the migrations.
+     */
+    public function up(): void
+    {
+        Schema::table('sber_payment_orders', function (Blueprint $table) {
+            $table->string('sender_full_name')->nullable();
+            $table->string('sender_passport_serie')->nullable();
+            $table->string('sender_passport_number')->nullable();
+            $table->string('sender_deposit_account')->nullable();
+        });
+    }
+
+    /**
+     * Reverse the migrations.
+     */
+    public function down(): void
+    {
+        Schema::table('sber_payment_orders', function (Blueprint $table) {
+            $table->dropColumn('sender_full_name');
+            $table->dropColumn('sender_passport_serie');
+            $table->dropColumn('sender_passport_number');
+            $table->dropColumn('sender_deposit_account');
+        });
+    }
+};