This commit is contained in:
2025-09-10 13:29:39 +05:00
parent a5e086237e
commit 6dab1a38c6
4 changed files with 37 additions and 8 deletions

View File

@@ -448,12 +448,12 @@ function syncWithBankSystem(
$payPurpose = $pay_purpose; $payPurpose = $pay_purpose;
$client = new Client([ $client = new Client([
'timeout' => 5, // seconds before it fails 'timeout' => 5, // seconds before it fails
'connect_timeout' => 1 // seconds to wait for connection 'connect_timeout' => 1, // seconds to wait for connection
]); ]);
$headers = [ $headers = [
'Content-Type' => 'application/json', 'Content-Type' => 'application/json',
'Authorization' => 'Basic YWRtaW46UUFad3N4MTIz' 'Authorization' => 'Basic YWRtaW46UUFad3N4MTIz',
]; ];
$body = sprintf('{ $body = sprintf('{
"ecomId": "%s", "ecomId": "%s",
@@ -473,6 +473,7 @@ function syncWithBankSystem(
return (string) $res->getBody(); return (string) $res->getBody();
} catch (Exception $e) { } catch (Exception $e) {
info([$e->getMessage(), $e->getTraceAsString()]); info([$e->getMessage(), $e->getTraceAsString()]);
return null; return null;
} }
} }

View File

@@ -41,9 +41,9 @@ use Spatie\MediaLibrary\InteractsWithMedia;
*/ */
class SberPaymentOrder extends Model implements HasMedia class SberPaymentOrder extends Model implements HasMedia
{ {
use Actionable;
use InteractsWithMedia; use InteractsWithMedia;
use SoftDeletes; use SoftDeletes;
use Actionable;
/** /**
* Table * Table

View File

@@ -20,10 +20,14 @@ trait NovaSberPaymentOrderAuth
{ {
$user = auth()->user(); $user = auth()->user();
if ($user->isMe() || $user->isSuperAdmin()) { if ($user->isSystemUser()) {
return; return;
} }
// if ($user->isMe() || $user->isSuperAdmin()) {
// return;
// }
/** @var SberPaymentOrder $resource */ /** @var SberPaymentOrder $resource */
$resource = $this->resource; $resource = $this->resource;
if ($resource->user_id == auth()->id()) { if ($resource->user_id == auth()->id()) {
@@ -43,6 +47,10 @@ trait NovaSberPaymentOrderAuth
{ {
$user = auth()->user(); $user = auth()->user();
if ($user->isSystemUser()) {
return true;
}
if ($user->isMe() || $user->isSuperAdmin()) { if ($user->isMe() || $user->isSuperAdmin()) {
return true; return true;
} }
@@ -55,6 +63,10 @@ trait NovaSberPaymentOrderAuth
{ {
$user = auth()->user(); $user = auth()->user();
if ($user->isSystemUser()) {
return;
}
if ($user->isMe() || $user->isSuperAdmin()) { if ($user->isMe() || $user->isSuperAdmin()) {
return; return;
} }
@@ -73,6 +85,10 @@ trait NovaSberPaymentOrderAuth
{ {
$user = auth()->user(); $user = auth()->user();
if ($user->isSystemUser()) {
return true;
}
if ($user->isMe() || $user->isSuperAdmin()) { if ($user->isMe() || $user->isSuperAdmin()) {
return true; return true;
} }
@@ -89,6 +105,10 @@ trait NovaSberPaymentOrderAuth
return; return;
} }
if ($user->isSystemUser()) {
return;
}
/** @var SberPaymentOrder $resource */ /** @var SberPaymentOrder $resource */
$resource = $this->resource; $resource = $this->resource;
if ($resource->user_id == auth()->id()) { if ($resource->user_id == auth()->id()) {
@@ -99,10 +119,14 @@ trait NovaSberPaymentOrderAuth
} }
/** Delete button */ /** Delete button */
public function authorizedToDelete(Request $request) public function authorizedToDelete(Request $request): bool
{ {
$user = auth()->user(); $user = auth()->user();
if ($user->isSystemUser()) {
return true;
}
if ($user->isMe() || $user->isSuperAdmin()) { if ($user->isMe() || $user->isSuperAdmin()) {
return true; return true;
} }
@@ -115,6 +139,10 @@ trait NovaSberPaymentOrderAuth
{ {
$user = auth()->user(); $user = auth()->user();
if ($user->isSystemUser()) {
return;
}
if ($user->isMe() || $user->isSuperAdmin()) { if ($user->isMe() || $user->isSuperAdmin()) {
return; return;
} }

View File

@@ -87,7 +87,7 @@ class SyncWithSystem extends Action
return Action::modal('modal-response', [ return Action::modal('modal-response', [
'title' => 'SYSTEM API', 'title' => 'SYSTEM API',
'html' => $success ? "Success" : "Fail", 'html' => $success ? 'Success' : 'Fail',
]); ]);
} }