diff --git a/app/Models/Vendor.php b/app/Models/Vendor.php index 8cd1a54d5686..3cb8b05265ff 100644 --- a/app/Models/Vendor.php +++ b/app/Models/Vendor.php @@ -26,6 +26,7 @@ class Vendor extends BaseModel protected $fillable = [ 'name', + 'assigned_user_id', 'id_number', 'vat_number', 'work_phone', diff --git a/app/Transformers/VendorTransformer.php b/app/Transformers/VendorTransformer.php index 26cfc5e83c4b..a85e76a5af8d 100644 --- a/app/Transformers/VendorTransformer.php +++ b/app/Transformers/VendorTransformer.php @@ -85,6 +85,7 @@ class VendorTransformer extends EntityTransformer 'state' => $vendor->state ?: '', 'postal_code' => $vendor->postal_code ?: '', 'country_id' => (string) $vendor->country_id ?: '', + 'currency_id' => (string) $vendor->currency_id ?: '', 'custom_value1' => $vendor->custom_value1 ?: '', 'custom_value2' => $vendor->custom_value2 ?: '', 'custom_value3' => $vendor->custom_value3 ?: '', diff --git a/database/migrations/2014_10_13_000000_create_users_table.php b/database/migrations/2014_10_13_000000_create_users_table.php index f83680924a20..b4aa48dde235 100644 --- a/database/migrations/2014_10_13_000000_create_users_table.php +++ b/database/migrations/2014_10_13_000000_create_users_table.php @@ -1239,6 +1239,7 @@ class CreateUsersTable extends Migration $table->foreign('company_id')->references('id')->on('companies')->onDelete('cascade')->onUpdate('cascade'); }); + Schema::create('expense_categories', function ($table) { $table->increments('id'); $table->unsignedInteger('user_id'); diff --git a/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php b/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php index c5b029f921f8..e991241343f2 100644 --- a/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php +++ b/database/migrations/2020_09_27_215800_update_gateway_table_visible_column.php @@ -42,6 +42,7 @@ class UpdateGatewayTableVisibleColumn extends Migration $t->boolean('is_deleted')->default(0); }); + } diff --git a/database/migrations/2020_10_11_211122_vendor_schema_update.php b/database/migrations/2020_10_11_211122_vendor_schema_update.php new file mode 100644 index 000000000000..cafedf9a10b5 --- /dev/null +++ b/database/migrations/2020_10_11_211122_vendor_schema_update.php @@ -0,0 +1,47 @@ +timestamp('email_verified_at')->nullable(); + $table->string('confirmation_code')->nullable(); + $table->boolean('confirmed')->default(false); + $table->timestamp('last_login')->nullable(); + $table->smallInteger('failed_logins')->nullable(); + $table->string('oauth_user_id', 100)->nullable()->unique(); + $table->unsignedInteger('oauth_provider_id')->nullable()->unique(); + $table->string('google_2fa_secret')->nullable(); + $table->string('accepted_terms_version')->nullable(); + $table->string('avatar', 255)->nullable(); + $table->string('avatar_type', 255)->nullable(); + $table->string('avatar_size', 255)->nullable(); + $table->string('password'); + $table->string('token')->nullable(); + $table->boolean('is_locked')->default(false); + $table->string('contact_key')->nullable(); + $table->rememberToken(); + $table->index(['company_id', 'email', 'deleted_at']); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +}