diff --git a/app/Http/Controllers/Api/CardBalance/CardBalanceController.php b/app/Http/Controllers/Api/CardBalance/CardBalanceController.php index d272be6..7d0dcba 100644 --- a/app/Http/Controllers/Api/CardBalance/CardBalanceController.php +++ b/app/Http/Controllers/Api/CardBalance/CardBalanceController.php @@ -207,7 +207,7 @@ class CardBalanceController extends Controller 'card_year' => ['sometimes', Rule::in(array_keys(DateHelperRepository::staticNumberYears()))], ]); - $response = DownloadCardBalance::make()->fetchApi( + $response = DownloadCardBalance::make()->fetchApi( passport_serie: $request->passport_serie, passport_id: $request->passport_id, card_masked: Str::mask($request->card_number, '*', 6, 6), diff --git a/app/Http/Controllers/Api/CardPin/CardPinController.php b/app/Http/Controllers/Api/CardPin/CardPinController.php index 227922a..fc15be5 100644 --- a/app/Http/Controllers/Api/CardPin/CardPinController.php +++ b/app/Http/Controllers/Api/CardPin/CardPinController.php @@ -52,7 +52,7 @@ class CardPinController extends Controller ], 201); } - /** + /** * Upload files * * @return array diff --git a/app/Http/Controllers/Api/ContactUsController.php b/app/Http/Controllers/Api/ContactUsController.php index 443b858..c11deda 100644 --- a/app/Http/Controllers/Api/ContactUsController.php +++ b/app/Http/Controllers/Api/ContactUsController.php @@ -5,7 +5,6 @@ namespace App\Http\Controllers\Api; use App\Http\Controllers\Controller; use App\Models\CMS\ContactUs; use Illuminate\Http\Request; -use Illuminate\Validation\Rule; class ContactUsController extends Controller { diff --git a/app/Http/Controllers/OnlinePaymentController.php b/app/Http/Controllers/OnlinePaymentController.php index 500c0d7..dd8d381 100644 --- a/app/Http/Controllers/OnlinePaymentController.php +++ b/app/Http/Controllers/OnlinePaymentController.php @@ -106,14 +106,14 @@ class OnlinePaymentController extends Controller }', $ecomId, $agentId, $eposId, $account, $rrn, $amount, $payPurpose), CURLOPT_HTTPHEADER => [ 'Authorization: Basic YWRtaW46UUFad3N4MTIz', - 'Content-Type: application/json' + 'Content-Type: application/json', ], ]); $response = curl_exec($curl); curl_close($curl); - + info($response); } } diff --git a/app/Models/Order/Card/CardPin/CardPin.php b/app/Models/Order/Card/CardPin/CardPin.php index 0a3ce4f..6d129be 100644 --- a/app/Models/Order/Card/CardPin/CardPin.php +++ b/app/Models/Order/Card/CardPin/CardPin.php @@ -123,7 +123,6 @@ class CardPin extends Model return 3.02; } - /** * "boot" method for model */ diff --git a/app/Modules/LoanOrder/Controllers/LoanOrderController.php b/app/Modules/LoanOrder/Controllers/LoanOrderController.php index 9a2608a..053ad81 100644 --- a/app/Modules/LoanOrder/Controllers/LoanOrderController.php +++ b/app/Modules/LoanOrder/Controllers/LoanOrderController.php @@ -4,17 +4,14 @@ namespace App\Modules\LoanOrder\Controllers; use App\Http\Controllers\Controller; use App\Models\Order\Loan\LoanOrder; -use App\Modules\DateHelper\Repositories\DateHelperRepository; use App\Modules\LoanOrder\Controllers\Requests\LoanOrderStoreRequest; use App\Modules\LoanOrder\Controllers\Requests\LoanOrderUpdateRequest; -use App\Modules\LoanOrder\Controllers\Resources\LoanOrderIndexResource; use App\Modules\LoanOrder\Controllers\Resources\LoanOrderShowResource; use App\Repos\Order\OrderRepo; use Dedoc\Scramble\Attributes\Group; use Illuminate\Database\Eloquent\Model; use Illuminate\Http\JsonResponse; use Illuminate\Http\Request; -use Illuminate\Support\Facades\Log; use Illuminate\Support\Str; #[Group('Sargytlar - Karz - Karz sargytlary Mobile')] diff --git a/app/Modules/SberPaymentOrder/Models/SberPaymentOrderItem.php b/app/Modules/SberPaymentOrder/Models/SberPaymentOrderItem.php index d03b643..15de122 100644 --- a/app/Modules/SberPaymentOrder/Models/SberPaymentOrderItem.php +++ b/app/Modules/SberPaymentOrder/Models/SberPaymentOrderItem.php @@ -17,6 +17,7 @@ use Spatie\MediaLibrary\InteractsWithMedia; * @property string $tmt_payment_amount * @property string $usd_payment_amount * @property bool $paid + * @property bool $synced_with_system * @property \Illuminate\Support\Carbon $created_at * @property \Illuminate\Support\Carbon $updated_at */ @@ -36,6 +37,16 @@ class SberPaymentOrderItem extends Model implements HasMedia */ protected $guarded = []; + /** + * The attributes that should be cast. + * + * @var array + */ + protected $casts = [ + 'paid' => 'boolean', + 'synced_with_system' => 'boolean', + ]; + /** * Parent order * diff --git a/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/SberPaymentOrderFieldsForDetail.php b/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/SberPaymentOrderFieldsForDetail.php index 1706176..9ffef8d 100644 --- a/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/SberPaymentOrderFieldsForDetail.php +++ b/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/SberPaymentOrderFieldsForDetail.php @@ -74,16 +74,16 @@ class SberPaymentOrderFieldsForDetail new Panel(__('Payment'), [ Text::make(__('Payment sender data'), function () use ($resource) { return sprintf( - '%s-%s %s', - $resource->sender_passport_serie, - $resource->sender_passport_number, + '%s-%s %s', + $resource->sender_passport_serie, + $resource->sender_passport_number, $resource->sender_full_name ); })->asHtml(), Text::make(__('Töleg ugradyjynyň goýum hasaby'), function () use ($resource) { return sprintf( - '%s', + '%s', number_format($resource->sender_deposit_account, 0, '', '') ); })->asHtml(), diff --git a/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php b/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php index 9c76f30..42a8960 100644 --- a/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php +++ b/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrder.php @@ -10,7 +10,6 @@ use App\Nova\Actions\MakeSberPaymentAction; use App\Nova\Filters\VisaMasterMonthlyPaidFilter; use App\Nova\Resource; use App\Nova\User; -use Illuminate\Support\Facades\Validator; use App\Repos\Order\Card\CardOrderRepo; use App\Repos\Order\OrderRepo; use App\Repos\System\Nova\NovaRepo; @@ -261,19 +260,19 @@ class NovaSberPaymentOrder extends Resource ->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' diff --git a/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrderItem.php b/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrderItem.php index ea7b583..1e0b58d 100644 --- a/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrderItem.php +++ b/app/Modules/SberPaymentOrder/Nova/Resources/NovaSberPaymentOrderItem.php @@ -120,6 +120,8 @@ class NovaSberPaymentOrderItem extends Resource Text::make('Amalyň referensi', fn ($model) => $model->payment_order_number), Boolean::make(__('Paid'), 'paid'), + + Boolean::make(__('Synced with system'), 'synced_with_system'), ]; } diff --git a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php index 81ff650..2cf4957 100644 --- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php +++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/Concerns/VisaMasterPaymentOrderFieldsForDetail.php @@ -118,19 +118,19 @@ class VisaMasterPaymentOrderFieldsForDetail new Panel(__('Payment'), [ Text::make(__('Payment sender data'), function () use ($resource) { return sprintf( - '%s-%s %s', - $resource->sender_passport_serie, - $resource->sender_passport_number, + '%s-%s %s', + $resource->sender_passport_serie, + $resource->sender_passport_number, $resource->sender_full_name ); })->asHtml(), Text::make(__('Töleg ugradyjynyň goýum hasaby'), function () use ($resource) { return sprintf( - '%s', + '%s', number_format($resource->sender_deposit_account, 0, '', '') ); - })->asHtml(), + })->asHtml(), SimpleRepeatable::make(__('Payee information'), 'payment_reciever', [ Select::make(__('Passport serie'), 'passport_serie') diff --git a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php index 88c561c..2b4a35f 100644 --- a/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php +++ b/app/Modules/VisaMasterPaymentOrder/Nova/Resources/NovaVisaMasterPaymentOrder.php @@ -271,19 +271,19 @@ class NovaVisaMasterPaymentOrder extends Resource ->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' @@ -291,7 +291,7 @@ class NovaVisaMasterPaymentOrder extends Resource ->rules('required', 'string', 'max:255') ->fillUsing(function ($request, $model, $attribute) { $model->sender_deposit_account = strval($request->sender_deposit_account); - }), + }), ]), new Panel(__('Payee information'), [ @@ -302,18 +302,18 @@ class NovaVisaMasterPaymentOrder extends Resource ->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', __('Surname'), __('Name'), __('Patronic name')), attribute: 'full_name' )->rules('required', 'max:255'), ])->maxRows(1)->minRows(1)->rules('required'), ]), - + new Panel(__('Reciver files'), [ Files::make(__('Talyba degişli walýuta "VISA" kartyň rekwizitleri'), 'receiver_requisite') ->required() diff --git a/app/Nova/Actions/Sber/SyncWithSystem.php b/app/Nova/Actions/Sber/SyncWithSystem.php index 9bfadd6..d5ed692 100644 --- a/app/Nova/Actions/Sber/SyncWithSystem.php +++ b/app/Nova/Actions/Sber/SyncWithSystem.php @@ -3,7 +3,6 @@ namespace App\Nova\Actions\Sber; use Illuminate\Bus\Queueable; -use Illuminate\Contracts\Queue\ShouldQueue; use Illuminate\Queue\InteractsWithQueue; use Illuminate\Support\Collection; use Laravel\Nova\Actions\Action; diff --git a/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php b/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php index d091211..6adfffb 100644 --- a/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php +++ b/app/Nova/Resources/Order/Loan/LoanPaidOffLetterOrder.php @@ -9,7 +9,6 @@ use App\Nova\Filters\StatusFilter; use App\Nova\Resource; use App\Nova\Resources\Order\Loan\LoanPaidOffLetter\LoanPaidOffLetterOrderFieldsForDetail; use App\Nova\Resources\Order\Loan\LoanPaidOffLetter\LoanPaidOffLetterOrderFieldsForIndex; -use App\Repos\Order\Card\CardOrderRepo; use App\Repos\Order\OrderRepo; use App\Repos\System\Nova\NovaRepo; use App\Repos\System\Settings\Legal\PassportRepo; diff --git a/database/migrations/2025_09_09_104606_add_synced_with_system_to_sber_payment_order_items.php b/database/migrations/2025_09_09_104606_add_synced_with_system_to_sber_payment_order_items.php new file mode 100644 index 0000000..793c879 --- /dev/null +++ b/database/migrations/2025_09_09_104606_add_synced_with_system_to_sber_payment_order_items.php @@ -0,0 +1,28 @@ +boolean('synced_with_system')->nullable()->default(false); + }); + } + + /** + * Reverse the migrations. + */ + public function down(): void + { + Schema::table('sber_payment_order_items', function (Blueprint $table) { + $table->dropColumn('synced_with_system'); + }); + } +};