Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-05-31 04:24:33 -04:00
Code Issues Packages Projects Releases Wiki Activity

Update texts

Browse Source
This commit is contained in:
David Bomba 2021-04-14 07:40:07 +10:00
parent ed83f27537
commit 5c1eb7f7eb
5 changed files with 13 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Http/Controllers/TaskController.php
View File

@ -279,8 +279,8 @@ class TaskController extends BaseController
$task = $this->task_repo->save($request->all(), $task); $task = $this->task_repo->save($request->all(), $task);
if($task->status_order != $old_task->status_order) // if($task->status_order != $old_task->status_order)
$this->task_repo->sortStatuses($old_task, $task); // $this->task_repo->sortStatuses($old_task, $task);
event(new TaskWasUpdated($task, $task->company, Ninja::eventVars(auth()->user()->id))); event(new TaskWasUpdated($task, $task->company, Ninja::eventVars(auth()->user()->id)));

2
app/Http/ValidationRules/Payment/ValidInvoicesRules.php
View File

@ -84,7 +84,7 @@ class ValidInvoicesRules implements Rule
} }
else if($invoice['amount'] > $inv->balance) { else if($invoice['amount'] > $inv->balance) {
$this->error_msg = ctrans('texts.amount_greater_than_balance'); $this->error_msg = ctrans('texts.amount_greater_than_balance_v5');
return false; return false;
} }

3
app/Services/Subscription/SubscriptionService.php
View File

@ -250,11 +250,12 @@ class SubscriptionService
->where('balance', '>', 0) ->where('balance', '>', 0)
->first(); ->first();
$pro_rata_refund = null;
// we calculate the pro rata refund for this invoice. // we calculate the pro rata refund for this invoice.
if($outstanding_invoice) if($outstanding_invoice)
{ {
// $pro_rata_refund = $this->calculateProRataRefund($out
} }
//logic //logic

6
app/Utils/TemplateEngine.php
View File

@ -120,6 +120,12 @@ class TemplateEngine
} }
} }
$converter = new CommonMarkConverter([
'allow_unsafe_links' => false,
]);
$this->body = $converter->convertToHtml($this->body);
return $this; return $this;
} }

2
resources/lang/en/texts.php
View File

@ -4209,6 +4209,8 @@ $LANG = array(
'activity_82' => ':user archived subscription :subscription', 'activity_82' => ':user archived subscription :subscription',
'activity_83' => ':user deleted subscription :subscription', 'activity_83' => ':user deleted subscription :subscription',
'activity_84' => ':user restored subscription :subscription', 'activity_84' => ':user restored subscription :subscription',
'amount_greater_than_balance_v5' => 'The amount is greater than the invoice balance. You cannot overpay an invoice.',
); );
return $LANG; return $LANG;