Merge pull request #73 from openfoodfoundation/feature/multi-merchant

Feature: Multiple merchants on a voucher set
openfoodfoundation · Nov 29, 2024 · 11d9fa7 · 11d9fa7
2 parents 7406f4c + 2452b52
commit 11d9fa7
Show file tree

Hide file tree

Showing 29 changed files with 1,783 additions and 619 deletions.
diff --git a/app/Events/PersonalAccessTokens/PersonalAccessTokenWasCreated.php b/app/Events/PersonalAccessTokens/PersonalAccessTokenWasCreated.php
@@ -3,6 +3,7 @@
 namespace App\Events\PersonalAccessTokens;
 
 use App\Models\PersonalAccessToken;
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
@@ -25,7 +26,7 @@ public function __construct(public PersonalAccessToken|SanctumPersonalAccessToke
     /**
      * Get the channels the event should broadcast on.
      *
-     * @return array<int, \Illuminate\Broadcasting\Channel>
+     * @return array<int, Channel>
      */
     public function broadcastOn(): array
     {

diff --git a/app/Events/TeamUsers/TeamUserWasCreated.php b/app/Events/TeamUsers/TeamUserWasCreated.php
@@ -3,6 +3,7 @@
 namespace App\Events\TeamUsers;
 
 use App\Models\TeamUser;
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
@@ -24,7 +25,7 @@ public function __construct(public TeamUser $teamUser) {}
     /**
      * Get the channels the event should broadcast on.
      *
-     * @return array<int, \Illuminate\Broadcasting\Channel>
+     * @return array<int, Channel>
      */
     public function broadcastOn(): array
     {

diff --git a/app/Events/Teams/TeamWasCreated.php b/app/Events/Teams/TeamWasCreated.php
@@ -3,6 +3,7 @@
 namespace App\Events\Teams;
 
 use App\Models\Team;
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
@@ -24,7 +25,7 @@ public function __construct(public Team $team) {}
     /**
      * Get the channels the event should broadcast on.
      *
-     * @return array<int, \Illuminate\Broadcasting\Channel>
+     * @return array<int, Channel>
      */
     public function broadcastOn(): array
     {

diff --git a/app/Events/VoucherBeneficiaryDistributions/VoucherBeneficiaryDistributionCreated.php b/app/Events/VoucherBeneficiaryDistributions/VoucherBeneficiaryDistributionCreated.php
@@ -3,6 +3,7 @@
 namespace App\Events\VoucherBeneficiaryDistributions;
 
 use App\Models\VoucherBeneficiaryDistribution;
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
@@ -22,7 +23,7 @@ public function __construct(public VoucherBeneficiaryDistribution $voucherBenefi
     /**
      * Get the channels the event should broadcast on.
      *
-     * @return array<int, \Illuminate\Broadcasting\Channel>
+     * @return array<int, Channel>
      */
     public function broadcastOn(): array
     {

diff --git a/app/Events/VoucherSets/VoucherSetWasUpdated.php b/app/Events/VoucherSets/VoucherSetWasUpdated.php
@@ -3,6 +3,7 @@
 namespace App\Events\VoucherSets;
 
 use App\Models\VoucherSet;
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
@@ -22,7 +23,7 @@ public function __construct(public VoucherSet $voucherSet) {}
     /**
      * Get the channels the event should broadcast on.
      *
-     * @return array<int, \Illuminate\Broadcasting\Channel>
+     * @return array<int, Channel>
      */
     public function broadcastOn(): array
     {

diff --git a/app/Events/Vouchers/VoucherWasCreated.php b/app/Events/Vouchers/VoucherWasCreated.php
@@ -3,6 +3,7 @@
 namespace App\Events\Vouchers;
 
 use App\Models\Voucher;
+use Illuminate\Broadcasting\Channel;
 use Illuminate\Broadcasting\InteractsWithSockets;
 use Illuminate\Broadcasting\PrivateChannel;
 use Illuminate\Foundation\Events\Dispatchable;
@@ -24,7 +25,7 @@ public function __construct(public Voucher $voucher) {}
     /**
      * Get the channels the event should broadcast on.
      *
-     * @return array<int, \Illuminate\Broadcasting\Channel>
+     * @return array<int, Channel>
      */
     public function broadcastOn(): array
     {