Merge branch 'develop'

.nvmrc

@@ -1 +1 @@
-v18
+v16

CHANGELOG.md

@@ -0,0 +1,274 @@
+
+## [Unreleased]
+
+### Updated
+- HEAT-6728759: Mail template now allows multiple services
+- HEAT-6728759: Rollup config file
+- HEAT-6728759: NPM packages
+- HEAT-6728759: The function addRoleToUser --> AddRolesToUser
+- HEAT-6728759: Formatter issues
+
+### Added
+- HEAT-6728759: Css for vue-multiselect + csp record for css
+- HEAT-6728759: Vue-multiselect
+- HEAT-6728759: functionality to filter user services out of allowedServices in the dropdown
+
+
+## [2.7.1]
+
+
+## [2.7.0]
+
+
+## [2.6.9]
+
+
+## [2.6.8]
+
+
+## [2.6.7]
+
+
+## [2.6.6]
+
+
+## [2.6.5]
+
+
+## [2.6.4]
+
+
+## [2.6.3]
+
+
+## [2.6.2]
+
+
+## [2.6.1]
+
+
+## [2.6.0]
+
+
+## [2.5.4]
+
+
+## [2.5.3]
+
+
+## [2.5.2]
+
+
+## [2.5.1]
+
+
+## [2.5.0]
+
+
+## [2.4.13]
+
+
+## [2.4.12]
+
+
+## [2.4.11]
+
+
+## [2.4.10]
+
+
+## [2.4.9]
+
+
+## [2.4.8]
+
+
+## [2.4.7]
+
+
+## [2.4.6]
+
+
+## [2.4.5]
+
+
+## [2.4.4]
+
+
+## [2.4.3]
+
+
+## [2.4.2]
+
+
+## [2.4.1]
+
+
+## [2.4.0]
+
+
+## [2.3.13]
+
+
+## [2.3.12]
+
+
+## [2.3.11]
+
+
+## [2.3.10]
+
+
+## [2.3.9]
+
+
+## [2.3.8]
+
+
+## [2.3.7]
+
+
+## [2.3.6]
+
+
+## [2.3.5]
+
+
+## [2.3.4]
+
+
+## [2.3.3]
+
+
+## [2.3.2]
+
+
+## [2.3.1]
+
+
+## [2.3.0]
+### Bugfix
+- Width time input.
+- Fixed testIsOpenNowGivesOpenGeslotenOrNullPerChannel unit test.
+- Fixed testAService unit test.
+- Declaration of IsOwner::handle() should be compatible with HasRoleInService::handle($request, Closure $next, $excludeEditor = false)
+
+
+## [2.2.11]
+
+
+## [2.2.10]
+### Bugfix
+- Missing import.
+
+
+## [2.2.9]
+
+
+## [2.2.8]
+
+
+## [2.2.7]
+
+
+## [2.2.6]
+
+
+## [2.2.5]
+
+
+## [2.2.4]
+
+
+## [2.2.3]
+
+
+## [2.2.2]
+
+
+## [2.2.1]
+
+
+## [2.2.0]
+
+
+## [2.1.2]
+
+
+## [2.1.1]
+
+
+## [2.1.0]
+
+
+## [2.0.0]
+
+
+## 0.1.0-alpha1
+### Reverts
+- [#69](https://github.com/StadGent/laravel_site_opening-hours/issues/69) Expected layer, but got only priority of a calendar
+- Remove cancel button
+
+
+[Unreleased]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.7.1...HEAD
+[2.7.1]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.7.0...2.7.1
+[2.7.0]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.6.9...2.7.0
+[2.6.9]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.6.8...2.6.9
+[2.6.8]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.6.7...2.6.8
+[2.6.7]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.6.6...2.6.7
+[2.6.6]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.6.5...2.6.6
+[2.6.5]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.6.4...2.6.5
+[2.6.4]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.6.3...2.6.4
+[2.6.3]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.6.2...2.6.3
+[2.6.2]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.6.1...2.6.2
+[2.6.1]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.6.0...2.6.1
+[2.6.0]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.5.4...2.6.0
+[2.5.4]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.5.3...2.5.4
+[2.5.3]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.5.2...2.5.3
+[2.5.2]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.5.1...2.5.2
+[2.5.1]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.5.0...2.5.1
+[2.5.0]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.13...2.5.0
+[2.4.13]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.12...2.4.13
+[2.4.12]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.11...2.4.12
+[2.4.11]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.10...2.4.11
+[2.4.10]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.9...2.4.10
+[2.4.9]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.8...2.4.9
+[2.4.8]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.7...2.4.8
+[2.4.7]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.6...2.4.7
+[2.4.6]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.5...2.4.6
+[2.4.5]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.4...2.4.5
+[2.4.4]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.3...2.4.4
+[2.4.3]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.2...2.4.3
+[2.4.2]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.1...2.4.2
+[2.4.1]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.4.0...2.4.1
+[2.4.0]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.13...2.4.0
+[2.3.13]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.12...2.3.13
+[2.3.12]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.11...2.3.12
+[2.3.11]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.10...2.3.11
+[2.3.10]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.9...2.3.10
+[2.3.9]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.8...2.3.9
+[2.3.8]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.7...2.3.8
+[2.3.7]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.6...2.3.7
+[2.3.6]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.5...2.3.6
+[2.3.5]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.4...2.3.5
+[2.3.4]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.3...2.3.4
+[2.3.3]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.2...2.3.3
+[2.3.2]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.1...2.3.2
+[2.3.1]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.3.0...2.3.1
+[2.3.0]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.11...2.3.0
+[2.2.11]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.10...2.2.11
+[2.2.10]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.9...2.2.10
+[2.2.9]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.8...2.2.9
+[2.2.8]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.7...2.2.8
+[2.2.7]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.6...2.2.7
+[2.2.6]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.5...2.2.6
+[2.2.5]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.4...2.2.5
+[2.2.4]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.3...2.2.4
+[2.2.3]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.2...2.2.3
+[2.2.2]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.1...2.2.2
+[2.2.1]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.2.0...2.2.1
+[2.2.0]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.1.2...2.2.0
+[2.1.2]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.1.1...2.1.2
+[2.1.1]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.1.0...2.1.1
+[2.1.0]: https://github.com/StadGent/laravel_site_opening-hours/compare/2.0.0...2.1.0
+[2.0.0]: https://github.com/StadGent/laravel_site_opening-hours/compare/0.1.0-alpha1...2.0.0

app/Csp/Policies/OpeningHours.php

@@ -18,6 +18,7 @@ public function configure()
 
         $this->addDirective(Directive::SCRIPT, 'https://cdnjs.cloudflare.com/ajax/libs/zxcvbn/4.3.0/zxcvbn.js');
         $this->addDirective(Directive::STYLE, 'https://fonts.googleapis.com/css');
+        $this->addDirective(Directive::STYLE, 'https://unpkg.com/');
         $this->addDirective(Directive::FONT, Keyword::SELF);
         $this->addDirective(Directive::FONT, 'https://fonts.gstatic.com/s/sourcesanspro/');
         $this->addDirective(Directive::IMG, 'data:');

app/Http/Controllers/UI/UsersController.php

@@ -105,12 +105,14 @@ public function invite(Request $request)
         }
 
         $role = Role::where('name', $request->input('role'))->first();
-        $service = null;
-        if ($request->input('service_id')) {
-            $service = Service::find($request->input('service_id'));
+        $services = [];
+        if ($request->has('service_id')) {
+            $serviceIds = $request->input('service_id');
+            // Get all the services based on the given service ids.
+            $services = Service::whereIn('id', $serviceIds)->get();
         }
 
-        $user = $this->userService->setRoleToUser($request->input('email'), $role, $service);
+        $user = $this->userService->setRolesToUser($request->input('email'), $role, $services);
         $user->roles = app('UserRepository')->getAllRolesForUser($user->id);
 
         return $user;

app/Mail/SendInviteConfirmation.php

@@ -2,11 +2,11 @@
 
 namespace App\Mail;
 
-use App\Models\Service;
 use App\Models\User;
 use Illuminate\Bus\Queueable;
 use Illuminate\Mail\Mailable;
 use Illuminate\Queue\SerializesModels;
+use Illuminate\Database\Eloquent\Collection;
 
 class SendInviteConfirmation extends Mailable
 {
@@ -17,16 +17,25 @@ class SendInviteConfirmation extends Mailable
      */
     public $user;
 
+    /**
+     * Collection of services.
+     *
+     * @var Collection
+     */
+    public $services;
+
     /**
      * Create a new message instance.
      *
      * @param User $user
+     * @param array|Collection $services
+     *  Collection of services.
      * @return void
      */
-    public function __construct(User $user, Service $service)
+    public function __construct(User $user, Collection $services = null)
     {
         $this->user = $user;
-        $this->service = $service;
+        $this->services = $services;
     }
 
     /**
@@ -40,7 +49,7 @@ public function build()
             ->subject('U werd toegang verleend tot een dienst')
             ->view('auth.emails.invite');
         $params = [
-            'service' => $this->service->label,
+            'services' => $this->services
         ];
 
         if ($this->user->token) {