diff --git a/app/Helpers/helpers.php b/app/Helpers/helpers.php index 5273333..583d816 100644 --- a/app/Helpers/helpers.php +++ b/app/Helpers/helpers.php @@ -448,12 +448,12 @@ function syncWithBankSystem( $payPurpose = $pay_purpose; $client = new Client([ - 'timeout' => 5, // seconds before it fails - 'connect_timeout' => 1 // seconds to wait for connection + 'timeout' => 5, // seconds before it fails + 'connect_timeout' => 1, // seconds to wait for connection ]); $headers = [ 'Content-Type' => 'application/json', - 'Authorization' => 'Basic YWRtaW46UUFad3N4MTIz' + 'Authorization' => 'Basic YWRtaW46UUFad3N4MTIz', ]; $body = sprintf('{ "ecomId": "%s", @@ -473,6 +473,7 @@ function syncWithBankSystem( return (string) $res->getBody(); } catch (Exception $e) { info([$e->getMessage(), $e->getTraceAsString()]); + return null; } } diff --git a/app/Modules/SberPaymentOrder/Models/SberPaymentOrder.php b/app/Modules/SberPaymentOrder/Models/SberPaymentOrder.php index 9e7c300..889e896 100644 --- a/app/Modules/SberPaymentOrder/Models/SberPaymentOrder.php +++ b/app/Modules/SberPaymentOrder/Models/SberPaymentOrder.php @@ -41,9 +41,9 @@ use Spatie\MediaLibrary\InteractsWithMedia; */ class SberPaymentOrder extends Model implements HasMedia { + use Actionable; use InteractsWithMedia; use SoftDeletes; - use Actionable; /** * Table diff --git a/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/NovaSberPaymentOrderAuth.php b/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/NovaSberPaymentOrderAuth.php index 21d3622..dbb1696 100644 --- a/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/NovaSberPaymentOrderAuth.php +++ b/app/Modules/SberPaymentOrder/Nova/Resources/Concerns/NovaSberPaymentOrderAuth.php @@ -20,10 +20,14 @@ trait NovaSberPaymentOrderAuth { $user = auth()->user(); - if ($user->isMe() || $user->isSuperAdmin()) { + if ($user->isSystemUser()) { return; } + // if ($user->isMe() || $user->isSuperAdmin()) { + // return; + // } + /** @var SberPaymentOrder $resource */ $resource = $this->resource; if ($resource->user_id == auth()->id()) { @@ -43,6 +47,10 @@ trait NovaSberPaymentOrderAuth { $user = auth()->user(); + if ($user->isSystemUser()) { + return true; + } + if ($user->isMe() || $user->isSuperAdmin()) { return true; } @@ -55,6 +63,10 @@ trait NovaSberPaymentOrderAuth { $user = auth()->user(); + if ($user->isSystemUser()) { + return; + } + if ($user->isMe() || $user->isSuperAdmin()) { return; } @@ -73,6 +85,10 @@ trait NovaSberPaymentOrderAuth { $user = auth()->user(); + if ($user->isSystemUser()) { + return true; + } + if ($user->isMe() || $user->isSuperAdmin()) { return true; } @@ -89,6 +105,10 @@ trait NovaSberPaymentOrderAuth return; } + if ($user->isSystemUser()) { + return; + } + /** @var SberPaymentOrder $resource */ $resource = $this->resource; if ($resource->user_id == auth()->id()) { @@ -99,10 +119,14 @@ trait NovaSberPaymentOrderAuth } /** Delete button */ - public function authorizedToDelete(Request $request) + public function authorizedToDelete(Request $request): bool { $user = auth()->user(); + if ($user->isSystemUser()) { + return true; + } + if ($user->isMe() || $user->isSuperAdmin()) { return true; } @@ -115,6 +139,10 @@ trait NovaSberPaymentOrderAuth { $user = auth()->user(); + if ($user->isSystemUser()) { + return; + } + if ($user->isMe() || $user->isSuperAdmin()) { return; } diff --git a/app/Nova/Actions/Sber/SyncWithSystem.php b/app/Nova/Actions/Sber/SyncWithSystem.php index 13d7c16..3e6f3a8 100644 --- a/app/Nova/Actions/Sber/SyncWithSystem.php +++ b/app/Nova/Actions/Sber/SyncWithSystem.php @@ -71,7 +71,7 @@ class SyncWithSystem extends Action 'body' => 'Connection issue to SYSTEM', ]); } - + $systemResponse = json_decode($systemRawResponse); $success = false; @@ -87,7 +87,7 @@ class SyncWithSystem extends Action return Action::modal('modal-response', [ 'title' => 'SYSTEM API', - 'html' => $success ? "Success" : "Fail", + 'html' => $success ? 'Success' : 'Fail', ]); }