Merge pull request #49 from nafiesl/laravel_upgrade

Laravel 6.x Upgrade closes #47

.travis.yml

@@ -1,7 +1,7 @@
 language: php
 
 php:
-  - 7.1
+  - 7.2
 
 before_script:
   - travis_retry composer self-update

app/Http/Controllers/Auth/ResetPasswordController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Auth;
 
+use Illuminate\Support\Str;
 use App\Http\Controllers\Controller;
 use Illuminate\Foundation\Auth\ResetsPasswords;
 
@@ -42,7 +43,7 @@ class ResetPasswordController extends Controller
     {
         $user->forceFill([
             'password'       => $password,
-            'remember_token' => str_random(60),
+            'remember_token' => Str::random(60),
         ])->save();
 
         $this->guard()->login($user);

app/Http/Controllers/InstallationController.php

@@ -4,6 +4,7 @@ namespace App\Http\Controllers;
 
 use DB;
 use Auth;
+use Illuminate\Support\Str;
 use App\Entities\Users\User;
 use App\Http\Requests\Accounts\RegisterRequest;
 
@@ -47,7 +48,7 @@ class InstallationController extends Controller
 
         $adminData = $request->only('name', 'email', 'password');
 
-        $adminData['api_token'] = str_random(32);
+        $adminData['api_token'] = Str::random(32);
         $adminData['password'] = bcrypt($adminData['password']);
 
         $admin = User::create($adminData);

app/Http/Controllers/Users/UsersController.php

@@ -2,6 +2,7 @@
 
 namespace App\Http\Controllers\Users;
 
+use Illuminate\Support\Str;
 use App\Entities\Users\User;
 use Illuminate\Http\Request;
 use App\Http\Controllers\Controller;
@@ -43,7 +44,7 @@ class UsersController extends Controller
             $userData['password'] = bcrypt(\Option::get('password_default', 'member'));
         }
 
-        $userData['api_token'] = str_random(32);
+        $userData['api_token'] = Str::random(32);
 
         $user = User::create($userData);
 

app/Services/InvoiceDraft/InvoiceDraftCollection.php

@@ -2,6 +2,7 @@
 
 namespace App\Services\InvoiceDrafts;
 
+use Illuminate\Support\Str;
 use Illuminate\Support\Collection;
 
 /**
@@ -68,7 +69,7 @@ class InvoiceDraftCollection
     public function add(InvoiceDraft $draft)
     {
         $content = $this->getContent();
-        $draft->draftKey = str_random(10);
+        $draft->draftKey = Str::random(10);
         $content->put($draft->draftKey, $draft);
 
         $this->session->put($this->instance, $content);

composer.json

@@ -5,11 +5,11 @@
     "license": "MIT",
     "type": "project",
     "require": {
-        "php": "^7.1.3",
-        "backup-manager/laravel": "^1.2",
-        "laracasts/presenter": "^0.2.1",
+        "php": "^7.2",
+        "backup-manager/laravel": "^1.4",
         "fideloper/proxy": "^4.0",
-        "laravel/framework": "5.7.*",
+        "laracasts/presenter": "^0.2.1",
+        "laravel/framework": "^6.0",
         "luthfi/formfield": "^1.0",
         "riskihajar/terbilang": "^1.2",
         "spatie/laravel-fractal": "^5.0"
@@ -19,7 +19,7 @@
         "barryvdh/laravel-debugbar": "^3.1",
         "fzaninotto/faker": "^1.4",
         "johnkary/phpunit-speedtrap": "^3.0",
-        "luthfi/simple-crud-generator": "1.2.*",
+        "luthfi/simple-crud-generator": "^1.2",
         "mockery/mockery": "^1.0",
         "phpunit/phpunit": "^7.0"
     },

database/factories/BankAccountFactory.php

@@ -1,12 +1,13 @@
 <?php
 
+use Illuminate\Support\Str;
 use Faker\Generator as Faker;
 use App\Entities\Invoices\BankAccount;
 
 $factory->define(BankAccount::class, function (Faker $faker) {
     return [
-        'name'         => 'Bank '.strtoupper(str_random(4)),
-        'number'       => str_random(10),
+        'name'         => 'Bank '.strtoupper(Str::random(4)),
+        'number'       => Str::random(10),
         'account_name' => $faker->name,
     ];
 });

database/factories/ModelFactory.php

@@ -1,5 +1,6 @@
 <?php
 
+use Illuminate\Support\Str;
 use App\Entities\Users\User;
 use App\Entities\Users\Event;
 use App\Entities\Projects\Job;
@@ -11,8 +12,8 @@ $factory->define(User::class, function (Faker\Generator $faker) {
         'name'           => $faker->name,
         'email'          => $faker->unique()->email,
         'password'       => '$2y$10$TKh8H1.PfQx37YgCzwiKb.KjNyWgaHb9cbcoQgdIVFlYg7B77UdFm', // secret
-        'remember_token' => str_random(10),
-        'api_token'      => str_random(32),
+        'remember_token' => Str::random(10),
+        'api_token'      => Str::random(32),
         'lang'           => 'en',
     ];
 });

database/factories/SubscriptionFactory.php

@@ -1,6 +1,7 @@
 <?php
 
 use Carbon\Carbon;
+use Illuminate\Support\Str;
 use Faker\Generator as Faker;
 use App\Entities\Partners\Vendor;
 use App\Entities\Projects\Project;
@@ -16,7 +17,7 @@ $factory->define(Subscription::class, function (Faker $faker) {
         },
         'type_id'     => 1,
         'status_id'   => 1,
-        'name'        => 'www.'.str_random(10).'.com',
+        'name'        => 'www.'.Str::random(10).'.com',
         'price'       => 125000,
         'start_date'  => $startDate->format('Y-m-d'),
         'due_date'    => $startDate->addYears(1)->format('Y-m-d'),

resources/views/projects/payments.blade.php

@@ -7,8 +7,8 @@
 
 <h1 class="page-header">
     <div class="pull-right">
-        {!! html_link_to_route('payments.create', trans('payment.create'), ['project_id' => $project->id, 'customer_id' => $project->customer_id], ['class' => 'btn btn-success', 'icon' => 'plus']) !!}
-        {!! html_link_to_route('projects.fees.create', trans('payment.create_fee'), ['project_id' => $project->id], ['class' => 'btn btn-default', 'icon' => 'plus']) !!}
+        {!! html_link_to_route('payments.create', trans('payment.create'), ['project_id' => $project, 'customer_id' => $project->customer_id], ['class' => 'btn btn-success', 'icon' => 'plus']) !!}
+        {!! html_link_to_route('projects.fees.create', trans('payment.create_fee'), $project, ['class' => 'btn btn-default', 'icon' => 'plus']) !!}
     </div>
     {{ $project->name }} <small>{{ trans('project.payments') }}</small>
 </h1>

tests/Feature/Payments/ManagePaymentsTest.php

@@ -220,4 +220,40 @@ class ManagePaymentsTest extends TestCase
         $this->see($payment->description);
         $this->see($payment->partner->name);
     }
+
+    /** @test */
+    public function admin_can_entry_payment_from_project_payment_tab()
+    {
+        $user = $this->adminUserSigningIn();
+        $project = factory(Project::class)->create();
+
+        $this->visitRoute('projects.payments', $project->id);
+
+        $this->click(trans('payment.create'));
+        $this->seeRouteIs('payments.create', ['customer_id' => $project->customer_id, 'project_id' => $project->id]);
+
+        // // Fill Form
+        $this->submitForm(trans('payment.create'), [
+            'date'        => '2015-05-01',
+            'in_out'      => 1,
+            'type_id'     => 1,
+            'amount'      => 1000000,
+            'project_id'  => $project->id,
+            'partner_id'  => $project->customer_id,
+            'description' => 'Pembayaran DP',
+        ]);
+
+        $this->see(trans('payment.created'));
+        $this->seeRouteIs('projects.payments', $project->id);
+
+        $this->seeInDatabase('payments', [
+            'project_id'   => $project->id,
+            'amount'       => 1000000,
+            'type_id'      => 1,
+            'in_out'       => 1,
+            'date'         => '2015-05-01',
+            'partner_type' => Customer::class,
+            'partner_id'  => $project->customer_id,
+        ]);
+    }
 }