wip #3707 @0.5

diff --git a/app/Console/Commands/ExtranetMigration.php b/app/Console/Commands/ExtranetMigration.php
index bca20ea76c4170c9ec703ab62da16bd4c024c9e7..ccf36ff52b279efd1b598f50a879489318d373da 100644 (file)
--- a/app/Console/Commands/ExtranetMigration.php
+++ b/app/Console/Commands/ExtranetMigration.php
@@ -114,6 +114,8 @@ class ExtranetMigration extends CubistCommand
 
             if ($e->entreprise == 1880) {
                 $roles[] = ['model_id' => $e->utilisateur_id, 'role_id' => 12, 'model_type' => 'App\Models\User'];
+            }else if($e->entreprise==7){
+                $roles[] = ['model_id' => $e->utilisateur_id, 'role_id' => 14, 'model_type' => 'App\Models\User'];
             }
             if ($this->_wsRanks[$e->entreprise] > 0) {
                 $roles[] = ['model_id' => $e->utilisateur_id, 'role_id' => $wsgrades[$this->_wsRanks[$e->entreprise]], 'model_type' => 'App\Models\User'];

diff --git a/app/Models/Company.php b/app/Models/Company.php
new file mode 100644 (file)
index 0000000..039299c
--- /dev/null
+++ b/app/Models/Company.php
@@ -0,0 +1,10 @@
+<?php
+
+
+namespace App\Models;
+
+
+class Company extends \Cubedesigners\Userdatabase\Company
+{
+    protected $_syncDbSchema = false;
+}

diff --git a/app/Models/User.php b/app/Models/User.php
index 1f4241a1da80b7e5486f40af6ebe719d9dada253..72ba70e72a86f11dcf90672d496600622d13f41d 100644 (file)
--- a/app/Models/User.php
+++ b/app/Models/User.php
@@ -4,5 +4,5 @@ namespace App\Models;
 
 class User extends \Cubedesigners\Userdatabase\User
 {
-
+    protected $_syncDbSchema = false;
 }

diff --git a/config/database.php b/config/database.php
index 22347a4179c6fbfb75c99b3cb237e7d74a9df52a..ccd68b72a3be276b6de7b26be6fbbdf5216a7074 100644 (file)
--- a/config/database.php
+++ b/config/database.php
@@ -56,18 +56,20 @@ return [
             'engine' => null,
         ],
 
-        'pgsql' => [
-            'driver' => 'pgsql',
+        'extranet_users' => [
+            'driver' => 'mysql',
             'host' => env('DB_HOST', '127.0.0.1'),
-            'port' => env('DB_PORT', '5432'),
-            'database' => env('DB_DATABASE', 'forge'),
+            'port' => env('DB_PORT', '3306'),
+            'database' => env('DB_USER_DATABASE', 'extranet_users'),
             'username' => env('DB_USERNAME', 'forge'),
             'password' => env('DB_PASSWORD', ''),
-            'charset' => 'utf8',
+            'unix_socket' => env('DB_SOCKET', ''),
+            'charset' => 'utf8mb4',
+            'collation' => 'utf8mb4_unicode_ci',
             'prefix' => '',
             'prefix_indexes' => true,
-            'schema' => 'public',
-            'sslmode' => 'prefer',
+            'strict' => true,
+            'engine' => null,
         ],
 
         'sqlsrv' => [