From f0386a84bf228a12c2696adb10b727a6fd89dac2 Mon Sep 17 00:00:00 2001 From: Nafies Luthfi Date: Tue, 20 Dec 2016 22:27:51 +0800 Subject: [PATCH] Update 2016-12-20.22.23 Add vendor_id to subscriptions table Add Event is_allday to user_events table Add logfiles viewer for admin --- app/Entities/BaseRepository.php | 5 + app/Entities/Payments/Payment.php | 5 + app/Entities/Subscriptions/Subscription.php | 5 + app/Http/Controllers/Api/EventsController.php | 2 + app/Http/Controllers/SubscriptionsController.php | 6 +- app/Http/Middleware/Authenticate.php | 2 +- app/Http/Middleware/RoleMiddleware.php | 2 +- config/app.php | 1 + database/factories/ModelFactory.php | 15 +- resources/lang/id/subscription.php | 1 + resources/views/auth/login.blade.php | 2 +- resources/views/layouts/guest.blade.php | 2 +- resources/views/payments/index.blade.php | 4 +- .../views/projects/features-export-html.blade.php | 8 +- resources/views/projects/payments.blade.php | 2 +- resources/views/reports/log-files.blade.php | 53 ++++++ resources/views/subscriptions/create.blade.php | 1 + resources/views/subscriptions/edit.blade.php | 1 + resources/views/subscriptions/index.blade.php | 9 +- resources/views/users/calendar-vue.blade.php | 197 +++++++++++++++++++++ resources/views/users/calendar.blade.php | 32 ++-- routes/web/account.php | 2 +- routes/web/calendar.php | 13 +- routes/web/reports.php | 28 +++ tests/api/ApiEventsTest.php | 1 + tests/auth/MemberChangePasswordTest.php | 8 +- tests/auth/MemberRegistrationAndLoginTest.php | 24 +-- tests/auth/MemberResetPasswordTest.php | 7 +- tests/functional/ManageSubscriptionsTest.php | 16 +- 29 files changed, 380 insertions(+), 74 deletions(-) create mode 100755 resources/views/reports/log-files.blade.php create mode 100644 resources/views/users/calendar-vue.blade.php diff --git a/app/Entities/BaseRepository.php b/app/Entities/BaseRepository.php index f2b18fc..a36755d 100755 --- a/app/Entities/BaseRepository.php +++ b/app/Entities/BaseRepository.php @@ -21,6 +21,11 @@ abstract class BaseRepository extends EloquentRepository { return User::orderBy('name')->hasRoles(['worker'])->pluck('name','id'); } + public function getVendorsList() + { + return User::orderBy('name')->hasRoles(['vendor'])->pluck('name','id'); + } + public function getProjectsList() { return Project::orderBy('name')->pluck('name','id'); diff --git a/app/Entities/Payments/Payment.php b/app/Entities/Payments/Payment.php index f8d9bf4..910ea0b 100755 --- a/app/Entities/Payments/Payment.php +++ b/app/Entities/Payments/Payment.php @@ -24,4 +24,9 @@ class Payment extends Model { { return $this->belongsTo(User::class, 'customer_id'); } + + public function type() + { + return paymentTypes($this->type_id); + } } diff --git a/app/Entities/Subscriptions/Subscription.php b/app/Entities/Subscriptions/Subscription.php index 8158418..5df7e34 100755 --- a/app/Entities/Subscriptions/Subscription.php +++ b/app/Entities/Subscriptions/Subscription.php @@ -25,6 +25,11 @@ class Subscription extends Model { return $this->belongsTo(User::class,'customer_id'); } + public function vendor() + { + return $this->belongsTo(User::class,'vendor_id'); + } + public function status() { return $this->status_id ? 'Aktif' : 'Non Aktif'; diff --git a/app/Http/Controllers/Api/EventsController.php b/app/Http/Controllers/Api/EventsController.php index b1678f7..fb11d13 100644 --- a/app/Http/Controllers/Api/EventsController.php +++ b/app/Http/Controllers/Api/EventsController.php @@ -89,6 +89,7 @@ class EventsController extends Controller 'id' => 'required|numeric|exists:user_events,id', 'title' => 'required|string|max:60', 'body' => 'string|max:255', + 'is_allday' => '', ]); $event = Event::findOrFail($request->get('id')); @@ -96,6 +97,7 @@ class EventsController extends Controller $event->title = $request->get('title'); $event->body = $request->get('body'); + $event->is_allday = !!$request->get('is_allday'); $event->save(); diff --git a/app/Http/Controllers/SubscriptionsController.php b/app/Http/Controllers/SubscriptionsController.php index 967b470..11974ad 100755 --- a/app/Http/Controllers/SubscriptionsController.php +++ b/app/Http/Controllers/SubscriptionsController.php @@ -29,7 +29,8 @@ class SubscriptionsController extends Controller { { $projects = $this->repo->getProjectsList(); $customers = $this->repo->getCustomersList(); - return view('subscriptions.create', compact('projects','customers')); + $vendors = $this->repo->getVendorsList(); + return view('subscriptions.create', compact('projects','customers','vendors')); } public function store(CreateRequest $req) @@ -50,7 +51,8 @@ class SubscriptionsController extends Controller { $subscription = $this->repo->requireById($subscriptionId); $projects = $this->repo->getProjectsList(); $customers = $this->repo->getCustomersList(); - return view('subscriptions.edit',compact('subscription','projects','customers')); + $vendors = $this->repo->getVendorsList(); + return view('subscriptions.edit',compact('subscription','projects','customers','vendors')); } public function update(UpdateRequest $req, $subscriptionId) diff --git a/app/Http/Middleware/Authenticate.php b/app/Http/Middleware/Authenticate.php index 1cbe354..67abcae 100644 --- a/app/Http/Middleware/Authenticate.php +++ b/app/Http/Middleware/Authenticate.php @@ -21,7 +21,7 @@ class Authenticate if ($request->ajax() || $request->wantsJson()) { return response('Unauthorized.', 401); } else { - return redirect()->guest('auth/login'); + return redirect()->guest('login'); } } diff --git a/app/Http/Middleware/RoleMiddleware.php b/app/Http/Middleware/RoleMiddleware.php index dacf9d7..8b39782 100644 --- a/app/Http/Middleware/RoleMiddleware.php +++ b/app/Http/Middleware/RoleMiddleware.php @@ -18,7 +18,7 @@ class RoleMiddleware $nameArray = explode('|', $names); if (auth()->check() == false) { - return redirect()->guest('auth/login'); + return redirect()->guest('login'); } // Cek apakah grup user ada di dalam array $nameArray? diff --git a/config/app.php b/config/app.php index 19332d5..24857a3 100644 --- a/config/app.php +++ b/config/app.php @@ -109,6 +109,7 @@ return [ */ 'log' => env('APP_LOG', 'daily'), + 'log_max_files' => 30, /* |-------------------------------------------------------------------------- diff --git a/database/factories/ModelFactory.php b/database/factories/ModelFactory.php index ae7ec2f..cb80e08 100644 --- a/database/factories/ModelFactory.php +++ b/database/factories/ModelFactory.php @@ -8,17 +8,6 @@ use App\Entities\Subscriptions\Subscription; use App\Entities\Users\Event; use App\Entities\Users\User; -/* -|-------------------------------------------------------------------------- -| Model Factories -|-------------------------------------------------------------------------- -| -| Here you may define all of your model factories. Model factories give -| you a convenient way to create models for testing and seeding your -| database. Just tell the factory how a default model should look. -| -*/ - $factory->define(User::class, function (Faker\Generator $faker) { return [ 'name' => $faker->name, @@ -73,6 +62,9 @@ $factory->define(Subscription::class, function (Faker\Generator $faker) { $customer = factory(User::class)->create(); $customer->assignRole('customer'); $customerId = $customer->id; + $vendor = factory(User::class)->create(); + $vendor->assignRole('vendor'); + $vendorId = $vendor->id; $startDate = Carbon::parse($faker->dateTimeBetween('-1 year', '-1 month')->format('Y-m-d')); return [ @@ -87,6 +79,7 @@ $factory->define(Subscription::class, function (Faker\Generator $faker) { 'due_date' => $startDate->addYears(1)->format('Y-m-d'), 'remark' => $faker->paragraph, 'customer_id' => $customerId, + 'vendor_id' => $vendorId, ]; }); diff --git a/resources/lang/id/subscription.php b/resources/lang/id/subscription.php index 1446da1..a22a99a 100644 --- a/resources/lang/id/subscription.php +++ b/resources/lang/id/subscription.php @@ -28,4 +28,5 @@ return [ 'back_to_index' => 'Kembali ke daftar Langganan', 'customer' => 'Customer', 'project' => 'Project', + 'vendor' => 'Vendor', ]; \ No newline at end of file diff --git a/resources/views/auth/login.blade.php b/resources/views/auth/login.blade.php index eb53528..cbb81d5 100644 --- a/resources/views/auth/login.blade.php +++ b/resources/views/auth/login.blade.php @@ -3,6 +3,7 @@ @section('title', trans('auth.login')) @section('content') +@include('flash::message')
Logo {{ Option::get('app_owner') }} @@ -10,7 +11,6 @@

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

- @include('flash::message') @include('auth.partials._errors') {!! Form::open(['route'=>'auth.login']) !!}
diff --git a/resources/views/layouts/guest.blade.php b/resources/views/layouts/guest.blade.php index 0a17f06..846cf45 100755 --- a/resources/views/layouts/guest.blade.php +++ b/resources/views/layouts/guest.blade.php @@ -13,7 +13,7 @@ {{-- {!! Html::style('assets/css/bootstrap-theme.min.css') !!} --}} {{-- {!! Html::style('assets/css/font-awesome.min.css') !!} --}} {{-- {!! Html::style('assets/css/sb-admin-2.css') !!} --}} - {!! Html::style('assets/css/app.css') !!} + {!! Html::style('assets/css/app.s.css') !!} @yield('ext_css') diff --git a/resources/views/payments/index.blade.php b/resources/views/payments/index.blade.php index d0ec9b9..787e5ae 100755 --- a/resources/views/payments/index.blade.php +++ b/resources/views/payments/index.blade.php @@ -29,9 +29,9 @@ @forelse($payments as $key => $payment) {{ $payments->firstItem() + $key }} - {!! link_to_route('projects.payments', $payment->project->name, [$payment->project_id], ['title' => 'Lihat seluruh Pembayaran Project ini']) !!} + {!! link_to_route('projects.payments', $payment->project->name, [$payment->project_id], ['title' => 'Lihat seluruh Pembayaran Project ini']) !!} [{{ $payment->type() }}] {{ $payment->date }} - {{ formatRp($payment->amount) }} + {{ $payment->present()->amount }} {{ $payment->description }} {{ $payment->customer->name }} diff --git a/resources/views/projects/features-export-html.blade.php b/resources/views/projects/features-export-html.blade.php index 7887857..ca5a358 100755 --- a/resources/views/projects/features-export-html.blade.php +++ b/resources/views/projects/features-export-html.blade.php @@ -10,15 +10,15 @@ {{-- --}} {{ $project->name }} - {!! Html::style('assets/css/app.css') !!} + {!! Html::style('assets/css/app.s.css') !!} - +

{{ trans('project.features') }} {{ $project->name }}

@foreach($features as $key => $feature)

{{ $feature->name }}

- +
@@ -41,7 +41,7 @@ @endforeach

Biaya Pembuatan

-
{{ trans('app.description') }}
{!! nl2br($feature->description) !!}
+
diff --git a/resources/views/projects/payments.blade.php b/resources/views/projects/payments.blade.php index 1e7c1c7..76cfb4e 100755 --- a/resources/views/projects/payments.blade.php +++ b/resources/views/projects/payments.blade.php @@ -37,7 +37,7 @@ - + @empty diff --git a/resources/views/reports/log-files.blade.php b/resources/views/reports/log-files.blade.php new file mode 100755 index 0000000..a651c9f --- /dev/null +++ b/resources/views/reports/log-files.blade.php @@ -0,0 +1,53 @@ +@extends('layouts.app') + +@section('title','Log Files') + +@section('content') +

+ Log Files +

+
+
+
+
{{ trans('app.table_no') }}{{ $payment->date }} {{ formatRp($payment->amount) }} {{ $payment->customer->name }}{{ $payment->description }}{{ $payment->description }} [{{ $payment->type() }}] {!! html_link_to_route('payments.show','',[$payment->id],['class' => 'btn btn-info btn-xs','icon' => 'search','title' => 'Lihat ' . trans('payment.show')]) !!}
+ + + + + + + + + @forelse($logFiles as $key => $logFile) + + + + + + + + @empty + + + + @endforelse + +
#Nama FileUkuranTanggal Jam{{ trans('app.action') }}
{{ $key + 1 }}{{ $logFile->getFilename() }}{{ formatSizeUnits($logFile->getSize()) }}{{ date('Y-m-d H:i:s', $logFile->getMTime()) }} + {!! html_link_to_route('log-files.download','',[$logFile->getFilename()],[ + 'class'=>'btn btn-default btn-xs', + 'icon' => 'download', + 'id' => 'download-' . $logFile->getFilename(), + 'title' => 'Download file ' . $logFile->getFilename() + ]) !!} + {!! html_link_to_route('log-files.show','',[$logFile->getFilename()],[ + 'class'=>'btn btn-default btn-xs', + 'icon' => 'search', + 'id' => 'view-' . $logFile->getFilename(), + 'title' => 'View file ' . $logFile->getFilename(), + 'target' => '_blank', + ]) !!} +
Belum ada file logFile
+
+
+
+@endsection diff --git a/resources/views/subscriptions/create.blade.php b/resources/views/subscriptions/create.blade.php index 404fd12..3d98053 100755 --- a/resources/views/subscriptions/create.blade.php +++ b/resources/views/subscriptions/create.blade.php @@ -41,6 +41,7 @@
{!! FormField::select('customer_id', $customers,['label'=> trans('subscription.customer'),'value' => Request::get('customer_id')]) !!} {!! FormField::select('project_id', $projects,['label'=> trans('subscription.project'),'value' => Request::get('project_id')]) !!} + {!! FormField::select('vendor_id', $vendors,['label'=> trans('subscription.vendor'),'value' => Request::get('vendor_id')]) !!} {!! FormField::textarea('remark',['label'=> trans('subscription.remark')]) !!}
diff --git a/resources/views/subscriptions/edit.blade.php b/resources/views/subscriptions/edit.blade.php index 1e0ccc0..40152d6 100755 --- a/resources/views/subscriptions/edit.blade.php +++ b/resources/views/subscriptions/edit.blade.php @@ -36,6 +36,7 @@
{!! FormField::select('customer_id', $customers,['label'=> trans('subscription.customer')]) !!} {!! FormField::select('project_id', $projects,['label'=> trans('subscription.project')]) !!} + {!! FormField::select('vendor_id', $vendors,['label'=> trans('subscription.vendor')]) !!} {!! FormField::radios('status_id', ['Non Active','Active'],['label'=> trans('app.status')]) !!} {!! FormField::textarea('remark',['label'=> trans('subscription.remark')]) !!} diff --git a/resources/views/subscriptions/index.blade.php b/resources/views/subscriptions/index.blade.php index 205ee42..abf278d 100755 --- a/resources/views/subscriptions/index.blade.php +++ b/resources/views/subscriptions/index.blade.php @@ -20,7 +20,7 @@ {{ trans('app.table_no') }} {{ trans('subscription.domain_name') }} {{ trans('subscription.hosting_capacity') }} - {{ trans('subscription.start_date') }} + {{ trans('subscription.vendor') }} {{ trans('subscription.due_date') }} {{ trans('subscription.extension_price') }} {{ trans('app.status') }} @@ -32,8 +32,11 @@ {{ $subscriptions->firstItem() + $key }} {{ $subscription->domain_name }} {{ $subscription->hosting_capacity }} - {{ dateId($subscription->start_date) }} - {{ dateId($subscription->due_date) }} + {{ $subscription->vendor->name }} + {{ dateId($subscription->due_date) }} {{ formatRp($subscription->domain_price + $subscription->hosting_price) }} {{ $subscription->status() }} diff --git a/resources/views/users/calendar-vue.blade.php b/resources/views/users/calendar-vue.blade.php new file mode 100644 index 0000000..120cfec --- /dev/null +++ b/resources/views/users/calendar-vue.blade.php @@ -0,0 +1,197 @@ +@extends('layouts.app') + +@section('title', 'Safety Calendar') + +@section('content') + +
+
+
+
+

Safety Calendar Click to add/edit events

+
+
+
+ +
+
+
+
+
+
+
+ +@endsection + +@section('ext_css') +{!! Html::style(url('assets/css/plugins/fullcalendar.min.css')) !!} +@endsection + +@section('ext_js') +{!! Html::script(url('assets/js/plugins/moment.min.js')) !!} +{!! Html::script(url('assets/js/plugins/fullcalendar.min.js')) !!} +{!! Html::script(url('assets/js/plugins/vue.min.js')) !!} +{!! Html::script(url('assets/js/plugins/vue-resource.min.js')) !!} +@endsection + +@section('script') + +@endsection \ No newline at end of file diff --git a/resources/views/users/calendar.blade.php b/resources/views/users/calendar.blade.php index 82b7748..dbac6d5 100644 --- a/resources/views/users/calendar.blade.php +++ b/resources/views/users/calendar.blade.php @@ -94,7 +94,12 @@ - +
+ +
+ +
+
@@ -134,16 +139,18 @@ var calendar = $('#calendar').fullCalendar({ header: { - left: 'prev,next today', + right: 'prev,next today', center: 'title', - right: 'month,agendaWeek,agendaDay' + left: 'month,agendaWeek,agendaDay,listYear' }, + // defaultView: 'month', height: 550, selectable: true, selectHelper: true, - droppable: false, - editable: false, + minTime: '06:00:00', // eventLimit: true, + weekNumbers: true, + navLinks: true, slotLabelFormat: 'HH:mm', slotDuration: '01:00:00', events: { @@ -153,11 +160,9 @@ alert('there was an error while fetching events!'); } }, - eventRender: function(calEvent, element) { - // element.find('.fc-content').prepend('' + calEvent.user + ''); - }, select: function(start, end, allDay) { - $('#fc_create').click(); + // $('#fc_create').click(); + $('#CalenderModalNew').modal('show'); started = start; ended = end; @@ -199,7 +204,7 @@ calendar.fullCalendar('unselect'); - $('.antoclose').click(); + $('#CalenderModalNew').modal('hide'); return false; }); @@ -210,6 +215,7 @@ $('#user2').text(calEvent.user); $('#title2').val(calEvent.title); $('#descr2').val(calEvent.body); + $('#is_allday2').val(calEvent.allDay); $('#CalenderModalEdit').modal(); } else { @@ -243,17 +249,17 @@ } $('#CalenderModalEdit').modal('hide'); - $('#CalenderModalView').modal('hide'); }); $("#antoform2").off("submit").on("submit", function() { calEvent.title = $("#title2").val(); calEvent.body = $("#descr2").val(); + calEvent.is_allday = $("#is_allday2").is(':checked'); $.ajax({ url: "{{ route('api.events.update') }}", method: "PATCH", - data: { id: calEvent.id, title: calEvent.title, body: calEvent.body }, + data: { id: calEvent.id, title: calEvent.title, body: calEvent.body, is_allday: calEvent.is_allday }, success: function(response){ if(response.message == 'event.updated') $('#calendar').fullCalendar('updateEvent',calEvent); @@ -308,6 +314,6 @@ } }); -})(); + })(); @endsection \ No newline at end of file diff --git a/routes/web/account.php b/routes/web/account.php index 6787fb0..2c855ab 100644 --- a/routes/web/account.php +++ b/routes/web/account.php @@ -2,7 +2,7 @@ /** * Account Routes */ -Route::group(['prefix' => 'auth','middleware' => 'web','as'=>'auth.'], function() { +Route::group(['middleware' => 'web','as'=>'auth.'], function() { Route::get('login', ['as'=>'login', 'uses' => 'AuthController@getLogin']); Route::post('login', ['as'=>'login', 'uses' => 'AuthController@postLogin']); Route::get('logout', ['as'=>'logout', 'uses' => 'AuthController@getLogout']); diff --git a/routes/web/calendar.php b/routes/web/calendar.php index be043e8..715efa6 100644 --- a/routes/web/calendar.php +++ b/routes/web/calendar.php @@ -7,15 +7,4 @@ Route::group(['middleware' => ['web','auth'], 'namespace' => 'Api'], function() Route::get('my-calendar', ['as' => 'users.calendar', 'uses' => function() { return view('users.calendar'); }]); -}); - -// Route::group(['middleware' => ['api','auth:api'], 'namespace' => 'Api'], function() { -// /** -// * Savety Calendar -// */ -// Route::get('get-events', ['as' => 'api.events.index', 'uses' => 'EventsController@index']); -// Route::post('events', ['as' => 'api.events.store', 'uses' => 'EventsController@store']); -// Route::patch('events/update', ['as' => 'api.events.update', 'uses' => 'EventsController@update']); -// Route::patch('events/reschedule', ['as' => 'api.events.reschedule', 'uses' => 'EventsController@reschedule']); -// Route::delete('events/delete', ['as' => 'api.events.destroy', 'uses' => 'EventsController@destroy']); -// }); +}); \ No newline at end of file diff --git a/routes/web/reports.php b/routes/web/reports.php index 6e5bc65..ca919e0 100644 --- a/routes/web/reports.php +++ b/routes/web/reports.php @@ -9,4 +9,32 @@ Route::group(['middleware' => ['web','role:admin'],'prefix' => 'reports'], funct Route::get('payments/monthly', ['as'=>'reports.payments.monthly', 'uses' => 'ReportsController@monthly']); Route::get('payments/yearly', ['as'=>'reports.payments.yearly', 'uses' => 'ReportsController@yearly']); Route::get('current-credits', ['as'=>'reports.current-credits', 'uses' => 'ReportsController@currentCredits']); + + Route::get('log-files', ['as' => 'log-files.index', 'uses' => function() { + if (!file_exists(storage_path('logs'))) + return []; + + $logFiles = \File::allFiles(storage_path('logs')); + + // Sort files by modified time DESC + usort($logFiles, function($a, $b) { + return -1 * strcmp($a->getMTime(), $b->getMTime()); + }); + + return view('reports.log-files',compact('logFiles')); + }]); + + Route::get('log-files/{filename}', ['as' => 'log-files.show', 'uses' => function($fileName) { + if (file_exists(storage_path('logs/' . $fileName))) + return response()->file(storage_path('logs/' . $fileName), ['content-type' => 'text/plain']); + + return 'Invalid file name.'; + }]); + + Route::get('log-files/{filename}/download', ['as' => 'log-files.download', 'uses' => function($fileName) { + if (file_exists(storage_path('logs/' . $fileName))) + return response()->download(storage_path('logs/' . $fileName), env('APP_ENV') . '.' . $fileName); + + return 'Invalid file name.'; + }]); }); diff --git a/tests/api/ApiEventsTest.php b/tests/api/ApiEventsTest.php index 938c15b..464e105 100644 --- a/tests/api/ApiEventsTest.php +++ b/tests/api/ApiEventsTest.php @@ -81,6 +81,7 @@ class ApiEventsTest extends TestCase 'id' => $event->id, 'title' => 'New Event Title', 'body' => 'New Event Body', + 'is_allday' => 'true', ], [ 'Authorization' => 'Bearer ' . $user->api_token ]); diff --git a/tests/auth/MemberChangePasswordTest.php b/tests/auth/MemberChangePasswordTest.php index 2e45a5b..a73d8a9 100644 --- a/tests/auth/MemberChangePasswordTest.php +++ b/tests/auth/MemberChangePasswordTest.php @@ -16,8 +16,8 @@ class MemberChangePasswordTest extends TestCase $user->assignRole('customer'); $this->actingAs($user); - $this->visit('home'); - $this->seePageIs('home'); + $this->visit(route('home')); + $this->seePageIs(route('home')); $this->click(trans('auth.change_password')); $this->type('member1','old_password'); @@ -34,10 +34,10 @@ class MemberChangePasswordTest extends TestCase // Logout and login using new Password $this->click('Keluar'); - $this->seePageIs('auth/login'); + $this->seePageIs(route('auth.login')); $this->type($user->username,'username'); $this->type('rahasia','password'); $this->press('Login'); - $this->seePageIs('home'); + $this->seePageIs(route('home')); } } diff --git a/tests/auth/MemberRegistrationAndLoginTest.php b/tests/auth/MemberRegistrationAndLoginTest.php index 961cd02..00eede0 100644 --- a/tests/auth/MemberRegistrationAndLoginTest.php +++ b/tests/auth/MemberRegistrationAndLoginTest.php @@ -15,14 +15,14 @@ class MemberRegistrationAndLoginTest extends TestCase $user = factory(User::class)->create(['email' => 'member@app.dev']); $user->assignRole('customer'); - $this->visit('/auth/register'); + $this->visit(route('auth.register')); $this->type('', 'name'); $this->type('', 'username'); $this->type('member@app.dev', 'email'); $this->type('', 'password'); $this->type('', 'password_confirmation'); $this->press('Buat Akun Baru'); - $this->seePageIs('/auth/register'); + $this->seePageIs(route('auth.register')); $this->see('Nama harus diisi.'); $this->see('Username harus diisi.'); $this->see('Email ini sudah terdaftar.'); @@ -35,7 +35,7 @@ class MemberRegistrationAndLoginTest extends TestCase $this->type('password', 'password'); $this->type('password..', 'password_confirmation'); $this->press('Buat Akun Baru'); - $this->seePageIs('/auth/register'); + $this->seePageIs(route('auth.register')); $this->see('Email tidak valid.'); $this->see('Konfirmasi password tidak sesuai.'); } @@ -43,50 +43,50 @@ class MemberRegistrationAndLoginTest extends TestCase /** @test */ public function member_register_successfully() { - $this->visit('/auth/register'); + $this->visit(route('auth.register')); $this->type('Nama Member', 'name'); $this->type('namamember', 'username'); $this->type('email@mail.com', 'email'); $this->type('password.111', 'password'); $this->type('password.111', 'password_confirmation'); $this->press('Buat Akun Baru'); - $this->seePageIs('/home'); + $this->seePageIs(route('home')); $this->see('Selamat datang Nama Member.'); } /** @test */ public function member_register_and_login_successfully() { - $this->visit('/auth/register'); + $this->visit(route('auth.register')); $this->type('Nama Member', 'name'); $this->type('namamember', 'username'); $this->type('email@mail.com', 'email'); $this->type('password.111', 'password'); $this->type('password.111', 'password_confirmation'); $this->press('Buat Akun Baru'); - $this->seePageIs('/home'); + $this->seePageIs(route('home')); $this->see('Selamat datang Nama Member.'); $this->click('Keluar'); - $this->visit('/auth/login'); + $this->visit(route('auth.login')); $this->type('namamember','username'); $this->type('password.111','password'); $this->press('Login'); - $this->seePageIs('/home'); + $this->seePageIs(route('home')); $this->see('Selamat datang kembali Nama Member.'); $this->click('Keluar'); - $this->seePageIs('/auth/login'); + $this->seePageIs(route('auth.login')); $this->see('Anda telah logout.'); } /** @test */ public function member_invalid_login() { - $this->visit('/auth/login'); + $this->visit(route('auth.login')); $this->type('namamember','username'); $this->type('password.112','password'); $this->press('Login'); - $this->seePageIs('/auth/login'); + $this->seePageIs(route('auth.login')); $this->see('Mohon maaf, anda tidak dapat login'); } } diff --git a/tests/auth/MemberResetPasswordTest.php b/tests/auth/MemberResetPasswordTest.php index f30e5e6..aa9621d 100644 --- a/tests/auth/MemberResetPasswordTest.php +++ b/tests/auth/MemberResetPasswordTest.php @@ -48,8 +48,7 @@ class MemberResetPasswordTest extends TestCase $this->type('rahasia','password_confirmation'); $this->press('Reset Password'); - - $this->seePageIs('home'); + $this->seePageIs(route('home')); $this->notSeeInDatabase('password_resets', [ 'email' => $user->email @@ -57,11 +56,11 @@ class MemberResetPasswordTest extends TestCase // Logout and login using new Password $this->click('Keluar'); - $this->seePageIs('auth/login'); + $this->seePageIs(route('auth.login')); $this->type($user->username,'username'); $this->type('rahasia','password'); $this->press('Login'); - $this->seePageIs('home'); + $this->seePageIs(route('home')); } } diff --git a/tests/functional/ManageSubscriptionsTest.php b/tests/functional/ManageSubscriptionsTest.php index 2a99567..48c6436 100644 --- a/tests/functional/ManageSubscriptionsTest.php +++ b/tests/functional/ManageSubscriptionsTest.php @@ -23,6 +23,9 @@ class ManageSubscriptionsTest extends TestCase $customer = factory(User::class)->create(); $customer->assignRole('customer'); + $vendor = factory(User::class)->create(); + $vendor->assignRole('vendor'); + $this->visit('subscriptions'); $this->seePageIs('subscriptions'); $this->see(trans('subscription.subscriptions')); @@ -39,6 +42,7 @@ class ManageSubscriptionsTest extends TestCase $this->type('2016-05-02','due_date'); $this->select($project->id, 'project_id'); $this->select($customer->id, 'customer_id'); + $this->select($vendor->id, 'vendor_id'); $this->type('','remark'); $this->press(trans('subscription.create')); @@ -49,7 +53,9 @@ class ManageSubscriptionsTest extends TestCase 'domain_price' => 100000, 'status_id' => 1, 'start_date' => '2015-05-02', - 'due_date' => '2016-05-02' + 'due_date' => '2016-05-02', + 'customer_id' => $customer->id, + 'vendor_id' => $vendor->id, ]); } @@ -65,6 +71,9 @@ class ManageSubscriptionsTest extends TestCase $customer = factory(User::class)->create(); $customer->assignRole('customer'); + $vendor = factory(User::class)->create(); + $vendor->assignRole('vendor'); + $subscription = factory(Subscription::class)->create(['customer_id' => $customer->id, 'project_id' => $project->id]); $this->visit('subscriptions/' . $subscription->id . '/edit'); @@ -76,6 +85,9 @@ class ManageSubscriptionsTest extends TestCase $this->type(500000,'hosting_price'); $this->type('2015-05-02','start_date'); $this->type('2016-05-02','due_date'); + $this->select($project->id, 'project_id'); + $this->select($customer->id, 'customer_id'); + $this->select($vendor->id, 'vendor_id'); $this->select(0,'status_id'); $this->press(trans('subscription.update')); @@ -90,6 +102,8 @@ class ManageSubscriptionsTest extends TestCase 'hosting_price' => '500000', 'start_date' => '2015-05-02', 'due_date' => '2016-05-02', + 'customer_id' => $customer->id, + 'vendor_id' => $vendor->id, ]); }