diff --git a/app/Http/Controllers/Partners/PartnersController.php b/app/Http/Controllers/Partners/PartnersController.php index 8bc7e9d..80d9ebd 100644 --- a/app/Http/Controllers/Partners/PartnersController.php +++ b/app/Http/Controllers/Partners/PartnersController.php @@ -36,6 +36,21 @@ class PartnersController extends Controller } /** + * Show the create partner form. + * + * @return \Illuminate\Http\Response + */ + public function create() + { + $partnerTypes = [ + 1 => trans('partner.types.customer'), + 2 => trans('partner.types.vendor'), + ]; + + return view('partners.create', compact('partnerTypes')); + } + + /** * Store a newly created partner in storage. * * @param \Illuminate\Http\Request $request @@ -74,6 +89,22 @@ class PartnersController extends Controller } /** + * Show the edit partner form. + * + * @param \App\Entities\Partners\Partner $partner + * @return \Illuminate\Http\Response + */ + public function edit(Partner $partner) + { + $partnerTypes = [ + 1 => trans('partner.types.customer'), + 2 => trans('partner.types.vendor'), + ]; + + return view('partners.edit', compact('partnerTypes', 'partner')); + } + + /** * Update the specified partner in storage. * * @param \Illuminate\Http\Request $request @@ -93,12 +124,11 @@ class PartnersController extends Controller 'is_active' => 'required|boolean', ]); - $routeParam = request()->only('page', 'q'); - - $partner = $partner->update($partnerData); + $partner->update($partnerData); flash(trans('partner.updated'), 'success'); - return redirect()->route('partners.index', $routeParam); + + return redirect()->route('partners.show', $partner->id); } /** diff --git a/resources/lang/id/partner.php b/resources/lang/id/partner.php index bb2e4b6..1c2c72f 100644 --- a/resources/lang/id/partner.php +++ b/resources/lang/id/partner.php @@ -9,6 +9,9 @@ return [ 'empty' => 'Belum ada Partner', 'back_to_show' => 'Kembali ke detail Partner', 'back_to_index' => 'Kembali ke daftar Partner', + 'type' => 'Jenis Partner', + 'detail' => 'Detail Partner', + 'contact' => 'Kontak Partner', // Actions 'create' => 'Input Partner Baru', diff --git a/resources/views/partners/create.blade.php b/resources/views/partners/create.blade.php new file mode 100644 index 0000000..33f16c6 --- /dev/null +++ b/resources/views/partners/create.blade.php @@ -0,0 +1,44 @@ +@extends('layouts.app') + +@section('title', trans('partner.create')) + +@section('content') +

+
+ {{ link_to_route('partners.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} +
+ {{ trans('partner.create') }} +

+ +{!! Form::open(['route' => 'partners.store']) !!} +
+
+
+
+
+
+ @lang('partner.detail') + {!! FormField::text('name', ['required' => true]) !!} + {!! FormField::radios('type_id', $partnerTypes, ['required' => true]) !!} + {!! FormField::textarea('notes') !!} +
+
+ @lang('partner.contact') + {!! FormField::text('pic') !!} +
+
{!! FormField::email('email') !!}
+
{!! FormField::text('phone') !!}
+
+ {!! FormField::textarea('address') !!} +
+
+
+
+ {!! Form::submit(trans('partner.create'), ['class' => 'btn btn-success']) !!} + {{ link_to_route('partners.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} +
+
+
+
+{!! Form::close() !!} +@endsection diff --git a/resources/views/partners/edit.blade.php b/resources/views/partners/edit.blade.php new file mode 100644 index 0000000..3f65b6d --- /dev/null +++ b/resources/views/partners/edit.blade.php @@ -0,0 +1,53 @@ +@extends('layouts.app') + +@section('title', trans('partner.edit').' '.$partner->name) + +@section('content') +

+
+ {{ link_to_route('partners.show', trans('partner.back_to_show'), [$partner->id], ['class' => 'btn btn-default']) }} +
+ {{ $partner->name }} {{ trans('partner.edit') }} +

+ +@includeWhen(Request::has('action'), 'partners.forms') + +{!! Form::model($partner, ['route' => ['partners.update', $partner->id],'method' => 'patch']) !!} +
+
+
+
+
+
+ @lang('partner.detail') + {!! FormField::text('name', ['required' => true]) !!} +
+
{!! FormField::radios('type_id', $partnerTypes, ['required' => true]) !!}
+
{!! FormField::radios('is_active', ['Non Aktif', 'Aktif']) !!}
+
+ {!! FormField::textarea('notes') !!} +
+
+ @lang('partner.contact') + {!! FormField::text('pic') !!} +
+
{!! FormField::email('email') !!}
+
{!! FormField::text('phone') !!}
+
+ {!! FormField::textarea('address') !!} +
+
+
+
+ {!! Form::submit(trans('partner.update'), ['class' => 'btn btn-success']) !!} + {{ link_to_route('partners.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} + {!! link_to_route('partners.edit', trans('app.delete'), [$partner->id, 'action' => 'delete'], [ + 'id' => 'del-partner-'.$partner->id, + 'class' => 'btn btn-link pull-right' + ] ) !!} +
+
+
+
+{!! Form::close() !!} +@endsection diff --git a/resources/views/partners/forms.blade.php b/resources/views/partners/forms.blade.php index b7c1659..0110ab0 100644 --- a/resources/views/partners/forms.blade.php +++ b/resources/views/partners/forms.blade.php @@ -1,68 +1,39 @@ -@if (Request::get('action') == 'create') - {!! Form::open(['route' => 'partners.store']) !!} - {!! FormField::text('name', ['required' => true]) !!} - {!! FormField::radios('type_id', $partnerTypes, ['required' => true]) !!} - {!! FormField::email('email') !!} - {!! FormField::text('phone') !!} - {!! FormField::text('pic') !!} - {!! FormField::textarea('address') !!} - {!! FormField::textarea('notes') !!} - {!! Form::submit(trans('partner.create'), ['class' => 'btn btn-success']) !!} - {{ link_to_route('partners.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} - {!! Form::close() !!} -@endif -@if (Request::get('action') == 'edit' && $editablePartner) - {!! Form::model($editablePartner, ['route' => ['partners.update', $editablePartner->id],'method' => 'patch']) !!} - {!! FormField::text('name', ['required' => true]) !!} - {!! FormField::radios('type_id', $partnerTypes, ['required' => true]) !!} - {!! FormField::email('email') !!} - {!! FormField::text('phone') !!} - {!! FormField::text('pic') !!} - {!! FormField::textarea('address') !!} - {!! FormField::textarea('notes') !!} - {!! FormField::radios('is_active', ['Non Aktif', 'Aktif']) !!} - @if (request('q')) - {{ Form::hidden('q', request('q')) }} - @endif - @if (request('page')) - {{ Form::hidden('page', request('page')) }} - @endif - {!! Form::submit(trans('partner.update'), ['class' => 'btn btn-success']) !!} - {{ link_to_route('partners.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} - {!! Form::close() !!} -@endif -@if (Request::get('action') == 'delete' && $editablePartner) -
-

{{ trans('partner.delete') }}

-
- -

{{ $editablePartner->name }}

- -

{{ $editablePartner->email }}

- -

{{ $editablePartner->phone }}

- -

{{ $editablePartner->address }}

- -

{{ $editablePartner->is_active }}

- -

{{ $editablePartner->notes }}

- {!! $errors->first('partner_id', ':message') !!} -
-
-
{{ trans('app.delete_confirm') }}
-
- {!! FormField::delete( - ['route'=>['partners.destroy',$editablePartner->id]], - trans('app.delete_confirm_button'), - ['class'=>'btn btn-danger'], - [ - 'partner_id' => $editablePartner->id, - 'page' => request('page'), - 'q' => request('q'), - ] - ) !!} - {{ link_to_route('partners.index', trans('app.cancel'), [], ['class' => 'btn btn-default']) }} +@if (Request::get('action') == 'delete' && $partner) +
+
+
+

{{ trans('partner.delete') }}

+
+ +

{{ $partner->name }}

+ +

{{ $partner->email }}

+ +

{{ $partner->phone }}

+ +

{{ $partner->address }}

+ +

{{ $partner->is_active }}

+ +

{{ $partner->notes }}

+ {!! $errors->first('partner_id', ':message') !!} +
+
+
{{ trans('app.delete_confirm') }}
+
+ {!! FormField::delete( + ['route'=>['partners.destroy',$partner->id]], + trans('app.delete_confirm_button'), + ['class'=>'btn btn-danger'], + [ + 'partner_id' => $partner->id, + 'page' => request('page'), + 'q' => request('q'), + ] + ) !!} + {{ link_to_route('partners.edit', trans('app.cancel'), [$partner->id], ['class' => 'btn btn-default']) }} +
+
@endif diff --git a/resources/views/partners/index.blade.php b/resources/views/partners/index.blade.php index 1f11732..fd16712 100644 --- a/resources/views/partners/index.blade.php +++ b/resources/views/partners/index.blade.php @@ -5,14 +5,12 @@ @section('content')

- {{ link_to_route('partners.index', trans('partner.create'), ['action' => 'create'], ['class' => 'btn btn-success']) }} + {{ link_to_route('partners.create', trans('partner.create'), [], ['class' => 'btn btn-success']) }}
{{ trans('partner.list') }} {{ trans('app.total') }} : {{ $partners->total() }} {{ trans('partner.partner') }}

-@includeWhen(Request::has('action'), 'partners.forms') -
{{ Form::open(['method' => 'get','class' => 'form-inline']) }} @@ -42,20 +40,7 @@ {{ $partner->phone }} {{ $partner->projects_count }} {{ $partner->is_active }} - - {!! link_to_route( - 'partners.index', - trans('app.edit'), - ['action' => 'edit', 'id' => $partner->id] + Request::only('page', 'q'), - ['id' => 'edit-partner-' . $partner->id] - ) !!} | - {!! link_to_route( - 'partners.index', - trans('app.delete'), - ['action' => 'delete', 'id' => $partner->id] + Request::only('page', 'q'), - ['id' => 'del-partner-' . $partner->id] - ) !!} - + @endforeach diff --git a/resources/views/partners/show.blade.php b/resources/views/partners/show.blade.php index dc8b4ad..780e869 100755 --- a/resources/views/partners/show.blade.php +++ b/resources/views/partners/show.blade.php @@ -3,7 +3,14 @@ @section('title', trans('partner.show')) @section('content') -

{{ $partner->name }} {{ trans('partner.show') }}

+

+
+ {!! link_to_route('partners.edit', trans('partner.edit'), [$partner->id], ['id' => 'edit-partner-' . $partner->id, 'class' => 'btn btn-warning']) !!} + {!! link_to_route('partners.index', trans('partner.back_to_index'), [], ['class' => 'btn btn-default']) !!} +
+ + {{ $partner->name }} {{ trans('partner.show') }} +

@@ -19,10 +26,6 @@ {{ trans('app.notes') }}{!! nl2br($partner->notes) !!} -
- {{-- {!! link_to_route('partners.edit', trans('partner.edit'), [$partner->id], ['class' => 'btn btn-warning']) !!} --}} - {!! link_to_route('partners.index', trans('partner.back_to_index'), [], ['class' => 'btn btn-default']) !!} -
diff --git a/routes/web.php b/routes/web.php index b5de8bb..9214bde 100644 --- a/routes/web.php +++ b/routes/web.php @@ -24,5 +24,5 @@ Route::group(['middleware' => ['web', 'auth']], function () { /* * Partners Routes */ - Route::apiResource('partners', 'Partners\PartnersController'); + Route::resource('partners', 'Partners\PartnersController'); }); diff --git a/tests/Feature/ManagePartnersTest.php b/tests/Feature/ManagePartnersTest.php index 2b93e8a..753e00a 100644 --- a/tests/Feature/ManagePartnersTest.php +++ b/tests/Feature/ManagePartnersTest.php @@ -29,7 +29,7 @@ class ManagePartnersTest extends TestCase $this->visit(route('partners.index')); $this->click(trans('partner.create')); - $this->seePageIs(route('partners.index', ['action' => 'create'])); + $this->seePageIs(route('partners.create')); $this->submitForm(trans('partner.create'), [ 'name' => 'Partner 1 name', @@ -41,7 +41,7 @@ class ManagePartnersTest extends TestCase 'notes' => '', ]); - $this->seePageIs(route('partners.index')); + $this->see(trans('partner.created')); $this->seeInDatabase('partners', [ 'name' => 'Partner 1 name', @@ -56,14 +56,14 @@ class ManagePartnersTest extends TestCase } /** @test */ - public function user_can_edit_a_partner_within_search_query() + public function user_can_edit_a_partner() { $user = $this->adminUserSigningIn(); $partner = factory(Partner::class)->create(['owner_id' => $user->agency->id, 'name' => 'Testing 123']); - $this->visit(route('partners.index', ['q' => '123'])); + $this->visit(route('partners.show', [$partner->id])); $this->click('edit-partner-'.$partner->id); - $this->seePageIs(route('partners.index', ['action' => 'edit', 'id' => $partner->id, 'q' => '123'])); + $this->seePageIs(route('partners.edit', [$partner->id])); $this->submitForm(trans('partner.update'), [ 'name' => 'Partner 1 name', @@ -76,7 +76,7 @@ class ManagePartnersTest extends TestCase 'is_active' => 0, ]); - $this->seePageIs(route('partners.index', ['q' => '123'])); + $this->seePageIs(route('partners.show', $partner->id)); $this->seeInDatabase('partners', [ 'name' => 'Partner 1 name', @@ -96,9 +96,9 @@ class ManagePartnersTest extends TestCase $user = $this->adminUserSigningIn(); $partner = factory(Partner::class)->create(['owner_id' => $user->agency->id]); - $this->visit(route('partners.index', [$partner->id])); + $this->visit(route('partners.edit', [$partner->id])); $this->click('del-partner-'.$partner->id); - $this->seePageIs(route('partners.index', ['action' => 'delete', 'id' => $partner->id])); + $this->seePageIs(route('partners.edit', [$partner->id, 'action' => 'delete'])); $this->seeInDatabase('partners', [ 'id' => $partner->id,