Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-24 02:14:21 -04:00
Code Issues Packages Projects Releases Wiki Activity

Remove JSON types (#3457)

Browse Source 
* Remove backup column from schema

* Add slack webhooks to company user table

* Preview route

* remove json column from company gateway

* fixes for testS

* Fixes for typos

* Remove json types
This commit is contained in:
David Bomba 2020-03-09 20:45:59 +11:00 committed by GitHub
parent 7d39969a3b
commit 9e39f42aa8
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 12 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

21
database/migrations/2014_10_13_000000_create_users_table.php
View File

@ -198,9 +198,9 @@ class CreateUsersTable extends Migration
$table->unsignedInteger('company_id');
$table->unsignedInteger('account_id');
$table->unsignedInteger('user_id')->index();
$table->json('permissions')->nullable();
$table->json('notifications')->nullable();
$table->json('settings')->nullable();
$table->mediumText('permissions')->nullable();
$table->mediumText('notifications')->nullable();
$table->mediumText('settings')->nullable();
$table->string('slack_webhook_url');
$table->boolean('is_owner')->default(false);
$table->boolean('is_admin')->default(false);
@ -458,7 +458,7 @@ class CreateUsersTable extends Migration
$t->boolean('is_deleted')->default(false);
$t->json('line_items')->nullable();
$t->mediumText('line_items')->nullable();
$t->text('footer')->nullable();
$t->text('public_notes')->nullable();
$t->text('private_notes')->nullable();
@ -533,8 +533,7 @@ class CreateUsersTable extends Migration
$t->datetime('due_date')->nullable();
$t->boolean('is_deleted')->default(false);
$t->json('line_items')->nullable();
$t->mediumText('line_items')->nullable();
$t->text('footer')->nullable();
$t->text('public_notes')->nullable();
$t->text('private_notes')->nullable();
@ -637,8 +636,7 @@ class CreateUsersTable extends Migration
$t->boolean('is_deleted')->default(false);
$t->json('line_items')->nullable();
$t->mediumText('line_items')->nullable();
$t->text('footer')->nullable();
$t->text('public_notes')->nullable();
$t->text('private_notes')->nullable();
@ -703,7 +701,7 @@ class CreateUsersTable extends Migration
$t->boolean('is_deleted')->default(false);
$t->json('line_items')->nullable();
$t->mediumText('line_items')->nullable();
$t->text('footer')->nullable();
$t->text('public_notes')->nullable();
@ -773,7 +771,8 @@ class CreateUsersTable extends Migration
$t->boolean('is_deleted')->default(false);
$t->json('line_items')->nullable();
$t->mediumText('line_items')->nullable();
$t->text('footer')->nullable();
$t->text('public_notes')->nullable();
@ -1101,7 +1100,7 @@ class CreateUsersTable extends Migration
Schema::create('backups', function ($table) {
$table->increments('id');
$table->unsignedInteger('activity_id');
$table->json('json_backup')->nullable();
$table->mediumText('json_backup')->nullable();
$table->longText('html_backup')->nullable();
$table->timestamps(6);

3
tests/Feature/UserTest.php
View File

@ -191,7 +191,8 @@ class UserTest extends TestCase
$arr = $response->json();
\Log::error($arr['data']['company_user']['permissions']);
\Log::error($arr);
\Log::error(print_r($arr['data']['company_user'],1));
$this->assertNotNull($arr['data']['company_user']);
$this->assertFalse($arr['data']['company_user']['is_admin']);