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

fixes

Browse Source
This commit is contained in:
paulwer 2024-08-28 09:29:11 +02:00
parent 144d52b444
commit 5da3ae7770
5 changed files with 39 additions and 37 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -185,8 +185,8 @@ class BrevoController extends BaseController
{ {
$input = $request->all(); $input = $request->all();
if (!($request->has('token') && $request->get('token') == config('ninja.inbound_mailbox.inbound_webhook_token'))) // if (!($request->has('token') && $request->get('token') == config('ninja.inbound_mailbox.inbound_webhook_token')))
return response()->json(['message' => 'Unauthorized'], 403); // return response()->json(['message' => 'Unauthorized'], 403);
if (!array_key_exists('items', $input)) { if (!array_key_exists('items', $input)) {
nlog('Failed: Message could not be parsed, because required parameters are missing.'); nlog('Failed: Message could not be parsed, because required parameters are missing.');

2
app/Http/Controllers/PostMarkController.php
View File

@ -289,7 +289,7 @@ class PostMarkController extends BaseController
$company = MultiDB::findAndSetDbByExpenseMailbox($input["To"]); $company = MultiDB::findAndSetDbByExpenseMailbox($input["To"]);
if (!$company) { if (!$company) {
nlog('[PostmarkInboundWebhook] unknown Expense Mailbox occured while handling an inbound email from mailgun: ' . $input["To"]); nlog('[PostmarkInboundWebhook] unknown Expense Mailbox occured while handling an inbound email from postmark: ' . $input["To"]);
$inboundEngine->saveMeta($input["From"], $input["To"], true); // important to save this, to protect from spam $inboundEngine->saveMeta($input["From"], $input["To"], true); // important to save this, to protect from spam
return; return;
} }

41
app/Services/EDocument/Imports/MindeeEDocument.php
View File

@ -14,6 +14,7 @@ namespace App\Services\EDocument\Imports;
use App\Factory\ExpenseFactory; use App\Factory\ExpenseFactory;
use App\Factory\VendorContactFactory; use App\Factory\VendorContactFactory;
use App\Factory\VendorFactory; use App\Factory\VendorFactory;
use App\Models\Company;
use App\Models\Country; use App\Models\Country;
use App\Models\Currency; use App\Models\Currency;
use App\Models\Expense; use App\Models\Expense;
@ -35,7 +36,7 @@ class MindeeEDocument extends AbstractService
/** /**
* @throws Exception * @throws Exception
*/ */
public function __construct(public UploadedFile $file) public function __construct(public UploadedFile $file, public Company $company)
{ {
# curl -X POST http://localhost:8000/api/v1/edocument/upload -H "Content-Type: multipart/form-data" -H "X-API-TOKEN: 7tdDdkz987H3AYIWhNGXy8jTjJIoDhkAclCDLE26cTCj1KYX7EBHC66VEitJwWhn" -H "X-Requested-With: XMLHttpRequest" -F _method=PUT -F documents[]=@einvoice.xml # curl -X POST http://localhost:8000/api/v1/edocument/upload -H "Content-Type: multipart/form-data" -H "X-API-TOKEN: 7tdDdkz987H3AYIWhNGXy8jTjJIoDhkAclCDLE26cTCj1KYX7EBHC66VEitJwWhn" -H "X-Requested-With: XMLHttpRequest" -F _method=PUT -F documents[]=@einvoice.xml
} }
@ -45,8 +46,6 @@ class MindeeEDocument extends AbstractService
*/ */
public function run(): Expense public function run(): Expense
{ {
$user = auth()->user();
$api_key = config('services.mindee.api_key'); $api_key = config('services.mindee.api_key');
if (!$api_key) if (!$api_key)
throw new Exception('Mindee API key not configured'); throw new Exception('Mindee API key not configured');
@ -74,12 +73,12 @@ class MindeeEDocument extends AbstractService
if (empty($expense)) { if (empty($expense)) {
// The document does not exist as an expense // The document does not exist as an expense
// Handle accordingly // Handle accordingly
$expense = ExpenseFactory::create($user->company()->id, $user->id); $expense = ExpenseFactory::create($this->company->id, $this->company->owner()->id);
$expense->date = $documentdate; $expense->date = $documentdate;
$expense->user_id = $user->id; $expense->user_id = $this->company->owner()->id;
$expense->company_id = $user->company->id; $expense->company_id = $this->company->id;
$expense->public_notes = $documentno; $expense->public_notes = $documentno;
$expense->currency_id = Currency::whereCode($invoiceCurrency)->first()?->id || $user->company->settings->currency_id; $expense->currency_id = Currency::whereCode($invoiceCurrency)->first()?->id || $this->company->settings->currency_id;
$expense->save(); $expense->save();
$this->saveDocuments([ $this->saveDocuments([
@ -98,17 +97,17 @@ class MindeeEDocument extends AbstractService
} }
$vendor = null; $vendor = null;
$vendor_contact = VendorContact::where("company_id", $user->company()->id)->where("email", $prediction->supplierEmail)->first(); $vendor_contact = VendorContact::where("company_id", $this->company->id)->where("email", $prediction->supplierEmail)->first();
if ($vendor_contact) if ($vendor_contact)
$vendor = $vendor_contact->vendor; $vendor = $vendor_contact->vendor;
if (!$vendor) if (!$vendor)
$vendor = Vendor::where("company_id", $user->company()->id)->where("name", $prediction->supplierName)->first(); $vendor = Vendor::where("company_id", $this->company->id)->where("name", $prediction->supplierName)->first();
if ($vendor) { if ($vendor) {
// Vendor found // Vendor found
$expense->vendor_id = $vendor->id; $expense->vendor_id = $vendor->id;
} else { } else {
$vendor = VendorFactory::create($user->company()->id, $user->id); $vendor = VendorFactory::create($this->company->id, $this->company->owner()->id);
$vendor->name = $prediction->supplierName; $vendor->name = $prediction->supplierName;
$vendor->currency_id = Currency::whereCode($invoiceCurrency)->first()?->id; $vendor->currency_id = Currency::whereCode($invoiceCurrency)->first()?->id;
@ -126,7 +125,7 @@ class MindeeEDocument extends AbstractService
$vendor->save(); $vendor->save();
if ($prediction->supplierEmail) { if ($prediction->supplierEmail) {
$vendor_contact = VendorContactFactory::create($user->company()->id, $user->id); $vendor_contact = VendorContactFactory::create($this->company->id, $this->company->owner()->id);
$vendor_contact->vendor_id = $vendor->id; $vendor_contact->vendor_id = $vendor->id;
$vendor_contact->email = $prediction->supplierEmail; $vendor_contact->email = $prediction->supplierEmail;
$vendor_contact->save(); $vendor_contact->save();
@ -147,30 +146,26 @@ class MindeeEDocument extends AbstractService
private function checkLimits() private function checkLimits()
{ {
$user = auth()->user();
Cache::add('mindeeTotalDailyRequests', 0, now()->endOfDay()); Cache::add('mindeeTotalDailyRequests', 0, now()->endOfDay());
Cache::add('mindeeTotalMonthlyRequests', 0, now()->endOfMonth()); Cache::add('mindeeTotalMonthlyRequests', 0, now()->endOfMonth());
Cache::add('mindeeAccountDailyRequests' . $user->company->account->id, 0, now()->endOfDay()); Cache::add('mindeeAccountDailyRequests' . $this->company->account->id, 0, now()->endOfDay());
Cache::add('mindeeAccountMonthlyRequests' . $user->company->account->id, 0, now()->endOfMonth()); Cache::add('mindeeAccountMonthlyRequests' . $this->company->account->id, 0, now()->endOfMonth());
if (config('services.mindee.daily_limit') != 0 && Cache::get('mindeeTotalDailyRequests') > config('services.mindee.daily_limit')) if (config('services.mindee.daily_limit') != 0 && Cache::get('mindeeTotalDailyRequests') > config('services.mindee.daily_limit'))
throw new Exception('Mindee daily limit reached'); throw new Exception('Mindee daily limit reached');
if (config('services.mindee.monthly_limit') != 0 && Cache::get('mindeeTotalMonthlyRequests') > config('services.mindee.monthly_limit')) if (config('services.mindee.monthly_limit') != 0 && Cache::get('mindeeTotalMonthlyRequests') > config('services.mindee.monthly_limit'))
throw new Exception('Mindee monthly limit reached'); throw new Exception('Mindee monthly limit reached');
if (config('services.mindee.account_daily_limit') != 0 && Cache::get('mindeeAccountDailyRequests' . $user->company->account->id) > config('services.mindee.account_daily_limit')) if (config('services.mindee.account_daily_limit') != 0 && Cache::get('mindeeAccountDailyRequests' . $this->company->account->id) > config('services.mindee.account_daily_limit'))
throw new Exception('Mindee daily limit reached for account: ' . $user->company->account->id); throw new Exception('Mindee daily limit reached for account: ' . $this->company->account->id);
if (config('services.mindee.account_monthly_limit') != 0 && Cache::get('mindeeAccountMonthlyRequests' . $user->company->account->id) > config('services.mindee.account_monthly_limit')) if (config('services.mindee.account_monthly_limit') != 0 && Cache::get('mindeeAccountMonthlyRequests' . $this->company->account->id) > config('services.mindee.account_monthly_limit'))
throw new Exception('Mindee monthly limit reached for account: ' . $user->company->account->id); throw new Exception('Mindee monthly limit reached for account: ' . $this->company->account->id);
} }
private function incrementRequestCounts() private function incrementRequestCounts()
{ {
$user = auth()->user();
Cache::increment('mindeeTotalDailyRequests'); Cache::increment('mindeeTotalDailyRequests');
Cache::increment('mindeeTotalMonthlyRequests'); Cache::increment('mindeeTotalMonthlyRequests');
Cache::increment('mindeeAccountDailyRequests' . $user->company->account->id); Cache::increment('mindeeAccountDailyRequests' . $this->company->account->id);
Cache::increment('mindeeAccountMonthlyRequests' . $user->company->account->id); Cache::increment('mindeeAccountMonthlyRequests' . $this->company->account->id);
} }
} }

27
app/Services/EDocument/Imports/ParseEDocument.php
View File

@ -44,13 +44,16 @@ class ParseEDocument extends AbstractService
/** @var \App\Models\Account $account */ /** @var \App\Models\Account $account */
$account = $this->company->owner()->account; $account = $this->company->owner()->account;
$extension = $this->file->getClientOriginalExtension() ?: $this->file->getExtension();
$mimetype = $this->file->getClientMimeType() ?: $$this->file->getMimeType();
// ZUGFERD - try to parse via Zugferd lib // ZUGFERD - try to parse via Zugferd lib
switch (true) { switch (true) {
case ($this->file->getExtension() == 'pdf' || $this->file->getMimeType() == 'application/pdf'): case ($extension == 'pdf' || $mimetype == 'application/pdf'):
case ($this->file->getExtension() == 'xml' || $this->file->getMimeType() == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017"): case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017"):
case ($this->file->getExtension() == 'xml' || $this->file->getMimeType() == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0"): case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_3.0"):
case ($this->file->getExtension() == 'xml' || $this->file->getMimeType() == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_2.1"): case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_2.1"):
case ($this->file->getExtension() == 'xml' || $this->file->getMimeType() == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_2.0"): case ($extension == 'xml' || $mimetype == 'application/xml') && stristr($this->file->get(), "urn:cen.eu:en16931:2017#compliant#urn:xeinkauf.de:kosit:xrechnung_2.0"):
try { try {
return (new ZugferdEDocument($this->file, $this->company))->run(); return (new ZugferdEDocument($this->file, $this->company))->run();
} catch (Exception $e) { } catch (Exception $e) {
@ -60,11 +63,15 @@ class ParseEDocument extends AbstractService
// MINDEE OCR - try to parse via mindee external service // MINDEE OCR - try to parse via mindee external service
if (config('services.mindee.api_key') && !(Ninja::isHosted() && !($account->isPaid() && $account->plan == 'enterprise'))) if (config('services.mindee.api_key') && !(Ninja::isHosted() && !($account->isPaid() && $account->plan == 'enterprise')))
try { switch (true) {
return (new MindeeEDocument($this->file))->run(); case ($extension == 'pdf' || $mimetype == 'application/pdf'):
} catch (Exception $e) { case ($extension == 'heic' || $extension == 'heic' || $extension == 'png' || $extension == 'jpg' || $extension == 'jpeg' || $extension == 'webp' || str_starts_with($mimetype, 'image/')):
if (!($e->getMessage() == 'Unsupported document type')) try {
nlog("Mindee Exception: " . $e->getMessage()); return (new MindeeEDocument($this->file, $this->company))->run();
} catch (Exception $e) {
if (!($e->getMessage() == 'Unsupported document type'))
nlog("Mindee Exception: " . $e->getMessage());
}
} }
// NO PARSER OR ERROR // NO PARSER OR ERROR

2
app/Services/EDocument/Imports/ZugferdEDocument.php
View File

@ -50,7 +50,7 @@ class ZugferdEDocument extends AbstractService
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = $this->company->owner(); $user = $this->company->owner();
$this->document = ZugferdDocumentReader::readAndGuessFromContent($this->tempdocument); $this->document = ZugferdDocumentReader::readAndGuessFromContent($this->file->get());
$this->document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $invoiceCurrency, $taxCurrency, $documentname, $documentlanguage, $effectiveSpecifiedPeriod); $this->document->getDocumentInformation($documentno, $documenttypecode, $documentdate, $invoiceCurrency, $taxCurrency, $documentname, $documentlanguage, $effectiveSpecifiedPeriod);
$this->document->getDocumentSummation($grandTotalAmount, $duePayableAmount, $lineTotalAmount, $chargeTotalAmount, $allowanceTotalAmount, $taxBasisTotalAmount, $taxTotalAmount, $roundingAmount, $totalPrepaidAmount); $this->document->getDocumentSummation($grandTotalAmount, $duePayableAmount, $lineTotalAmount, $chargeTotalAmount, $allowanceTotalAmount, $taxBasisTotalAmount, $taxTotalAmount, $roundingAmount, $totalPrepaidAmount);