Laravel 11

composer.json

@@ -16,22 +16,19 @@
         }
     ],
     "require": {
-        "php": "^8.1",
-        "laravel/framework": "^9.0 || ^10.0",
-        "spatie/laravel-data": "^3.5",
-        "spatie/laravel-package-tools": "^1.14.0"
+        "php": "^8.2",
+        "laravel/framework": "^10.0|^11.0",
+        "spatie/laravel-data": "^4.0",
+        "spatie/laravel-package-tools": "^1.16.2"
     },
     "require-dev": {
         "laravel/pint": "^1.0",
-        "nunomaduro/collision": "^7.9",
-        "nunomaduro/larastan": "^2.0.1",
-        "orchestra/testbench": "^8.0",
+        "nunomaduro/collision": "^7.0|^8.0",
+        "larastan/larastan": "^2.0.1",
+        "orchestra/testbench": "^9.0",
         "pestphp/pest": "^2.0",
         "pestphp/pest-plugin-arch": "^2.0",
-        "pestphp/pest-plugin-laravel": "^2.0",
-        "phpstan/extension-installer": "^1.1",
-        "phpstan/phpstan-deprecation-rules": "^1.0",
-        "phpstan/phpstan-phpunit": "^1.0"
+        "pestphp/pest-plugin-laravel": "^2.0"
     },
     "autoload": {
         "psr-4": {

src/Contracts/HasExternalProductItem.php

@@ -6,7 +6,7 @@
 
 interface HasExternalProductItem
 {
-    public function toExternalProductItem(): ExternalProductItem;
+    public function toExternalProductItem(): ?ExternalProductItem;
     public function externalProductItemRelationship(): string;
     public function setAsCompleted(): bool;
     public function setAsExternallyPaid(): bool;

src/DTO/ExternalProductItem.php

@@ -19,5 +19,7 @@ public function __construct(
 
         public float $price_incl_vat,
         public bool $is_paid,
+
+        public ?string $redirect_url = null,
     ) {}
 }

src/Helpers/UrlHelper.php

@@ -7,12 +7,21 @@
 
 class UrlHelper
 {
-    static public function redirectToCashRegister(Model&HasExternalProductItem ...$models)
+    static public function redirectToCashRegister(Model&HasExternalProductItem ...$models): string
     {
         $items = collect($models)
             ->map(fn(Model $model) => ['type' => $model::class, 'id' => $model->getKey()])
             ->all();
 
         return route('cashregister.redirect', ['items' => $items]);
     }
+
+    static public function redirectToCashRegisterAndBack(string $redirectUrl, Model&HasExternalProductItem ...$models): string
+    {
+        $items = collect($models)
+            ->map(fn(Model $model) => ['type' => $model::class, 'id' => $model->getKey()])
+            ->all();
+
+        return route('cashregister.redirect', ['items' => $items, 'redirect_url' => $redirectUrl]);
+    }
 }

src/Http/Controllers/CashRegisterController.php

@@ -64,12 +64,13 @@ public function redirectToCashRegister(RedirectToCashRegisterRequest $request)
                 'product_type',
                 'product_id',
                 'type',
-                'id'
+                'id',
             ))
             ->toArray();
 
 
-        $query = http_build_query(['items' => $data]);
+        $queryData = array_filter(['items' => $data, 'redirect_url' => $request->validated('redirect_url')]);
+        $query = http_build_query($queryData);
 
         $hash = hash_hmac('sha256', $query, config('cashregister-bridge.secret'));
 

src/Http/Requests/RedirectToCashRegisterRequest.php

@@ -17,6 +17,7 @@ public function rules()
             'items' => 'required|array',
             'items.*.type' => 'required',
             'items.*.id' => 'required|numeric|min:1',
+            'redirect_url' => 'nullable|string|url',
         ];
     }
 }

src/Jobs/PushExternalProductItem.php

@@ -46,9 +46,15 @@ public function handle()
             return;
         }
 
+        $externalProductItem = $this->externalProductItem->toExternalProductItem();
+
+        if( is_null($externalProductItem)) {
+            return;
+        }
+
         Http::acceptJson()->withSignature(config('cashregister-bridge.secret'))->post(
             $url,
-            $this->externalProductItem->toExternalProductItem()->toArray(),
+            $externalProductItem->toArray(),
         )->throw();
     }
 }