diff --git a/VERSION.txt b/VERSION.txt index 141ab490abe4..9b4059bcca16 100644 --- a/VERSION.txt +++ b/VERSION.txt @@ -1 +1 @@ -5.0.13 \ No newline at end of file +5.0.14 \ No newline at end of file diff --git a/config/ninja.php b/config/ninja.php index bd41c6af1971..9df86ceebed2 100644 --- a/config/ninja.php +++ b/config/ninja.php @@ -12,8 +12,8 @@ return [ 'require_https' => env('REQUIRE_HTTPS', true), 'app_url' => rtrim(env('APP_URL', ''), '/').'/', 'app_domain' => env('APP_DOMAIN', ''), - 'app_version' => '5.0.13', - 'minimum_client_version' => '5.0.13', + 'app_version' => '5.0.14', + 'minimum_client_version' => '5.0.16', 'terms_version' => '1.0.1', 'api_secret' => env('API_SECRET', ''), 'google_maps_api_key' => env('GOOGLE_MAPS_API_KEY'), 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 b843e2bd93a1..0e86499e7cc8 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 @@ -84,9 +84,9 @@ class AddIsPublicToDocumentsTable extends Migration $t->unsignedInteger('recurring_invoice_id')->index(); $t->string('key')->index(); + $t->foreign('recurring_invoice_id')->references('id')->on('recurring_invoices')->onDelete('cascade')->onUpdate('cascade'); $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade')->onUpdate('cascade'); $t->foreign('client_contact_id')->references('id')->on('client_contacts')->onDelete('cascade')->onUpdate('cascade'); - $t->foreign('recurring_invoice_id')->references('id')->on('recurring_invoices')->onDelete('cascade')->onUpdate('cascade'); $t->foreign('company_id')->references('id')->on('companies')->onDelete('cascade')->onUpdate('cascade'); $t->timestamps(6); @@ -104,5 +104,7 @@ class AddIsPublicToDocumentsTable extends Migration */ public function down() { + } + } diff --git a/tests/Feature/RecurringInvoicesCronTest.php b/tests/Feature/RecurringInvoicesCronTest.php index ff1d92b80dc9..557b731a7cb8 100644 --- a/tests/Feature/RecurringInvoicesCronTest.php +++ b/tests/Feature/RecurringInvoicesCronTest.php @@ -39,7 +39,7 @@ class RecurringInvoicesCronTest extends TestCase { parent::setUp(); - RecurringInvoice::truncate(); + //RecurringInvoice::truncate(); $this->makeTestData(); }