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

fix subscriptions schema

Browse Source
This commit is contained in:
David Bomba 2021-03-30 21:08:02 +11:00
parent 1d48f55354
commit 3eb9688a83
3 changed files with 13 additions and 5 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Services/Quote/QuoteService.php
View File

@ -110,7 +110,7 @@ class QuoteService
$this->invoice
->service()
->markSent()
// ->markSent()
->createInvitations()
->deletePdf()
->save();

14
database/migrations/2021_03_26_201148_add_price_column_to_subscriptions_table.php
View File

@ -21,6 +21,17 @@ class AddPriceColumnToSubscriptionsTable extends Migration
Schema::table('recurring_invoices', function (Blueprint $table) {
$table->unsignedInteger('subscription_id')->nullable();
});
Schema::table('subscriptions', function (Blueprint $table) {
$table->unsignedInteger('group_id')->nullable()->change();
$table->text('product_ids')->nullable()->change();
$table->text('recurring_product_ids')->nullable()->change();
$table->text('auto_bill')->nullable()->change();
$table->text('promo_code')->nullable()->change();
$table->unsignedInteger('frequency_id')->nullable()->change();
$table->text('plan_map')->nullable()->change();
});
}
/**
@ -30,8 +41,5 @@ class AddPriceColumnToSubscriptionsTable extends Migration
*/
public function down()
{
Schema::table('subscriptions', function (Blueprint $table) {
//
});
}
}

2
resources/views/portal/ninja2020/quotes/includes/actions.blade.php
View File

@ -8,7 +8,7 @@
<div class="px-4 py-5 sm:p-6">
<div class="sm:flex sm:items-start sm:justify-between">
<h3 class="text-lg leading-6 font-medium text-gray-900">
{{ ctrans('texts.pending_approval') }}
{{ ctrans('texts.approve') }}
</h3>
<div class="mt-5 sm:mt-0 sm:ml-6 sm:flex-shrink-0 sm:flex sm:items-center">