Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-09 03:14:30 -04:00
Code Issues Packages Projects Releases Wiki Activity

Fixed problem with history page list

Browse Source
This commit is contained in:
Hillel Coren 2015-02-06 14:55:19 +02:00
parent 42abd5f8e0
commit 6350c5bc1b
2 changed files with 11 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/controllers/InvoiceController.php
View File

@ -505,9 +505,11 @@ class InvoiceController extends \BaseController
$invoice->is_quote = intval($invoice->is_quote); $invoice->is_quote = intval($invoice->is_quote);
$activityTypeId = $invoice->is_quote ? ACTIVITY_TYPE_UPDATE_QUOTE : ACTIVITY_TYPE_UPDATE_INVOICE; $activityTypeId = $invoice->is_quote ? ACTIVITY_TYPE_UPDATE_QUOTE : ACTIVITY_TYPE_UPDATE_INVOICE;
$activities = Activity::scope(false, $invoice->account_id)->with(['user' => function($query) { $activities = Activity::scope(false, $invoice->account_id)
$query->select(['id', 'first_name', 'last_name']); ->where('activity_type_id', '=', $activityTypeId)
}])->where('activity_type_id', '=', $activityTypeId)->orderBy('id', 'desc')->get(['id', 'created_at', 'user_id', 'json_backup']); ->where('invoice_id', '=', $invoice->id)
->orderBy('id', 'desc')
->get(['id', 'created_at', 'user_id', 'json_backup', 'message']);
$versionsJson = []; $versionsJson = [];
$versionsSelect = []; $versionsSelect = [];
@ -522,8 +524,7 @@ class InvoiceController extends \BaseController
$backup->account = $invoice->account->toArray(); $backup->account = $invoice->account->toArray();
$versionsJson[$activity->id] = $backup; $versionsJson[$activity->id] = $backup;
$key = Utils::timestampToDateTimeString(strtotime($activity->created_at)) . ' - ' . Utils::decodeActivity($activity->message);
$key = Utils::timestampToDateTimeString(strtotime($activity->created_at)) . ' - ' . $activity->user->getDisplayName();
$versionsSelect[$lastId ? $lastId : 0] = $key; $versionsSelect[$lastId ? $lastId : 0] = $key;
$lastId = $activity->id; $lastId = $activity->id;
} }

10
app/database/migrations/2013_11_05_180133_confide_setup_users_table.php
View File

@ -332,7 +332,7 @@ class ConfideSetupUsersTable extends Migration {
$t->decimal('balance', 13, 2); $t->decimal('balance', 13, 2);
$t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade'); $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
$t->foreign('account_id')->references('id')->on('accounts'); $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
$t->foreign('user_id')->references('id')->on('users')->onDelete('cascade'); $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');
$t->foreign('invoice_status_id')->references('id')->on('invoice_statuses'); $t->foreign('invoice_status_id')->references('id')->on('invoice_statuses');
$t->foreign('recurring_invoice_id')->references('id')->on('invoices')->onDelete('cascade'); $t->foreign('recurring_invoice_id')->references('id')->on('invoices')->onDelete('cascade');
@ -424,7 +424,7 @@ class ConfideSetupUsersTable extends Migration {
$t->decimal('tax_rate', 13, 2)->nullable(); $t->decimal('tax_rate', 13, 2)->nullable();
$t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade'); $t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
$t->foreign('product_id')->references('id')->on('products'); $t->foreign('product_id')->references('id')->on('products')->onDelete('cascade');
$t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');; $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
$t->unsignedInteger('public_id'); $t->unsignedInteger('public_id');
@ -451,11 +451,11 @@ class ConfideSetupUsersTable extends Migration {
$t->string('transaction_reference')->nullable(); $t->string('transaction_reference')->nullable();
$t->string('payer_id')->nullable(); $t->string('payer_id')->nullable();
$t->foreign('invoice_id')->references('id')->on('invoices'); $t->foreign('invoice_id')->references('id')->on('invoices')->onDelete('cascade');
$t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade'); $t->foreign('account_id')->references('id')->on('accounts')->onDelete('cascade');
$t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade'); $t->foreign('client_id')->references('id')->on('clients')->onDelete('cascade');
$t->foreign('contact_id')->references('id')->on('contacts'); $t->foreign('contact_id')->references('id')->on('contacts')->onDelete('cascade');
$t->foreign('account_gateway_id')->references('id')->on('account_gateways'); $t->foreign('account_gateway_id')->references('id')->on('account_gateways')->onDelete('cascade');
$t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');; $t->foreign('user_id')->references('id')->on('users')->onDelete('cascade');;
$t->foreign('payment_type_id')->references('id')->on('payment_types'); $t->foreign('payment_type_id')->references('id')->on('payment_types');