From 605f4d0b0c9070648f2757602f200104afbca094 Mon Sep 17 00:00:00 2001 From: David Bomba Date: Wed, 9 Sep 2020 07:37:07 +1000 Subject: [PATCH] Fixes for migrations --- app/Transformers/ClientTransformer.php | 2 +- ...0_08_18_140557_add_is_public_to_documents_table.php | 10 ++++++++++ 2 files changed, 11 insertions(+), 1 deletion(-) diff --git a/app/Transformers/ClientTransformer.php b/app/Transformers/ClientTransformer.php index 8e331ddbc089..6593b2dfce0c 100644 --- a/app/Transformers/ClientTransformer.php +++ b/app/Transformers/ClientTransformer.php @@ -122,7 +122,7 @@ class ClientTransformer extends EntityTransformer 'last_login' => (int) $client->last_login, 'size_id' => (string) $client->size_id, 'public_notes' => $client->public_notes ?: '', - // 'currency_id' => (string)$client->currency_id, + 'client_hash' => (string)$client->client_hash, 'address1' => $client->address1 ?: '', 'address2' => $client->address2 ?: '', 'phone' => $client->phone ?: '', diff --git a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php index 6b35ce49b03b..cc58b5309c1e 100644 --- a/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php +++ b/database/migrations/2020_08_18_140557_add_is_public_to_documents_table.php @@ -47,6 +47,16 @@ class AddIsPublicToDocumentsTable extends Migration $table->boolean('auto_bill')->default(0); $table->unsignedInteger('design_id')->nullable(); $table->boolean('uses_inclusive_taxes')->default(0); + $table->string('custom_surcharge1')->nullable(); + $table->string('custom_surcharge2')->nullable(); + $table->string('custom_surcharge3')->nullable(); + $table->string('custom_surcharge4')->nullable(); + $table->boolean('custom_surcharge_tax1')->default(false); + $table->boolean('custom_surcharge_tax2')->default(false); + $table->boolean('custom_surcharge_tax3')->default(false); + $table->boolean('custom_surcharge_tax4')->default(false); + + $table->decimal('exchange_rate', 13, 6)->default(1); }); Schema::table('companies', function ($table) {