diff --git a/app/Http/Controllers/LicenseController.php b/app/Http/Controllers/LicenseController.php index b9221a82c719..1ead42dac365 100644 --- a/app/Http/Controllers/LicenseController.php +++ b/app/Http/Controllers/LicenseController.php @@ -137,7 +137,7 @@ class LicenseController extends BaseController } } else { $error = [ - 'message' => trans('texts.white_label_license_error'), + 'message' => 'There was an issue connecting to the license server. Please check your network.', 'errors' => new stdClass, ]; diff --git a/app/Services/Chart/ChartQueries.php b/app/Services/Chart/ChartQueries.php index 7f284736c58b..9d7172ca13e7 100644 --- a/app/Services/Chart/ChartQueries.php +++ b/app/Services/Chart/ChartQueries.php @@ -164,6 +164,28 @@ trait ChartQueries "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); } + // public function getPaymentsQuery($start_date, $end_date) + // { + // $user_filter = $this->is_admin ? '' : 'AND clients.user_id = '.$this->user->id; + + // return DB::select(DB::raw(" + // SELECT + // sum(payments.amount - payments.refunded) as paid_to_date, + // IFNULL(CAST(JSON_UNQUOTE(JSON_EXTRACT( clients.settings, '$.currency_id' )) AS SIGNED), :company_currency) AS currency_id + // FROM payments + // JOIN invoices + // on invoices.client_id = clients.id + // WHERE invoices.company_id = :company_id + // AND clients.is_deleted = 0 + // {$user_filter} + // AND invoices.is_deleted = 0 + // AND invoices.amount > 0 + // AND invoices.status_id IN (3,4) + // AND (invoices.date BETWEEN :start_date AND :end_date) + // GROUP BY currency_id + // "), ['company_currency' => $this->company->settings->currency_id, 'company_id' => $this->company->id, 'start_date' => $start_date, 'end_date' => $end_date]); + // } + public function getInvoicesQuery($start_date, $end_date) { $user_filter = $this->is_admin ? '' : 'AND clients.user_id = '.$this->user->id;