Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

minor fixes for molli

This commit is contained in:
David Bomba 2024-10-05 10:20:18 +10:00
parent bc9d9362f1
commit cdf1ee1338
7 changed files with 27 additions and 35 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
app/Exceptions/Handler.php
View File

@ -55,6 +55,7 @@ class Handler extends ExceptionHandler
// ModelNotFoundException::class, // ModelNotFoundException::class,
NotFoundHttpException::class, NotFoundHttpException::class,
RelationNotFoundException::class, RelationNotFoundException::class,
NoNodeAvailableException::class,
]; ];
protected $selfHostDontReport = [ protected $selfHostDontReport = [
@ -79,7 +80,6 @@ class Handler extends ExceptionHandler
ModelNotFoundException::class, ModelNotFoundException::class,
NotFoundHttpException::class, NotFoundHttpException::class,
RelationNotFoundException::class, RelationNotFoundException::class,
NoNodeAvailableException::class,
]; ];
/** /**

2
app/Jobs/Util/VersionCheck.php
View File

@ -119,4 +119,4 @@ class VersionCheck implements ShouldQueue
} }
} }
} }

2
app/PaymentDrivers/Mollie/IDEAL.php
View File

@ -210,7 +210,7 @@ class IDEAL implements MethodInterface, LivewireMethodInterface
$this->mollie->client->company, $this->mollie->client->company,
); );
return redirect()->route('client.payments.show', ['payment' => $this->mollie->encodePrimaryKey($payment_record->id)]); return redirect()->route('client.payments.show', ['payment' => $payment_record->hashed_id]);
} }
/** /**

47
app/Services/Chart/ChartQueries.php
View File

@ -54,7 +54,6 @@ trait ChartQueries
AND expenses.company_id = :company_id AND expenses.company_id = :company_id
AND (expenses.date BETWEEN :start_date AND :end_date) AND (expenses.date BETWEEN :start_date AND :end_date)
{$user_filter} {$user_filter}
GROUP BY expenses.company_id
", ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); ", ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]);
} }
@ -70,7 +69,7 @@ trait ChartQueries
WHEN expenses.currency_id = :company_currency THEN amount WHEN expenses.currency_id = :company_currency THEN amount
ELSE expenses.amount * expenses.exchange_rate ELSE expenses.amount * expenses.exchange_rate
END END
) AS amount, ) AS total,
expenses.date expenses.date
FROM expenses FROM expenses
WHERE (expenses.date BETWEEN :start_date AND :end_date) WHERE (expenses.date BETWEEN :start_date AND :end_date)
@ -143,12 +142,13 @@ trait ChartQueries
$user_filter = $this->is_admin ? '' : 'AND payments.user_id = '.$this->user->id; $user_filter = $this->is_admin ? '' : 'AND payments.user_id = '.$this->user->id;
return DB::select(" return DB::select("
SELECT sum(payments.amount / payments.exchange_rate) as amount, SELECT sum((payments.amount - payments.refunded) / payments.exchange_rate) as amount,
IFNULL(payments.currency_id, :company_currency) as currency_id IFNULL(payments.currency_id, :company_currency) as currency_id
FROM payments FROM payments
WHERE payments.is_deleted = 0 WHERE payments.company_id = :company_id
AND payments.is_deleted = 0
{$user_filter} {$user_filter}
AND payments.company_id = :company_id AND payments.status_id IN (4,5,6)
AND (payments.date BETWEEN :start_date AND :end_date) AND (payments.date BETWEEN :start_date AND :end_date)
GROUP BY currency_id GROUP BY currency_id
", [ ", [
@ -166,9 +166,8 @@ trait ChartQueries
return DB::select(" return DB::select("
SELECT SELECT
sum((payments.amount - payments.refunded) / payments.exchange_rate) as total, sum((payments.amount - payments.refunded) * payments.exchange_rate) as total,
payments.date, payments.date
IFNULL(payments.currency_id, :company_currency) AS currency_id
FROM payments FROM payments
WHERE payments.company_id = :company_id WHERE payments.company_id = :company_id
AND payments.is_deleted = 0 AND payments.is_deleted = 0
@ -177,7 +176,6 @@ trait ChartQueries
AND (payments.date BETWEEN :start_date AND :end_date) AND (payments.date BETWEEN :start_date AND :end_date)
GROUP BY payments.date GROUP BY payments.date
", [ ", [
'company_currency' => $this->company->settings->currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
'start_date' => $start_date, 'start_date' => $start_date,
'end_date' => $end_date, 'end_date' => $end_date,
@ -245,9 +243,8 @@ trait ChartQueries
return DB::select(" return DB::select("
SELECT SELECT
sum(invoices.balance / IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT(clients.settings, '$.currency_id')) AS SIGNED), :company_currency2)) as amount, sum(invoices.balance / invoices.exchange_rate) as amount,
COUNT(invoices.id) as outstanding_count, COUNT(invoices.id) as outstanding_count
IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT( clients.settings, '$.currency_id' )) AS SIGNED), :company_currency) AS currency_id
FROM clients FROM clients
JOIN invoices JOIN invoices
on invoices.client_id = clients.id on invoices.client_id = clients.id
@ -259,8 +256,6 @@ trait ChartQueries
AND invoices.balance > 0 AND invoices.balance > 0
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
", [ ", [
'company_currency2' => $this->company->settings->currency_id,
'company_currency' => $this->company->settings->currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
'start_date' => $start_date, 'start_date' => $start_date,
'end_date' => $end_date]); 'end_date' => $end_date]);
@ -273,7 +268,7 @@ trait ChartQueries
return DB::select(" return DB::select("
SELECT SELECT
sum((payments.amount - payments.refunded) / payments.exchange_rate) as paid_to_date sum((payments.amount - payments.refunded) * payments.exchange_rate) as paid_to_date
FROM payments FROM payments
JOIN clients JOIN clients
ON payments.client_id=clients.id ON payments.client_id=clients.id
@ -316,11 +311,9 @@ trait ChartQueries
return DB::select(" return DB::select("
SELECT SELECT
sum(invoices.amount / IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT(clients.settings, '$.currency_id')) AS SIGNED), :company_currency2)) as invoiced_amount, SUM(invoices.amount / invoices.exchange_rate) as invoiced_amount
IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT( clients.settings, '$.currency_id' )) AS SIGNED), :company_currency) AS currency_id
FROM clients FROM clients
JOIN invoices JOIN invoices ON invoices.client_id = clients.id
on invoices.client_id = clients.id
WHERE invoices.status_id IN (2,3,4) WHERE invoices.status_id IN (2,3,4)
AND invoices.company_id = :company_id AND invoices.company_id = :company_id
{$user_filter} {$user_filter}
@ -328,8 +321,12 @@ trait ChartQueries
AND clients.is_deleted = 0 AND clients.is_deleted = 0
AND invoices.is_deleted = 0 AND invoices.is_deleted = 0
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY invoices.company_id ", [
", ['company_currency2' => $this->company->settings->currency_id, 'company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); 'company_id' => $this->company->id,
'start_date' => $start_date,
'end_date' => $end_date
]);
} }
@ -361,7 +358,7 @@ trait ChartQueries
return DB::select(" return DB::select("
SELECT SELECT
sum(invoices.balance / IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT(clients.settings, '$.currency_id')) AS SIGNED), :company_currency)) as total, SUM(invoices.balance / invoices.exchange_rate) as total,
invoices.date invoices.date
FROM clients FROM clients
JOIN invoices JOIN invoices
@ -372,9 +369,7 @@ trait ChartQueries
AND invoices.is_deleted = 0 AND invoices.is_deleted = 0
{$user_filter} {$user_filter}
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY invoices.company_id
", [ ", [
'company_currency' => (int) $this->company->settings->currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
'start_date' => $start_date, 'start_date' => $start_date,
'end_date' => $end_date, 'end_date' => $end_date,
@ -417,7 +412,7 @@ trait ChartQueries
return DB::select(" return DB::select("
SELECT SELECT
sum(invoices.amount / IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT(clients.settings, '$.currency_id')) AS SIGNED), :company_currency)) as total, SUM(invoices.amount / invoices.exchange_rate) as total,
invoices.date invoices.date
FROM clients FROM clients
JOIN invoices JOIN invoices
@ -428,9 +423,7 @@ trait ChartQueries
{$user_filter} {$user_filter}
AND invoices.status_id IN (2,3,4) AND invoices.status_id IN (2,3,4)
AND (invoices.date BETWEEN :start_date AND :end_date) AND (invoices.date BETWEEN :start_date AND :end_date)
GROUP BY invoices.company_id
", [ ", [
'company_currency' => (int) $this->company->settings->currency_id,
'company_id' => $this->company->id, 'company_id' => $this->company->id,
'start_date' => $start_date, 'start_date' => $start_date,
'end_date' => $end_date, 'end_date' => $end_date,

4
app/Services/Chart/ChartService.php
View File

@ -138,9 +138,9 @@ class ChartService
$aggregate_outstanding = $this->getAggregateOutstandingQuery($start_date, $end_date); $aggregate_outstanding = $this->getAggregateOutstandingQuery($start_date, $end_date);
$aggregate_expenses = $this->getAggregateExpenseQuery($start_date, $end_date); $aggregate_expenses = $this->getAggregateExpenseQuery($start_date, $end_date);
$aggregate_invoices = $this->getAggregateInvoicesQuery($start_date, $end_date); $aggregate_invoices = $this->getAggregateInvoicesQuery($start_date, $end_date);
$data[999]['invoices'] = $aggregate_invoices !== false ? reset($aggregate_invoices) : new \stdClass(); $data[999]['invoices'] = $aggregate_invoices !== false ? reset($aggregate_invoices) : new \stdClass();
$data[999]['expense'] = $aggregate_expenses !== false ? reset($aggregate_expenses) : new \stdClass(); $data[999]['expenses'] = $aggregate_expenses !== false ? reset($aggregate_expenses) : new \stdClass();
$data[999]['outstanding'] = $aggregate_outstanding !== false ? reset($aggregate_outstanding) : new \stdClass(); $data[999]['outstanding'] = $aggregate_outstanding !== false ? reset($aggregate_outstanding) : new \stdClass();
$data[999]['revenue'] = $aggregate_revenue !== false ? reset($aggregate_revenue) : new \stdClass(); $data[999]['revenue'] = $aggregate_revenue !== false ? reset($aggregate_revenue) : new \stdClass();

3
app/Utils/HostedPDF/NinjaPdf.php
View File

@ -33,5 +33,4 @@ class NinjaPdf
return $response->getBody()->getContents(); return $response->getBody()->getContents();
} }
} }

2
lang/en/texts.php
View File

@ -2364,7 +2364,7 @@ $lang = array(
'currency_gold_troy_ounce' => 'Gold Troy Ounce', 'currency_gold_troy_ounce' => 'Gold Troy Ounce',
'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba', 'currency_nicaraguan_córdoba' => 'Nicaraguan Córdoba',
'currency_malagasy_ariary' => 'Malagasy ariary', 'currency_malagasy_ariary' => 'Malagasy ariary',
"currency_tongan_paanga" => "Tongan Pa'anga", "currency_tongan_pa_anga" => "Tongan Pa'anga",
'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider :link we\'d greatly appreciate it!', 'review_app_help' => 'We hope you\'re enjoying using the app.<br/>If you\'d consider :link we\'d greatly appreciate it!',
'writing_a_review' => 'writing a review', 'writing_a_review' => 'writing a review',