Mirrors/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2024-09-20 00:11:35 +02:00
Code Issues Releases Activity

fixes for DB constraints. nest company users

Browse Source
This commit is contained in:
David Bomba 2019-09-18 07:51:40 +10:00
parent 23acdb6394
commit 905aaf7c98
2 changed files with 8 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Transformers/CompanyUserTransformer.php
View File

@ -45,7 +45,7 @@ class CompanyUserTransformer extends EntityTransformer
public function transform(CompanyUser $company_user)
{
return [
return ['company_user' => [
'permissions' => $company_user->permissions,
'settings' => $company_user->settings,
'is_owner' => (bool) $company_user->is_owner,
@ -53,6 +53,7 @@ class CompanyUserTransformer extends EntityTransformer
'is_locked' => (bool) $company_user->is_locked,
'updated_at' => $company_user->updated_at,
'deleted_at' => $company_user->deleted_at,
]
];
}

12
database/migrations/2014_10_13_000000_create_users_table.php
View File

@ -389,7 +389,7 @@ class CreateUsersTable extends Migration
$t->unsignedInteger('recurring_invoice_id')->nullable();
$t->string('invoice_number')->default('');
$t->string('invoice_number')->nullable();
$t->float('discount')->default(0);
$t->boolean('is_amount_discount')->default(0);
@ -444,7 +444,7 @@ class CreateUsersTable extends Migration
$t->unsignedInteger('company_id')->index();
$t->unsignedInteger('status_id')->index();
$t->text('invoice_number')->default('');
$t->text('invoice_number')->nullable();
$t->float('discount')->default(0);
$t->boolean('is_amount_discount')->default(false);
@ -507,7 +507,7 @@ class CreateUsersTable extends Migration
$t->float('discount')->default(0);
$t->boolean('is_amount_discount')->default(false);
$t->string('quote_number')->default('');
$t->string('quote_number')->nullable();
$t->string('po_number')->default('');
$t->date('quote_date')->nullable();
@ -562,7 +562,7 @@ class CreateUsersTable extends Migration
$t->unsignedInteger('company_id')->index();
$t->unsignedInteger('status_id');
$t->string('quote_number')->default('');
$t->string('quote_number')->nullable();
$t->float('discount')->default(0);
$t->boolean('is_amount_discount')->default(false);
@ -620,7 +620,7 @@ class CreateUsersTable extends Migration
$t->timestamps(6);
$t->softDeletes();
$t->string('transaction_reference')->default('');
$t->string('transaction_reference')->nullable();
$t->string('message_id')->nullable();
$t->text('email_error')->default('');
$t->text('signature_base64')->default('');
@ -704,7 +704,7 @@ class CreateUsersTable extends Migration
$t->unsignedInteger('status_id')->index();
$t->decimal('amount', 13, 2)->default(0);
$t->datetime('payment_date')->nullable();
$t->string('transaction_reference')->default('');
$t->string('transaction_reference')->nullable();
$t->string('payer_id')->default('');
$t->timestamps(6);
$t->softDeletes();