wip #6626

diff --git a/src/app/Models/Company.php b/src/app/Models/Company.php
index ff465de10acc0c51786506e2675bc62ddf6f3230..818e2695320771bca14e988c90a6d9bbb9021ab5 100644 (file)
--- a/src/app/Models/Company.php
+++ b/src/app/Models/Company.php
@@ -8,6 +8,7 @@ use Cubedesigners\UserDatabase\Permissions;
 use Cubedesigners\UserDatabase\SubForms\Address;
 use Cubedesigners\UserDatabase\SubForms\AddressAndCompanyName;
 use Cubist\Backpack\Magic\Fields\Checkbox;
+use Cubist\Backpack\Magic\Fields\Date;
 use Cubist\Backpack\Magic\Fields\Hidden;
 use Cubist\Backpack\Magic\Fields\Integer;
 use Cubist\Backpack\Magic\Fields\Text;
@@ -172,11 +173,14 @@ class Company extends CubistMagicAbstractModel
                 'read_only' => true]);
         }
 
+        $this->addField('c_last_project_date', Date::class, __('Date du dernier projet'),
+            ['can' => 'company:admin',
+                'tab' => __('Chiffres'),
+                'read_only' => true]);
+
 
         $this->addField(['name' => 'e1_ws_signatures',
             'type' => 'Hidden']);
-
-
     }
 
     public function isOwner($user)
@@ -244,7 +248,6 @@ class Company extends CubistMagicAbstractModel
         return parent::onSaved();
     }
 
-
     protected function setComposedAttributes()
     {
         if (null === $this->billing_address) {

diff --git a/src/app/Models/User.php b/src/app/Models/User.php
index 803980ce5d2c6a647bc377aee6ada4b66a780e22..c08887e1646da704ff81fa6de8c17558693898ca 100644 (file)
--- a/src/app/Models/User.php
+++ b/src/app/Models/User.php
@@ -8,6 +8,7 @@ use Cubedesigners\UserDatabase\Operations\FilesOperation;
 use Cubedesigners\UserDatabase\Operations\LoginasOperation;
 use Cubedesigners\UserDatabase\Permissions;
 use Cubedesigners\UserDatabase\SubForms\Address;
+use Cubist\Backpack\Magic\Fields\Checkbox;
 use Cubist\Backpack\Magic\Fields\Color;
 use Cubist\Backpack\Magic\Fields\Hidden;
 use Cubist\Backpack\Magic\Fields\Integer;
@@ -81,11 +82,19 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
             'type' => 'Phone',
             'tab' => __('Contact')]);
 
+        $this->addField(['name' => 'marketing',
+            'label' => __('Reçoit les communications marketing'),
+            'type' => Checkbox::class,
+            'tab' => __('Contact'),
+            'default' => true,
+            'databaseDefault' => 1
+        ]);
+
         $this->addField(['name' => 'slack',
                 'label' => __('Identifiant Slack'),
                 'type' => Text::class,
                 'tab' => __('Equipe Cubedesigners'),
-              'can' => 'user:admin',
+                'can' => 'user:admin',
             ]
         );
 
@@ -93,7 +102,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
                 'label' => __('Trigramme Oxygene'),
                 'type' => Text::class,
                 'tab' => __('Equipe Cubedesigners'),
-               'can' => 'user:admin',
+                'can' => 'user:admin',
             ]
         );
 
@@ -101,7 +110,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
                 'label' => __('Couleur plannings'),
                 'type' => Color::class,
                 'tab' => __('Equipe Cubedesigners'),
-               'can' => 'user:admin',
+                'can' => 'user:admin',
             ]
         );
 
@@ -118,7 +127,7 @@ class User extends CubistMagicAuthenticatable implements HasLocalePreference
                 1 => __('Equipier'),
                 2 => __('Admin'),
                 3 => __('Comptable')],
-           'can' => 'user:admin',
+            'can' => 'user:admin',
             'tab' => 'Extranet V1']);
 
         $this->addField(['name' => 'c_ca',