mirror of
https://github.com/invoiceninja/invoiceninja.git
synced 2025-07-09 03:14:30 -04:00
Updating version
This commit is contained in:
parent
976773ce7b
commit
9ffcf9f3ef
@ -352,7 +352,7 @@ define('NINJA_GATEWAY_ID', GATEWAY_STRIPE);
|
|||||||
define('NINJA_GATEWAY_CONFIG', '');
|
define('NINJA_GATEWAY_CONFIG', '');
|
||||||
define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
|
define('NINJA_WEB_URL', 'https://www.invoiceninja.com');
|
||||||
define('NINJA_APP_URL', 'https://app.invoiceninja.com');
|
define('NINJA_APP_URL', 'https://app.invoiceninja.com');
|
||||||
define('NINJA_VERSION', '2.0.1');
|
define('NINJA_VERSION', '2.1.0');
|
||||||
define('NINJA_DATE', '2000-01-01');
|
define('NINJA_DATE', '2000-01-01');
|
||||||
define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
|
define('NINJA_FROM_EMAIL', 'maildelivery@invoiceninja.com');
|
||||||
define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/');
|
define('RELEASES_URL', 'https://github.com/hillelcoren/invoice-ninja/releases/');
|
||||||
|
@ -159,7 +159,7 @@ class InvoiceRepository
|
|||||||
}
|
}
|
||||||
|
|
||||||
if ($entityType == ENTITY_INVOICE) {
|
if ($entityType == ENTITY_INVOICE) {
|
||||||
if ($model->invoice_status_id < INVOICE_STATUS_PAID) {
|
if ($model->balance > 0) {
|
||||||
$str .= '<li><a href="'.\URL::to('payments/create/'.$model->client_public_id.'/'.$model->public_id).'">'.trans('texts.enter_payment').'</a></li>';
|
$str .= '<li><a href="'.\URL::to('payments/create/'.$model->client_public_id.'/'.$model->public_id).'">'.trans('texts.enter_payment').'</a></li>';
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -626,5 +626,51 @@ return array(
|
|||||||
'zapier' => 'Zapier <sup>Beta</sup>',
|
'zapier' => 'Zapier <sup>Beta</sup>',
|
||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
);
|
);
|
||||||
|
@ -618,5 +618,51 @@ return array(
|
|||||||
'recurring' => 'Wiederkehrend',
|
'recurring' => 'Wiederkehrend',
|
||||||
'last_invoice_sent' => 'Letzte Rechnung verschickt am :date',
|
'last_invoice_sent' => 'Letzte Rechnung verschickt am :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
@ -597,6 +597,51 @@ return array(
|
|||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
@ -626,5 +626,51 @@ return array(
|
|||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
@ -618,5 +618,51 @@ return array(
|
|||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
@ -618,4 +618,50 @@ return array(
|
|||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
);
|
);
|
||||||
|
@ -619,5 +619,51 @@ return array(
|
|||||||
'zapier' => 'Zapier <sup>Beta</sup>',
|
'zapier' => 'Zapier <sup>Beta</sup>',
|
||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
);
|
);
|
||||||
|
@ -628,6 +628,52 @@ return array(
|
|||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
||||||
|
|
||||||
|
@ -625,5 +625,52 @@ return array(
|
|||||||
'zapier' => 'Zapier <sup>Beta</sup>',
|
'zapier' => 'Zapier <sup>Beta</sup>',
|
||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
@ -621,5 +621,51 @@ return array(
|
|||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
||||||
|
@ -620,6 +620,52 @@ return array(
|
|||||||
'zapier' => 'Zapier <sup>Beta</sup>',
|
'zapier' => 'Zapier <sup>Beta</sup>',
|
||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
||||||
|
@ -623,6 +623,52 @@ return array(
|
|||||||
'zapier' => 'Zapier <sup>Beta</sup>',
|
'zapier' => 'Zapier <sup>Beta</sup>',
|
||||||
'recurring' => 'Recurring',
|
'recurring' => 'Recurring',
|
||||||
'last_invoice_sent' => 'Last invoice sent :date',
|
'last_invoice_sent' => 'Last invoice sent :date',
|
||||||
|
|
||||||
|
'processed_updates' => 'Successfully completed update',
|
||||||
|
'tasks' => 'Tasks',
|
||||||
|
'new_task' => 'New Task',
|
||||||
|
'start_time' => 'Start Time',
|
||||||
|
'created_task' => 'Successfully created task',
|
||||||
|
'updated_task' => 'Successfully updated task',
|
||||||
|
'edit_task' => 'Edit Task',
|
||||||
|
'archive_task' => 'Archive Task',
|
||||||
|
'restore_task' => 'Restore Task',
|
||||||
|
'delete_task' => 'Delete Task',
|
||||||
|
'stop_task' => 'Stop Task',
|
||||||
|
'time' => 'Time',
|
||||||
|
'start' => 'Start',
|
||||||
|
'stop' => 'Stop',
|
||||||
|
'now' => 'Now',
|
||||||
|
'timer' => 'Timer',
|
||||||
|
'manual' => 'Manual',
|
||||||
|
'date_and_time' => 'Date & Time',
|
||||||
|
'second' => 'second',
|
||||||
|
'seconds' => 'seconds',
|
||||||
|
'minute' => 'minute',
|
||||||
|
'minutes' => 'minutes',
|
||||||
|
'hour' => 'hour',
|
||||||
|
'hours' => 'hours',
|
||||||
|
'task_details' => 'Task Details',
|
||||||
|
'duration' => 'Duration',
|
||||||
|
'end_time' => 'End Time',
|
||||||
|
'end' => 'End',
|
||||||
|
'invoiced' => 'Invoiced',
|
||||||
|
'logged' => 'Logged',
|
||||||
|
'running' => 'Running',
|
||||||
|
'task_error_multiple_clients' => 'The tasks can\'t belong to different clients',
|
||||||
|
'task_error_running' => 'Please stop running tasks first',
|
||||||
|
'task_error_invoiced' => 'Tasks have already been invoiced',
|
||||||
|
'restored_task' => 'Successfully restored task',
|
||||||
|
'archived_task' => 'Successfully archived task',
|
||||||
|
'archived_tasks' => 'Successfully archived :count tasks',
|
||||||
|
'deleted_task' => 'Successfully deleted task',
|
||||||
|
'deleted_tasks' => 'Successfully deleted :count tasks',
|
||||||
|
'create_task' => 'Create Task',
|
||||||
|
'stopped_task' => 'Successfully stopped task',
|
||||||
|
'invoice_task' => 'Invoice Task',
|
||||||
|
'invoice_labels' => 'Invoice Labels',
|
||||||
|
'prefix' => 'Prefix',
|
||||||
|
'counter' => 'Counter',
|
||||||
|
|
||||||
|
|
||||||
);
|
);
|
||||||
|
@ -375,7 +375,7 @@
|
|||||||
{!! Button::normal(trans("texts.email_{$entityType}"))->withAttributes(array('id' => 'email_button', 'onclick' => 'onEmailClick()'))->appendIcon(Icon::create('send')) !!}
|
{!! Button::normal(trans("texts.email_{$entityType}"))->withAttributes(array('id' => 'email_button', 'onclick' => 'onEmailClick()'))->appendIcon(Icon::create('send')) !!}
|
||||||
@endif
|
@endif
|
||||||
|
|
||||||
@if ($invoice && $invoice->id && $entityType == ENTITY_INVOICE && !$invoice->is_recurring && !$invoice->isPaid())
|
@if ($invoice && $invoice->id && $entityType == ENTITY_INVOICE && !$invoice->is_recurring && $invoice->balance > 0)
|
||||||
{!! Button::primary(trans('texts.enter_payment'))->withAttributes(array('onclick' => 'onPaymentClick()'))->appendIcon(Icon::create('usd')) !!}
|
{!! Button::primary(trans('texts.enter_payment'))->withAttributes(array('onclick' => 'onPaymentClick()'))->appendIcon(Icon::create('usd')) !!}
|
||||||
@endif
|
@endif
|
||||||
@elseif ($invoice && $invoice->trashed() && !$invoice->is_deleted == '1')
|
@elseif ($invoice && $invoice->trashed() && !$invoice->is_deleted == '1')
|
||||||
|
Loading…
x
Reference in New Issue
Block a user