Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-06-23 18:40:55 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8442 from turbo124/v5-develop

Browse Source 
Additional translations
This commit is contained in:
David Bomba 2023-04-17 17:50:52 +10:00 committed by GitHub
commit f571401cd4
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
4 changed files with 12 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
app/Http/Controllers/PreviewController.php
View File

@ -177,9 +177,6 @@ class PreviewController extends BaseController
public function design(DesignPreviewRequest $request) public function design(DesignPreviewRequest $request)
{ {
// if (Ninja::isHosted() && !in_array($request->getHost(), ['preview.invoicing.co','staging.invoicing.co'])) {
// return response()->json(['message' => 'This server cannot handle this request.'], 400);
// }
$pdf = (new PdfMock($request->all(), auth()->user()->company()))->build()->getPdf(); $pdf = (new PdfMock($request->all(), auth()->user()->company()))->build()->getPdf();

7
app/PaymentDrivers/CheckoutComPaymentDriver.php
View File

@ -302,13 +302,6 @@ class CheckoutComPaymentDriver extends BaseDriver
throw new PaymentFailed($human_exception); throw new PaymentFailed($human_exception);
} }
// catch (\Exception $e) {
// // API error
// throw new PaymentFailed($e->getMessage(), $e->getCode());
// }
return $response; return $response;
} }
} }

8
app/Services/Invoice/AutoBillInvoice.php
View File

@ -12,6 +12,7 @@
namespace App\Services\Invoice; namespace App\Services\Invoice;
use App\DataMapper\InvoiceItem; use App\DataMapper\InvoiceItem;
use App\Events\Invoice\InvoiceWasPaid;
use App\Events\Payment\PaymentWasCreated; use App\Events\Payment\PaymentWasCreated;
use App\Factory\PaymentFactory; use App\Factory\PaymentFactory;
use App\Libraries\MultiDB; use App\Libraries\MultiDB;
@ -225,6 +226,13 @@ class AutoBillInvoice extends AbstractService
event('eloquent.created: App\Models\Payment', $payment); event('eloquent.created: App\Models\Payment', $payment);
event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars())); event(new PaymentWasCreated($payment, $payment->company, Ninja::eventVars()));
//if we have paid the invoice in full using credits, then we need to fire the event
if($this->invoice->balance == 0){
event(new InvoiceWasPaid($this->invoice, $payment, $payment->company, Ninja::eventVars()));
}
return $this->invoice return $this->invoice
->service() ->service()
->setCalculatedStatus() ->setCalculatedStatus()

3
lang/en/texts.php
View File

@ -5043,6 +5043,9 @@ $LANG = array(
'aged_receivable_summary_report' => 'Aged Receivable Summary Report', 'aged_receivable_summary_report' => 'Aged Receivable Summary Report',
'taxable_amount' => 'Taxable Amount', 'taxable_amount' => 'Taxable Amount',
'tax_summary' => 'Tax Summary', 'tax_summary' => 'Tax Summary',
'oauth_mail' => 'OAuth / Mail',
'preferences' => 'Preferences',
'analytics' => 'Analytics',
); );