diff --git a/app/Http/Controllers/Users/AgencyController.php b/app/Http/Controllers/Users/AgencyController.php index 9973b11..0856ada 100644 --- a/app/Http/Controllers/Users/AgencyController.php +++ b/app/Http/Controllers/Users/AgencyController.php @@ -20,6 +20,7 @@ class AgencyController extends Controller public function update() { Option::set('agency_name', request('name')); + Option::set('agency_tagline', request('tagline')); Option::set('agency_email', request('email')); Option::set('agency_website', request('website')); Option::set('agency_address', request('address')); diff --git a/app/Http/Controllers/Users/UsersController.php b/app/Http/Controllers/Users/UsersController.php index dfbdc82..707f520 100755 --- a/app/Http/Controllers/Users/UsersController.php +++ b/app/Http/Controllers/Users/UsersController.php @@ -35,7 +35,7 @@ class UsersController extends Controller $userData = $request->validate([ 'name' => 'required|min:5', 'email' => 'required|email|unique:users,email', - 'password' => 'between:6,15|confirmed', + 'password' => 'nullable|between:6,15|confirmed', 'password_confirmation' => 'required_with:password', ]); diff --git a/app/Http/Requests/Users/CreateRequest.php b/app/Http/Requests/Users/CreateRequest.php deleted file mode 100644 index ab48ae7..0000000 --- a/app/Http/Requests/Users/CreateRequest.php +++ /dev/null @@ -1,33 +0,0 @@ -user()->can('manage_users'); - } - - /** - * Get the validation rules that apply to the request. - * - * @return array - */ - public function rules() - { - return [ - 'name' => 'required|min:5', - 'email' => 'required|email|unique:users,email', - 'password' => 'between:6,15|confirmed', - 'password_confirmation' => 'required_with:password', - ]; - } -} diff --git a/resources/lang/id/agency.php b/resources/lang/id/agency.php index c06b96b..058c519 100644 --- a/resources/lang/id/agency.php +++ b/resources/lang/id/agency.php @@ -13,6 +13,7 @@ return [ // Attributes 'name' => 'Nama Agensi', + 'tagline' => 'Tagline Agensi', 'email' => 'Email Agensi', 'website' => 'Website Agensi', 'address' => 'Alamat Agensi', diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index b62df9a..4c8a2cb 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -5,7 +5,7 @@ @section('content') @include('flash::message')
- {{ Html::image(url('assets/imgs/logo.png'), 'Logo '.Option::get('app_name','Aplikasi Laravel')) }} + {{ Html::image(url('assets/imgs/logo.png'), 'Logo '.Option::get('agency_name','Aplikasi Laravel')) }}

{{ Option::get('app_name','Aplikasi Laravel') }}

@@ -26,4 +26,4 @@
-@endsection \ No newline at end of file +@endsection diff --git a/resources/views/layouts/partials/footer.blade.php b/resources/views/layouts/partials/footer.blade.php index 62e6a74..cf4e979 100755 --- a/resources/views/layouts/partials/footer.blade.php +++ b/resources/views/layouts/partials/footer.blade.php @@ -1,7 +1,7 @@ \ No newline at end of file + diff --git a/resources/views/layouts/partials/sidebar.blade.php b/resources/views/layouts/partials/sidebar.blade.php index 3e931e2..933022c 100755 --- a/resources/views/layouts/partials/sidebar.blade.php +++ b/resources/views/layouts/partials/sidebar.blade.php @@ -9,8 +9,8 @@ @@ -23,4 +23,4 @@ Menu - \ No newline at end of file + diff --git a/resources/views/layouts/partials/top-nav.blade.php b/resources/views/layouts/partials/top-nav.blade.php index ea04c44..a70b316 100755 --- a/resources/views/layouts/partials/top-nav.blade.php +++ b/resources/views/layouts/partials/top-nav.blade.php @@ -5,7 +5,7 @@ Toggle navigation Menu - + {{ Option::get('app_name', 'Laravel') }} @@ -28,4 +28,4 @@ - \ No newline at end of file + diff --git a/resources/views/users/agency/edit.blade.php b/resources/views/users/agency/edit.blade.php index c803f8a..1ad812d 100644 --- a/resources/views/users/agency/edit.blade.php +++ b/resources/views/users/agency/edit.blade.php @@ -7,6 +7,7 @@
{{ Form::open(['route' => 'users.agency.update', 'method' => 'patch']) }} {!! FormField::text('name', ['value' => Option::get('agency_name')]) !!} + {!! FormField::text('tagline', ['value' => Option::get('agency_tagline')]) !!} {!! FormField::email('email', ['value' => Option::get('agency_email')]) !!} {!! FormField::text('website', ['value' => Option::get('agency_phone')]) !!} {!! FormField::textarea('address', ['value' => Option::get('agency_address')]) !!} diff --git a/resources/views/users/agency/show.blade.php b/resources/views/users/agency/show.blade.php index e0f977e..907ceda 100644 --- a/resources/views/users/agency/show.blade.php +++ b/resources/views/users/agency/show.blade.php @@ -8,6 +8,7 @@
+ diff --git a/tests/Feature/Users/UserProfileTest.php b/tests/Feature/Users/UserProfileTest.php index 7b0fdde..5637e2e 100644 --- a/tests/Feature/Users/UserProfileTest.php +++ b/tests/Feature/Users/UserProfileTest.php @@ -58,6 +58,7 @@ class UserProfileTest extends TestCase $this->submitForm(trans('agency.update'), [ 'name' => 'Nama Agensi Saya', + 'tagline' => 'Tagline agensi saya', 'email' => 'nama_agensi@domain.com', 'address' => 'Jln. Kalimantan, No. 20, Kota', 'phone' => '081234567890', @@ -87,5 +88,9 @@ class UserProfileTest extends TestCase 'key' => 'agency_website', 'value' => 'https://example.com', ]); + $this->seeInDatabase('site_options', [ + 'key' => 'agency_tagline', + 'value' => 'Tagline agensi saya', + ]); } }
{{ trans('agency.name') }}{{ Option::get('agency_name') }}
{{ trans('agency.tagline') }}{{ Option::get('agency_tagline') }}
{{ trans('agency.email') }}{{ Option::get('agency_email') }}
{{ trans('agency.phone') }}{{ Option::get('agency_phone') }}
{{ trans('agency.address') }}{!! nl2br(Option::get('agency_address')) !!}