diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml index ef3a80fb..f903d505 100644 --- a/.gitlab-ci.yml +++ b/.gitlab-ci.yml @@ -44,6 +44,7 @@ deploy_697: environment: name: escadron697 url: http://escadron697.ca + when: manual only: - master @@ -60,6 +61,7 @@ deploy_736: environment: name: escadron736 url: http://736.exvps.ca + when: manual only: - master @@ -76,6 +78,7 @@ deploy_227: environment: name: CCMRC227 url: http://227.exvps.ca + when: manual only: - master @@ -92,6 +95,7 @@ deploy_117: environment: name: CCMRC117 url: http://117.exvps.ca + when: manual only: - master @@ -108,5 +112,6 @@ deploy_dev: environment: name: dev url: http://dev.exvps.ca + when: manual only: - - dev \ No newline at end of file + - dev diff --git a/app/Http/Controllers/UserController.php b/app/Http/Controllers/UserController.php index d020936b..81e62479 100644 --- a/app/Http/Controllers/UserController.php +++ b/app/Http/Controllers/UserController.php @@ -250,6 +250,22 @@ class UserController extends Controller return redirect('/admin/profil')->with('success', 'Modification enregistré'); } + public function UserTelephone() + { + return view('admin.user.profil.telephone'); + } + + public function editUserTelephone() + { + $user = \Auth::user(); + + $user->telephone = request('telephone'); + + $user->save(); + + return redirect('/admin/profil')->with('success', 'Modification enregistré'); + } + public function apiList() { $users = \App\User::all(); diff --git a/resources/views/admin/configs/ranks/add.blade.php b/resources/views/admin/configs/ranks/add.blade.php index d4b4bd93..fd262bde 100644 --- a/resources/views/admin/configs/ranks/add.blade.php +++ b/resources/views/admin/configs/ranks/add.blade.php @@ -14,14 +14,14 @@
Téléphone
- @if ($user->telephone != "Inconnu")
- @php
- $data = '+'.$user->telephone;
- if(preg_match( '/^\+\d(\d{3})(\d{3})(\d{4})$/',$data,$matches))
- {
- $result = $matches[1] . '-' .$matches[2] . '-' . $matches[3];
- echo $result;
- }
- @endphp
- @else
- Inconnu
- @endif
+ {{ $user->telephone }}