diff --git a/app/Helpers/CountriesHelper.php b/app/Helpers/CountriesHelper.php index 2891ece43de..57beab150f3 100644 --- a/app/Helpers/CountriesHelper.php +++ b/app/Helpers/CountriesHelper.php @@ -5,7 +5,6 @@ use Illuminate\Support\Arr; use Illuminate\Support\Collection; use Illuminate\Support\Facades\App; -//use PragmaRX\Countries\Package\Support\Collection; use PragmaRX\CountriesLaravel\Package\Facade as Countries; use PragmaRX\Countries\Package\Support\Collection as Country; diff --git a/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBirthdays.php b/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBirthdays.php index 8522a239831..9c01e8a2dd1 100644 --- a/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBirthdays.php +++ b/app/Http/Controllers/DAV/Backend/CalDAV/CalDAVBirthdays.php @@ -152,5 +152,6 @@ public function updateOrCreateCalendarObject($calendarId, $objectUri, $calendarD public function deleteCalendarObject($objectUri) { + // Not implemented } } diff --git a/app/Http/Middleware/CheckCompliance.php b/app/Http/Middleware/CheckCompliance.php index 546753c2ca7..5b52499569f 100644 --- a/app/Http/Middleware/CheckCompliance.php +++ b/app/Http/Middleware/CheckCompliance.php @@ -26,10 +26,8 @@ public function handle($request, Closure $next) return $next($request); } - if (Auth::check()) { - if (! ComplianceHelper::isCompliantWithCurrentTerm(auth()->user())) { - return redirect()->route('compliance'); - } + if (Auth::check() && ! ComplianceHelper::isCompliantWithCurrentTerm(auth()->user())) { + return redirect()->route('compliance'); } return $next($request); diff --git a/app/Jobs/Dav/UpdateVCard.php b/app/Jobs/Dav/UpdateVCard.php index 9ecf55dea7c..1cbf6c96066 100644 --- a/app/Jobs/Dav/UpdateVCard.php +++ b/app/Jobs/Dav/UpdateVCard.php @@ -87,10 +87,10 @@ private function updateCard($addressBookId, $cardUri, $cardData): ?string $contact_id = null; if ($cardUri) { - $contact = $backend->getObject($addressBookId, $cardUri); + $contactObject = $backend->getObject($addressBookId, $cardUri); - if ($contact) { - $contact_id = $contact->id; + if ($contactObject) { + $contact_id = $contactObject->id; } } diff --git a/database/factories/SettingsFactory.php b/database/factories/SettingsFactory.php index f691a6a9d0c..e27721e07a7 100644 --- a/database/factories/SettingsFactory.php +++ b/database/factories/SettingsFactory.php @@ -18,16 +18,11 @@ }); $factory->define(\Laravel\Cashier\Subscription::class, function (Faker\Generator $faker) { - static $account_id; - static $stripe_plan; - static $name; - static $stripe_id; - return [ - 'account_id' => $account_id, - 'name' => $name ?: $faker->randomElement(['main']), - 'stripe_id' => $stripe_id, - 'stripe_plan' => $stripe_plan ?: $faker->randomElement(['plan-1', 'plan-2', 'plan-3']), + 'account_id' => factory(App\Models\Account\Account::class)->create()->id, + 'name' => $faker->word(), + 'stripe_id' => $faker->word(), + 'stripe_plan' => $faker->randomElement(['plan-1', 'plan-2', 'plan-3']), 'quantity' => 1, 'created_at' => now(), ]; diff --git a/database/migrations/2016_10_24_014257_create_journal_tables.php b/database/migrations/2016_10_24_014257_create_journal_tables.php index ffff8bba204..452152c59fe 100644 --- a/database/migrations/2016_10_24_014257_create_journal_tables.php +++ b/database/migrations/2016_10_24_014257_create_journal_tables.php @@ -1,7 +1,6 @@ increments('id'); - // $table->integer('account_id'); - // $table->longText('entry'); - // $table->softDeletes(); - // $table->timestamps(); - // }); - } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - // } } diff --git a/database/migrations/2017_01_26_022852_change_notes_to_contact.php b/database/migrations/2017_01_26_022852_change_notes_to_contact.php index 48eaa0923e6..d54b3d4a209 100644 --- a/database/migrations/2017_01_26_022852_change_notes_to_contact.php +++ b/database/migrations/2017_01_26_022852_change_notes_to_contact.php @@ -23,22 +23,4 @@ public function up() $table->integer('contact_id')->after('account_id'); }); } - - /** - * Reverse the migrations. - * - * @return void - */ - public function down() - { - Schema::table('notes', function (Blueprint $table) { - $table->dropColumn( - 'people_id' - ); - }); - - Schema::table('notes', function (Blueprint $table) { - $table->integer('contact_id')->after('account_id'); - }); - } } diff --git a/resources/js/components/dashboard/DashboardLog.vue b/resources/js/components/dashboard/DashboardLog.vue index a44f733ab3c..b11df919525 100644 --- a/resources/js/components/dashboard/DashboardLog.vue +++ b/resources/js/components/dashboard/DashboardLog.vue @@ -4,24 +4,24 @@
-
-