*/
app()->singleton('sizes', function ($app) {
return Size::query()->orderBy('id')->get();
});
- /** @deprecated */
- app()->singleton('banks', function ($app) {
- return Bank::query()->orderBy('id')->get();
- });
app()->singleton('templates', function ($app) {
return [
diff --git a/app/Repositories/PaymentRepository.php b/app/Repositories/PaymentRepository.php
index f0924ec7b59d..e7879ec8dd11 100644
--- a/app/Repositories/PaymentRepository.php
+++ b/app/Repositories/PaymentRepository.php
@@ -59,7 +59,7 @@ class PaymentRepository extends BaseRepository
* @param Payment $payment The $payment entity
* @return Payment The updated/created payment object
*/
- private function applyPayment(array $data, Payment $payment): ?Payment
+ private function applyPayment(array $data, Payment $payment): Payment
{
$is_existing_payment = true;
$client = false;
diff --git a/app/Services/Chart/ChartService.php b/app/Services/Chart/ChartService.php
index b6178436dbcb..7bd2ed911a0b 100644
--- a/app/Services/Chart/ChartService.php
+++ b/app/Services/Chart/ChartService.php
@@ -57,7 +57,9 @@ class ChartService
/* Merge and filter by unique */
$currencies = $currencies->merge($expense_currencies)->unique();
- $cache_currencies = Cache::get('currencies');
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
+ $cache_currencies = app('currencies');
$filtered_currencies = $cache_currencies->whereIn('id', $currencies)->all();
@@ -162,7 +164,9 @@ class ChartService
private function addCurrencyCodes($data_set): array
{
- $currencies = Cache::get('currencies');
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
+ $currencies = app('currencies');
foreach ($data_set as $key => $value) {
$data_set[$key]->currency_id = str_replace('"', '', $value->currency_id);
diff --git a/app/Services/Chart/ChartServiceLegacy.php b/app/Services/Chart/ChartServiceLegacy.php
index bebc45bc3363..84b839ac11da 100644
--- a/app/Services/Chart/ChartServiceLegacy.php
+++ b/app/Services/Chart/ChartServiceLegacy.php
@@ -53,7 +53,9 @@ class ChartServiceLegacy
/* Merge and filter by unique */
$currencies = $currencies->merge($expense_currencies)->unique();
- $cache_currencies = Cache::get('currencies');
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
+ $cache_currencies = app('currencies');
$filtered_currencies = $cache_currencies->whereIn('id', $currencies)->all();
@@ -135,7 +137,9 @@ class ChartServiceLegacy
private function addCurrencyCodes($data_set): array
{
- $currencies = Cache::get('currencies');
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
+ $currencies = app('currencies');
foreach ($data_set as $key => $value) {
$data_set[$key]->currency_id = str_replace('"', '', $value->currency_id);
diff --git a/app/Services/Credit/CreditService.php b/app/Services/Credit/CreditService.php
index 9474058f85f9..927bc3c16a75 100644
--- a/app/Services/Credit/CreditService.php
+++ b/app/Services/Credit/CreditService.php
@@ -219,27 +219,6 @@ class CreditService
public function deletePdf()
{
- $this->credit->invitations->each(function ($invitation) {
- // (new UnlinkFile(config('filesystems.default'), $this->credit->client->credit_filepath($invitation).$this->credit->numberFormatter().'.pdf'))->handle();
-
- //30-06-2023
- try {
- // if (Storage::disk(config('filesystems.default'))->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
- Storage::disk(config('filesystems.default'))->delete($this->credit->client->credit_filepath($invitation).$this->credit->numberFormatter().'.pdf');
- // }
-
- // if (Ninja::isHosted() && Storage::disk('public')->exists($this->invoice->client->invoice_filepath($invitation).$this->invoice->numberFormatter().'.pdf')) {
- if (Ninja::isHosted()) {
- Storage::disk('public')->delete($this->credit->client->credit_filepath($invitation).$this->credit->numberFormatter().'.pdf');
- }
- } catch (\Exception $e) {
- nlog($e->getMessage());
- }
-
-
-
- });
-
return $this;
}
@@ -273,11 +252,14 @@ class CreditService
public function deleteCredit()
{
+ $paid_to_date = $this->credit->invoice_id ? $this->credit->balance : 0;
+
$this->credit
- ->client
- ->service()
- ->adjustCreditBalance($this->credit->balance * -1)
- ->save();
+ ->client
+ ->service()
+ ->updatePaidToDate($paid_to_date)
+ ->adjustCreditBalance($this->credit->balance * -1)
+ ->save();
return $this;
}
@@ -285,9 +267,13 @@ class CreditService
public function restoreCredit()
{
+
+ $paid_to_date = $this->credit->invoice_id ? $this->credit->balance : 0;
+
$this->credit
->client
->service()
+ ->updatePaidToDate($paid_to_date * -1)
->adjustCreditBalance($this->credit->balance)
->save();
diff --git a/app/Services/EDocument/Standards/RoEInvoice.php b/app/Services/EDocument/Standards/RoEInvoice.php
index ebee4d1fcd38..016f810d4e9c 100644
--- a/app/Services/EDocument/Standards/RoEInvoice.php
+++ b/app/Services/EDocument/Standards/RoEInvoice.php
@@ -405,7 +405,7 @@ class RoEInvoice extends AbstractService
/**
* @param $item
* @param $invoice_total
- * @return float|int
+ * @return float
*/
private function getItemTaxable($item, $invoice_total)
{
diff --git a/app/Services/Email/EmailDefaults.php b/app/Services/Email/EmailDefaults.php
index 068ad85c77ad..25a7d0204b32 100644
--- a/app/Services/Email/EmailDefaults.php
+++ b/app/Services/Email/EmailDefaults.php
@@ -406,7 +406,7 @@ class EmailDefaults
* @param string $markdown The body to convert
* @return string The parsed markdown response
*/
- private function parseMarkdownToHtml(string $markdown): ?string
+ private function parseMarkdownToHtml(string $markdown): string
{
$converter = new CommonMarkConverter([
'allow_unsafe_links' => false,
diff --git a/app/Services/Pdf/PdfBuilder.php b/app/Services/Pdf/PdfBuilder.php
index 601bf2229d35..5af214dbd30a 100644
--- a/app/Services/Pdf/PdfBuilder.php
+++ b/app/Services/Pdf/PdfBuilder.php
@@ -993,6 +993,7 @@ class PdfBuilder
PdfService::DELIVERY_NOTE => $this->getDeliveryNoteSections(),
PdfService::STATEMENT => $this->getStatementSections(),
PdfService::PURCHASE_ORDER => $this->getPurchaseOrderSections(),
+ default => $this->getProductSections(),
};
}
diff --git a/app/Services/Pdf/PdfConfiguration.php b/app/Services/Pdf/PdfConfiguration.php
index df6c9d38537b..fddbc0766ae2 100644
--- a/app/Services/Pdf/PdfConfiguration.php
+++ b/app/Services/Pdf/PdfConfiguration.php
@@ -457,15 +457,13 @@ class PdfConfiguration
*/
public function setDateFormat(): self
{
- $date_formats = Cache::get('date_formats');
+
+ /** @var \Illuminate\Support\Collection<\App\Models\DateFormat> */
+ $date_formats = app('date_formats');
- if (! $date_formats) {
- $this->buildCache(true);
- }
-
- $this->date_format = $date_formats->filter(function ($item) {
+ $this->date_format = $date_formats->first(function ($item) {
return $item->id == $this->settings->date_format_id;
- })->first()->format;
+ })->format;
return $this;
}
diff --git a/app/Services/Pdf/PdfMock.php b/app/Services/Pdf/PdfMock.php
index 0173ab8c624e..7bc40ec22006 100644
--- a/app/Services/Pdf/PdfMock.php
+++ b/app/Services/Pdf/PdfMock.php
@@ -174,7 +174,8 @@ class PdfMock
match ($this->request['settings_type']) {
'group' => $settings = ClientSettings::buildClientSettings($this->company->settings, $this->request['settings']),
'client' => $settings = ClientSettings::buildClientSettings($this->company->settings, $this->request['settings']),
- 'company' => $settings = (object)$this->request['settings']
+ 'company' => $settings = (object)$this->request['settings'],
+ default => $settings = (object)$this->request['settings'],
};
$settings = CompanySettings::setProperties($settings);
diff --git a/app/Services/Scheduler/EmailReport.php b/app/Services/Scheduler/EmailReport.php
index 9a4487109c6b..2dd93ee32e8f 100644
--- a/app/Services/Scheduler/EmailReport.php
+++ b/app/Services/Scheduler/EmailReport.php
@@ -46,9 +46,9 @@ class EmailReport
use MakesHash;
use MakesDates;
- private Client $client;
+ // private Client $client;
- private bool $multiple_clients = false;
+ // private bool $multiple_clients = false;
private string $file_name = 'file.csv';
@@ -66,6 +66,7 @@ class EmailReport
$data['end_date'] = $start_end_dates[1];
$data['date_range'] = $data['date_range'] ?? 'all';
$data['report_keys'] = $data['report_keys'] ?? [];
+ $data['include_deleted'] = $data['include_deleted'] ?? false;
$export = false;
diff --git a/app/Services/Subscription/PaymentLinkService.php b/app/Services/Subscription/PaymentLinkService.php
index 2d91260e7e2c..1c66db998ff4 100644
--- a/app/Services/Subscription/PaymentLinkService.php
+++ b/app/Services/Subscription/PaymentLinkService.php
@@ -117,7 +117,7 @@ class PaymentLinkService
/* 06-04-2022 */
/* We may not be in a state where the user is present */
- if (auth()->guard('contact')) {
+ if (auth()->guard('contact')->user()) {
return $this->handleRedirect('/client/invoices/' . $this->encodePrimaryKey($payment_hash->fee_invoice_id));
}
}
diff --git a/app/Services/Tax/Providers/TaxProvider.php b/app/Services/Tax/Providers/TaxProvider.php
index 1e65d0f170a3..1a4b20736542 100644
--- a/app/Services/Tax/Providers/TaxProvider.php
+++ b/app/Services/Tax/Providers/TaxProvider.php
@@ -225,9 +225,9 @@ class TaxProvider
{
throw new \Exception("No tax region defined for this country");
- $this->provider = EuTax::class;
+ // $this->provider = EuTax::class;
- return $this;
+ // return $this;
}
/**
diff --git a/app/Services/Template/TemplateAction.php b/app/Services/Template/TemplateAction.php
index 170b0cef7701..2a892ad2b0b2 100644
--- a/app/Services/Template/TemplateAction.php
+++ b/app/Services/Template/TemplateAction.php
@@ -102,6 +102,7 @@ class TemplateAction implements ShouldQueue
Expense::class => $resource->with('client'),
Payment::class => $resource->with('invoices', 'client'),
Client::class => $resource,
+ default => $resource,
};
$result = $resource->withTrashed()
@@ -219,6 +220,7 @@ class TemplateAction implements ShouldQueue
Project::class => 'projects',
Client::class => 'clients',
Vendor::class => 'vendors',
+ default =>'invoices',
};
}
diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php
index 14babd5de3aa..44f02d9b82a0 100644
--- a/app/Services/Template/TemplateService.php
+++ b/app/Services/Template/TemplateService.php
@@ -124,7 +124,7 @@ class TemplateService
$this->twig->addFilter($filter);
$allowedTags = ['if', 'for', 'set', 'filter'];
- $allowedFilters = ['escape', 'e', 'upper', 'lower', 'capitalize', 'filter', 'length', 'merge','format_currency','map', 'join', 'first', 'date','sum'];
+ $allowedFilters = ['escape', 'e', 'upper', 'lower', 'capitalize', 'filter', 'length', 'merge','format_currency', 'format_number','format_percent_number','map', 'join', 'first', 'date','sum'];
$allowedFunctions = ['range', 'cycle', 'constant', 'date',];
$allowedProperties = ['type_id'];
$allowedMethods = ['img','t'];
@@ -306,9 +306,6 @@ class TemplateService
} catch(SyntaxError $e) {
nlog($e->getMessage());
throw ($e);
- } catch(Error $e) {
- nlog("error = " . $e->getMessage());
- throw ($e);
} catch(RuntimeError $e) {
nlog("runtime = " . $e->getMessage());
throw ($e);
@@ -318,8 +315,11 @@ class TemplateService
} catch(SecurityError $e) {
nlog("security = " . $e->getMessage());
throw ($e);
+ } catch(Error $e) {
+ nlog("error = " . $e->getMessage());
+ throw ($e);
}
-
+
$template = $template->render($this->data);
$f = $this->document->createDocumentFragment();
@@ -620,8 +620,6 @@ class TemplateService
private function transformPayment(Payment $payment): array
{
- $data = [];
-
$this->payment = $payment;
$credits = $payment->credits->map(function ($credit) use ($payment) {
@@ -694,8 +692,6 @@ class TemplateService
'refund_activity' => $this->getPaymentRefundActivity($payment),
];
- return $data;
-
}
/**
@@ -1196,6 +1192,7 @@ class TemplateService
'company-details' => $this->companyDetails($stack['labels'] == 'true'),
'company-address' => $this->companyAddress($stack['labels'] == 'true'),
'shipping-details' => $this->shippingDetails($stack['labels'] == 'true'),
+ default => $this->entityDetails(),
};
$this->save();
diff --git a/app/Transformers/ProjectTransformer.php b/app/Transformers/ProjectTransformer.php
index cdf5184219c6..c9eb2dbc20a4 100644
--- a/app/Transformers/ProjectTransformer.php
+++ b/app/Transformers/ProjectTransformer.php
@@ -47,11 +47,11 @@ class ProjectTransformer extends EntityTransformer
{
$transformer = new DocumentTransformer($this->serializer);
- if($project->documents) {
+ // if($project->documents->count() > 0) {
return $this->includeCollection($project->documents, $transformer, Document::class);
- }
+ // }
- return null;
+ // return null;
}
public function includeClient(Project $project): ?\League\Fractal\Resource\Item
diff --git a/app/Transformers/UserTransformer.php b/app/Transformers/UserTransformer.php
index 3f4ec9801ac8..83d4d8fb10a0 100644
--- a/app/Transformers/UserTransformer.php
+++ b/app/Transformers/UserTransformer.php
@@ -63,8 +63,9 @@ class UserTransformer extends EntityTransformer
'has_password' => (bool) empty($user->password) ? false : true,
'oauth_user_token' => empty($user->oauth_user_token) ? '' : '***',
'verified_phone_number' => (bool) $user->verified_phone_number,
- 'language_id' => (string) $user->language_id ?? '',
+ 'language_id' => (string) $user->language_id ?: '',
'user_logged_in_notification' => (bool) $user->user_logged_in_notification,
+ 'referral_code' => (string) $user->referral_code,
];
}
diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index 21db9ad6f90f..4d5fd38d486d 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -97,15 +97,15 @@ class Helpers
switch ($custom_field) {
case 'date':
return is_null($entity) ? $value : $this->translateDate($value, $entity->date_format(), $entity->locale());
- break;
+
case 'switch':
return trim($value ?? '') == 'yes' ? ctrans('texts.yes') : ctrans('texts.no');
- break;
+
default:
return is_null($value) ? '' : $this->processReservedKeywords($value, $entity);
- break;
+
}
}
@@ -252,7 +252,7 @@ class Helpers
continue;
}
- if (Str::contains($match, '|')) {
+ // if (Str::contains($match, '|')) {
$parts = explode('|', $match); // [ '[MONTH', 'MONTH+2]' ]
$left = substr($parts[0], 1); // 'MONTH'
@@ -290,7 +290,7 @@ class Helpers
$value,
1
);
- }
+ // }
}
// Second case with more common calculations.
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 3f34611e0d24..073d7d55b882 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -45,7 +45,7 @@ class HtmlEngine
/** @var \App\Models\Client $client */
public $client;
- /** @var \App\Models\ClientContact $contact */
+ /** @var ?\App\Models\ClientContact $contact */
public $contact;
/** @var \App\Models\Company $company */
@@ -120,7 +120,7 @@ class HtmlEngine
{
if (! $this->client->currency()) {
throw new Exception(debug_backtrace()[1]['function'], 1);
- exit;
+ // exit;
}
App::forgetInstance('translator');
@@ -132,10 +132,10 @@ class HtmlEngine
$data['$global_margin'] = ['value' => '6.35mm', 'label' => ''];
$data['$company_logo_size'] = ['value' => $this->resolveCompanyLogoSize(), 'label' => ''];
- $data['$show_shipping_address'] = ['value' => $this->settings?->show_shipping_address ? 'flex' : 'none', 'label' => ''];
- $data['$show_shipping_address_block'] = ['value' => $this->settings?->show_shipping_address ? 'block' : 'none', 'label' => ''];
+ $data['$show_shipping_address'] = ['value' => $this->settings->show_shipping_address ? 'flex' : 'none', 'label' => ''];
+ $data['$show_shipping_address_block'] = ['value' => $this->settings->show_shipping_address ? 'block' : 'none', 'label' => ''];
// $data['$show_shipping_address_visibility'] = ['value' => $this->settings?->show_shipping_address ? 'visible' : 'hidden', 'label' => ''];
- $data['$show_shipping_address_visibility'] = ['value' => $this->settings?->show_shipping_address ? 1 : 0, 'label' => ''];
+ $data['$show_shipping_address_visibility'] = ['value' => $this->settings->show_shipping_address ? 1 : 0, 'label' => ''];
$data['$order_number'] = ['value' => '', 'label' => ctrans('texts.order_number')];
$data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
@@ -226,7 +226,7 @@ class HtmlEngine
$data['$status_logo'] = ['value' => ' ' . ctrans('texts.paid') .'
', 'label' => ''];
- $data['$show_paid_stamp'] = ['value' => $this->entity->status_id == 4 && $this->settings?->show_paid_stamp ? 'flex' : 'none', 'label' => ''];
+ $data['$show_paid_stamp'] = ['value' => $this->entity->status_id == 4 && $this->settings->show_paid_stamp ? 'flex' : 'none', 'label' => ''];
if ($this->entity->vendor) {
$data['$invoice.vendor'] = ['value' => $this->entity->vendor->present()->name(), 'label' => ctrans('texts.vendor_name')];
@@ -775,8 +775,7 @@ class HtmlEngine
return '';
}
- return
- collect($payment->refund_meta)
+ return collect($payment->refund_meta)
->map(function ($refund) use ($payment) {
$date = \Carbon\Carbon::parse($refund['date'] ?? $payment->date)->addSeconds($payment->client->timezone_offset());
@@ -919,39 +918,30 @@ class HtmlEngine
private function getCountryName(): string
{
- $countries = Cache::get('countries');
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Country> */
+ $countries = app('countries');
- if (! $countries) {
- $this->buildCache(true);
+ $country = $countries->first(function ($item) {
+ return $item->id == $this->settings->country_id;
+ });
- $countries = Cache::get('countries');
- }
-
- if ($countries) {
- $country = $countries->filter(function ($item) {
- return $item->id == $this->settings->country_id;
- })->first();
- } else {
- $country = Country::find($this->settings->country_id);
- }
-
- if ($country) {
- return ctrans('texts.country_' . $country->name);
- }
-
- return ' ';
+ return $country ? ctrans('texts.country_' . $country->name) : ctrans('texts.country_' . $countries->first()->name);
}
private function getCountryCode(): string
{
- $country = Country::find($this->settings->country_id);
- if ($country) {
- return $country->iso_3166_2;
- }
- return ' ';
+ /** @var \Illuminate\Support\Collection<\App\Models\Country> */
+ $countries = app('countries');
+
+ $country = $countries->first(function ($item) {
+ return $item->id == $this->settings->country_id;
+ });
+
+ return $country ? $country->iso_3166_2 : ' ';
}
/**
* Due to the way we are compiling the blade template we
@@ -962,20 +952,20 @@ class HtmlEngine
* @return string a collection of rows with line item
* aggregate data
*/
- private function makeLineTaxes(): string
- {
- $tax_map = $this->entity_calc->getTaxMap();
+ // private function makeLineTaxes(): string
+ // {
+ // $tax_map = $this->entity_calc->getTaxMap();
- $data = '';
+ // $data = '';
- foreach ($tax_map as $tax) {
- $data .= '
';
- $data .= '| '.$tax['name'].' | ';
- $data .= ''.Number::formatMoney($tax['total'], $this->client).' |
';
- }
+ // foreach ($tax_map as $tax) {
+ // $data .= '';
+ // $data .= '| '.$tax['name'].' | ';
+ // $data .= ''.Number::formatMoney($tax['total'], $this->client).' |
';
+ // }
- return $data;
- }
+ // return $data;
+ // }
private function lineTaxValues(): string
{
@@ -990,30 +980,30 @@ class HtmlEngine
return $data;
}
- private function makeTotalTaxes(): string
- {
- $data = '';
+ // private function makeTotalTaxes(): string
+ // {
+ // $data = '';
- if (! $this->entity_calc->getTotalTaxMap()) {
- return $data;
- }
+ // if (! $this->entity_calc->getTotalTaxMap()) {
+ // return $data;
+ // }
- foreach ($this->entity_calc->getTotalTaxMap() as $tax) {
- $data .= '';
- $data .= ' | ';
- $data .= ''.$tax['name'].' | ';
- $data .= ''.Number::formatMoney($tax['total'], $this->client).' |
';
- }
+ // foreach ($this->entity_calc->getTotalTaxMap() as $tax) {
+ // $data .= '';
+ // $data .= ' | ';
+ // $data .= ''.$tax['name'].' | ';
+ // $data .= ''.Number::formatMoney($tax['total'], $this->client).' |
';
+ // }
- return $data;
- }
+ // return $data;
+ // }
- private function parseLabelsAndValues($labels, $values, $section): string
- {
- $section = strtr($section, $labels);
+ // private function parseLabelsAndValues($labels, $values, $section): string
+ // {
+ // $section = strtr($section, $labels);
- return strtr($section, $values);
- }
+ // return strtr($section, $values);
+ // }
/*
| Ensures the URL doesn't have duplicated trailing slash
@@ -1029,98 +1019,98 @@ class HtmlEngine
* of Repeating headers and footers on the PDF.
* @return string The css string
*/
- private function generateCustomCSS(): string
- {
- $header_and_footer = '
-.header, .header-space {
- height: 160px;
-}
+// private function generateCustomCSS(): string
+// {
+// $header_and_footer = '
+// .header, .header-space {
+// height: 160px;
+// }
-.footer, .footer-space {
- height: 160px;
-}
+// .footer, .footer-space {
+// height: 160px;
+// }
-.footer {
- position: fixed;
- bottom: 0;
- width: 100%;
-}
+// .footer {
+// position: fixed;
+// bottom: 0;
+// width: 100%;
+// }
-.header {
- position: fixed;
- top: 0mm;
- width: 100%;
-}
+// .header {
+// position: fixed;
+// top: 0mm;
+// width: 100%;
+// }
-@media print {
- thead {display: table-header-group;}
- tfoot {display: table-footer-group;}
- button {display: none;}
- body {margin: 0;}
-}';
+// @media print {
+// thead {display: table-header-group;}
+// tfoot {display: table-footer-group;}
+// button {display: none;}
+// body {margin: 0;}
+// }';
- $header = '
-.header, .header-space {
- height: 160px;
-}
+// $header = '
+// .header, .header-space {
+// height: 160px;
+// }
-.header {
- position: fixed;
- top: 0mm;
- width: 100%;
-}
+// .header {
+// position: fixed;
+// top: 0mm;
+// width: 100%;
+// }
-@media print {
- thead {display: table-header-group;}
- button {display: none;}
- body {margin: 0;}
-}';
+// @media print {
+// thead {display: table-header-group;}
+// button {display: none;}
+// body {margin: 0;}
+// }';
- $footer = '
+// $footer = '
-.footer, .footer-space {
- height: 160px;
-}
+// .footer, .footer-space {
+// height: 160px;
+// }
-.footer {
- position: fixed;
- bottom: 0;
- width: 100%;
-}
+// .footer {
+// position: fixed;
+// bottom: 0;
+// width: 100%;
+// }
-@media print {
- tfoot {display: table-footer-group;}
- button {display: none;}
- body {margin: 0;}
-}';
- $css = '';
+// @media print {
+// tfoot {display: table-footer-group;}
+// button {display: none;}
+// body {margin: 0;}
+// }';
+// $css = '';
- if ($this->settings->all_pages_header && $this->settings->all_pages_footer) {
- $css .= $header_and_footer;
- } elseif ($this->settings->all_pages_header && ! $this->settings->all_pages_footer) {
- $css .= $header;
- } elseif (! $this->settings->all_pages_header && $this->settings->all_pages_footer) {
- $css .= $footer;
- }
+// if ($this->settings->all_pages_header && $this->settings->all_pages_footer) {
+// $css .= $header_and_footer;
+// } elseif ($this->settings->all_pages_header && ! $this->settings->all_pages_footer) {
+// $css .= $header;
+// } elseif (! $this->settings->all_pages_header && $this->settings->all_pages_footer) {
+// $css .= $footer;
+// }
- $css .= '
-.page {
- page-break-after: always;
-}
+// $css .= '
+// .page {
+// page-break-after: always;
+// }
-@page {
- margin: 0mm
-}
+// @page {
+// margin: 0mm
+// }
-html {
- ';
+// html {
+// ';
- $css .= 'font-size:'.$this->settings->font_size.'px;';
+// $css .= 'font-size:'.$this->settings->font_size.'px;';
- $css .= '}';
+// $css .= '}';
- return $css;
- }
+// return $css;
+// }
/**
* Generate markup for HTML images on entity.
@@ -1200,14 +1190,14 @@ html {
';
- return '
-
- ';
+ // return '
+ //
+ // ';
}
}
diff --git a/app/Utils/PaymentHtmlEngine.php b/app/Utils/PaymentHtmlEngine.php
index 8562d22bea67..b28641606c86 100644
--- a/app/Utils/PaymentHtmlEngine.php
+++ b/app/Utils/PaymentHtmlEngine.php
@@ -355,14 +355,14 @@ class PaymentHtmlEngine
';
- return '
-
- ';
+ // return '
+ //
+ // ';
}
}
diff --git a/app/Utils/Statics.php b/app/Utils/Statics.php
index e4b2201db658..aa8021c3d8e5 100644
--- a/app/Utils/Statics.php
+++ b/app/Utils/Statics.php
@@ -69,62 +69,81 @@ class Statics
{
$data = [];
- foreach (config('ninja.cached_tables') as $name => $class) {
- if (! Cache::has($name)) {
- // check that the table exists in case the migration is pending
- if (! Schema::hasTable((new $class())->getTable())) {
- continue;
- }
- if ($name == 'payment_terms') {
- $orderBy = 'num_days';
- } elseif ($name == 'fonts') {
- $orderBy = 'sort_order';
- } elseif (in_array($name, ['currencies', 'industries', 'languages', 'countries', 'banks'])) {
- $orderBy = 'name';
- } else {
- $orderBy = 'id';
- }
- $tableData = $class::orderBy($orderBy)->get();
- if ($tableData->count()) {
- Cache::forever($name, $tableData);
- }
- }
+ // foreach (config('ninja.cached_tables') as $name => $class) {
+ // if (! Cache::has($name)) {
+ // // check that the table exists in case the migration is pending
+ // if (! Schema::hasTable((new $class())->getTable())) {
+ // continue;
+ // }
+ // if ($name == 'payment_terms') {
+ // $orderBy = 'num_days';
+ // } elseif ($name == 'fonts') {
+ // $orderBy = 'sort_order';
+ // } elseif (in_array($name, ['currencies', 'industries', 'languages', 'countries', 'banks'])) {
+ // $orderBy = 'name';
+ // } else {
+ // $orderBy = 'id';
+ // }
+ // $tableData = $class::orderBy($orderBy)->get();
+ // if ($tableData->count()) {
+ // Cache::forever($name, $tableData);
+ // }
+ // }
- $data[$name] = Cache::get($name);
- }
+ // $data[$name] = app($name);
+ // }
if ($locale) {
- $data['industries'] = Cache::get('industries')->each(function ($industry) {
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Industry> */
+ $industries = app('industries');
+
+ $data['industries'] = $industries->each(function ($industry) {
$industry->name = ctrans('texts.industry_'.$industry->name);
})->sortBy(function ($industry) {
return $industry->name;
})->values();
- $data['countries'] = Cache::get('countries')->each(function ($country) {
+ /** @var \Illuminate\Support\Collection<\App\Models\Country> */
+ $countries = app('countries');
+
+ $data['countries'] = $countries->each(function ($country) {
$country->name = ctrans('texts.country_'.$country->name);
})->sortBy(function ($country) {
return $country->name;
})->values();
- $data['payment_types'] = Cache::get('payment_types')->each(function ($pType) {
+
+ /** @var \Illuminate\Support\Collection<\App\Models\PaymentType> */
+ $payment_types = app('payment_types');
+
+ $data['payment_types'] = $payment_types->each(function ($pType) {
$pType->name = ctrans('texts.payment_type_'.$pType->name);
})->sortBy(function ($pType) {
return $pType->name;
})->values();
- $data['languages'] = Cache::get('languages')->each(function ($lang) {
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Language> */
+ $payment_types = app('languages');
+
+ $data['languages'] = $payment_types->each(function ($lang) {
$lang->name = ctrans('texts.lang_'.$lang->name);
})->sortBy(function ($lang) {
return $lang->name;
})->values();
- $data['currencies'] = Cache::get('currencies')->each(function ($currency) {
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
+ $currencies = app('currencies');
+
+ $data['currencies'] = $currencies->each(function ($currency) {
$currency->name = ctrans('texts.currency_'.Str::slug($currency->name, '_'));
})->sortBy(function ($currency) {
return $currency->name;
})->values();
- $data['templates'] = Cache::get('templates');
+ $data['templates'] = app('templates');
}
$data['bulk_updates'] = [
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index ba3ad307e8af..3b697e203c25 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -240,8 +240,10 @@ class TemplateEngine
} else {
$data['signature'] = $this->settings->email_signature;
$data['settings'] = $this->settings;
- $data['whitelabel'] = $this->entity_obj ? $this->entity_obj->company->account->isPaid() : true;
- $data['company'] = $this->entity_obj ? $this->entity_obj->company : '';
+ // $data['whitelabel'] = $this->entity_obj ? $this->entity_obj->company->account->isPaid() : true;
+ // $data['company'] = $this->entity_obj ? $this->entity_obj->company : '';
+ $data['whitelabel'] = $this->entity_obj->company->account->isPaid();
+ $data['company'] = $this->entity_obj->company;
$data['settings'] = $this->settings;
}
diff --git a/app/Utils/Traits/CleanLineItems.php b/app/Utils/Traits/CleanLineItems.php
index 9cd45a73f576..e82623bd3f0a 100644
--- a/app/Utils/Traits/CleanLineItems.php
+++ b/app/Utils/Traits/CleanLineItems.php
@@ -110,8 +110,6 @@ trait CleanLineItems
$total += ($item['cost'] * $item['quantity']);
}
- nlog($total);
-
return $total;
}
}
diff --git a/app/Utils/TranslationHelper.php b/app/Utils/TranslationHelper.php
index 71ebec95f9e4..19793aad897f 100644
--- a/app/Utils/TranslationHelper.php
+++ b/app/Utils/TranslationHelper.php
@@ -19,7 +19,11 @@ class TranslationHelper
{
public static function getIndustries()
{
- return Cache::get('industries')->each(function ($industry) {
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
+ $industries = app('industries');
+
+ return $industries->each(function ($industry) {
$industry->name = ctrans('texts.industry_'.$industry->name);
})->sortBy(function ($industry) {
return $industry->name;
@@ -28,7 +32,11 @@ class TranslationHelper
public static function getCountries()
{
- return Cache::get('countries')->each(function ($country) {
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Country> */
+ $countries = app('countries');
+
+ return $countries->each(function ($country) {
$country->name = ctrans('texts.country_'.$country->name);
})->sortBy(function ($country) {
return $country->iso_3166_2;
@@ -37,7 +45,11 @@ class TranslationHelper
public static function getPaymentTypes()
{
- return Cache::get('payment_types')->each(function ($pType) {
+
+ /** @var \Illuminate\Support\Collection<\App\Models\PaymentType> */
+ $payment_types = app('payment_types');
+
+ return $payment_types->each(function ($pType) {
$pType->name = ctrans('texts.payment_type_'.$pType->name);
})->sortBy(function ($pType) {
return $pType->name;
@@ -46,7 +58,11 @@ class TranslationHelper
public static function getLanguages()
{
- return Cache::get('languages')->each(function ($lang) {
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Language> */
+ $languages = app('languages');
+
+ return $languages->each(function ($lang) {
$lang->name = ctrans('texts.lang_'.$lang->name);
})->sortBy(function ($lang) {
return $lang->name;
@@ -55,7 +71,11 @@ class TranslationHelper
public static function getCurrencies()
{
- return Cache::get('currencies')->each(function ($currency) {
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Currency> */
+ $currencies = app('currencies');
+
+ return $currencies->each(function ($currency) {
$currency->name = ctrans('texts.currency_'.Str::slug($currency->name, '_'));
})->sortBy(function ($currency) {
return $currency->name;
diff --git a/app/Utils/VendorHtmlEngine.php b/app/Utils/VendorHtmlEngine.php
index 1d8939617831..1b2b435df2c2 100644
--- a/app/Utils/VendorHtmlEngine.php
+++ b/app/Utils/VendorHtmlEngine.php
@@ -567,27 +567,15 @@ class VendorHtmlEngine
private function getCountryName(): string
{
- $countries = Cache::get('countries');
+
+ /** @var \Illuminate\Support\Collection<\App\Models\Country> */
+ $countries = app('countries');
- if (! $countries) {
- $this->buildCache(true);
-
- $countries = Cache::get('countries');
- }
-
- if ($countries) {
- $country = $countries->filter(function ($item) {
- return $item->id == $this->settings->country_id;
- })->first();
- } else {
- $country = Country::find($this->settings->country_id);
- }
-
- if ($country) {
- return ctrans('texts.country_' . $country->name);
- }
-
- return ' ';
+ $country = $countries->first(function ($item) {
+ return $item->id == $this->settings->country_id;
+ });
+
+ return $country ? ctrans('texts.country_' . $country->name) : ' ';
}
diff --git a/composer.lock b/composer.lock
index 0d5f7c627536..21c4bbab2596 100644
--- a/composer.lock
+++ b/composer.lock
@@ -1385,16 +1385,16 @@
},
{
"name": "aws/aws-sdk-php",
- "version": "3.314.1",
+ "version": "3.314.2",
"source": {
"type": "git",
"url": "https://github.com/aws/aws-sdk-php.git",
- "reference": "85207a1f342443f40711ac8fe246120821370f11"
+ "reference": "1f5ccf9c73a66fb85c7c5de8f11ed69e44c636ef"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/85207a1f342443f40711ac8fe246120821370f11",
- "reference": "85207a1f342443f40711ac8fe246120821370f11",
+ "url": "https://api.github.com/repos/aws/aws-sdk-php/zipball/1f5ccf9c73a66fb85c7c5de8f11ed69e44c636ef",
+ "reference": "1f5ccf9c73a66fb85c7c5de8f11ed69e44c636ef",
"shasum": ""
},
"require": {
@@ -1474,9 +1474,9 @@
"support": {
"forum": "https://forums.aws.amazon.com/forum.jspa?forumID=80",
"issues": "https://github.com/aws/aws-sdk-php/issues",
- "source": "https://github.com/aws/aws-sdk-php/tree/3.314.1"
+ "source": "https://github.com/aws/aws-sdk-php/tree/3.314.2"
},
- "time": "2024-06-13T18:07:00+00:00"
+ "time": "2024-06-14T18:11:34+00:00"
},
{
"name": "bacon/bacon-qr-code",
@@ -3602,16 +3602,16 @@
},
{
"name": "google/apiclient-services",
- "version": "v0.359.0",
+ "version": "v0.360.0",
"source": {
"type": "git",
"url": "https://github.com/googleapis/google-api-php-client-services.git",
- "reference": "e975e6d0efa47f7e49280c4ea7fd6a93b6d7e338"
+ "reference": "e48813050e660c7dcbe48cb6556461efe6381a54"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/e975e6d0efa47f7e49280c4ea7fd6a93b6d7e338",
- "reference": "e975e6d0efa47f7e49280c4ea7fd6a93b6d7e338",
+ "url": "https://api.github.com/repos/googleapis/google-api-php-client-services/zipball/e48813050e660c7dcbe48cb6556461efe6381a54",
+ "reference": "e48813050e660c7dcbe48cb6556461efe6381a54",
"shasum": ""
},
"require": {
@@ -3640,9 +3640,9 @@
],
"support": {
"issues": "https://github.com/googleapis/google-api-php-client-services/issues",
- "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.359.0"
+ "source": "https://github.com/googleapis/google-api-php-client-services/tree/v0.360.0"
},
- "time": "2024-06-10T01:02:17+00:00"
+ "time": "2024-06-17T01:06:20+00:00"
},
{
"name": "google/auth",
@@ -4630,16 +4630,16 @@
},
{
"name": "horstoeko/zugferd",
- "version": "v1.0.54",
+ "version": "v1.0.56",
"source": {
"type": "git",
"url": "https://github.com/horstoeko/zugferd.git",
- "reference": "91547c8aee9d8da22568b90d7cedfaba15373ebe"
+ "reference": "ae34e6450d125850c5c001100b459d46e9b37150"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/horstoeko/zugferd/zipball/91547c8aee9d8da22568b90d7cedfaba15373ebe",
- "reference": "91547c8aee9d8da22568b90d7cedfaba15373ebe",
+ "url": "https://api.github.com/repos/horstoeko/zugferd/zipball/ae34e6450d125850c5c001100b459d46e9b37150",
+ "reference": "ae34e6450d125850c5c001100b459d46e9b37150",
"shasum": ""
},
"require": {
@@ -4699,9 +4699,9 @@
],
"support": {
"issues": "https://github.com/horstoeko/zugferd/issues",
- "source": "https://github.com/horstoeko/zugferd/tree/v1.0.54"
+ "source": "https://github.com/horstoeko/zugferd/tree/v1.0.56"
},
- "time": "2024-06-07T07:47:18+00:00"
+ "time": "2024-06-15T05:49:47+00:00"
},
{
"name": "http-interop/http-factory-guzzle",
@@ -5472,16 +5472,16 @@
},
{
"name": "josemmo/facturae-php",
- "version": "v1.8.0",
+ "version": "v1.8.1",
"source": {
"type": "git",
"url": "https://github.com/josemmo/Facturae-PHP.git",
- "reference": "102edbb00b883d41da7306abf78a1695f7df406c"
+ "reference": "c7f01f5d00a82bcaa1bdb9cfe7029cc7d8296fc4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/josemmo/Facturae-PHP/zipball/102edbb00b883d41da7306abf78a1695f7df406c",
- "reference": "102edbb00b883d41da7306abf78a1695f7df406c",
+ "url": "https://api.github.com/repos/josemmo/Facturae-PHP/zipball/c7f01f5d00a82bcaa1bdb9cfe7029cc7d8296fc4",
+ "reference": "c7f01f5d00a82bcaa1bdb9cfe7029cc7d8296fc4",
"shasum": ""
},
"require": {
@@ -5523,9 +5523,9 @@
],
"support": {
"issues": "https://github.com/josemmo/Facturae-PHP/issues",
- "source": "https://github.com/josemmo/Facturae-PHP/tree/v1.8.0"
+ "source": "https://github.com/josemmo/Facturae-PHP/tree/v1.8.1"
},
- "time": "2024-05-11T18:17:09+00:00"
+ "time": "2024-06-16T10:13:36+00:00"
},
{
"name": "kelunik/certificate",
@@ -17354,16 +17354,16 @@
},
{
"name": "friendsofphp/php-cs-fixer",
- "version": "v3.58.1",
+ "version": "v3.59.3",
"source": {
"type": "git",
"url": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer.git",
- "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff"
+ "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/04e9424025677a86914b9a4944dbbf4060bb0aff",
- "reference": "04e9424025677a86914b9a4944dbbf4060bb0aff",
+ "url": "https://api.github.com/repos/PHP-CS-Fixer/PHP-CS-Fixer/zipball/30ba9ecc2b0e5205e578fe29973c15653d9bfd29",
+ "reference": "30ba9ecc2b0e5205e578fe29973c15653d9bfd29",
"shasum": ""
},
"require": {
@@ -17393,16 +17393,16 @@
"symfony/stopwatch": "^5.4 || ^6.0 || ^7.0"
},
"require-dev": {
- "facile-it/paraunit": "^1.3 || ^2.0",
- "infection/infection": "^0.27.11",
+ "facile-it/paraunit": "^1.3 || ^2.3",
+ "infection/infection": "^0.29.5",
"justinrainbow/json-schema": "^5.2",
"keradus/cli-executor": "^2.1",
"mikey179/vfsstream": "^1.6.11",
"php-coveralls/php-coveralls": "^2.7",
"php-cs-fixer/accessible-object": "^1.1",
- "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.4",
- "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.4",
- "phpunit/phpunit": "^9.6 || ^10.5.5 || ^11.0.2",
+ "php-cs-fixer/phpunit-constraint-isidenticalstring": "^1.5",
+ "php-cs-fixer/phpunit-constraint-xmlmatchesxsd": "^1.5",
+ "phpunit/phpunit": "^9.6.19 || ^10.5.21 || ^11.2",
"symfony/var-dumper": "^5.4 || ^6.0 || ^7.0",
"symfony/yaml": "^5.4 || ^6.0 || ^7.0"
},
@@ -17417,7 +17417,10 @@
"autoload": {
"psr-4": {
"PhpCsFixer\\": "src/"
- }
+ },
+ "exclude-from-classmap": [
+ "src/Fixer/Internal/*"
+ ]
},
"notification-url": "https://packagist.org/downloads/",
"license": [
@@ -17442,7 +17445,7 @@
],
"support": {
"issues": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/issues",
- "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.58.1"
+ "source": "https://github.com/PHP-CS-Fixer/PHP-CS-Fixer/tree/v3.59.3"
},
"funding": [
{
@@ -17450,7 +17453,7 @@
"type": "github"
}
],
- "time": "2024-05-29T16:39:07+00:00"
+ "time": "2024-06-16T14:17:03+00:00"
},
{
"name": "hamcrest/hamcrest-php",
@@ -18558,16 +18561,16 @@
},
{
"name": "phpunit/phpunit",
- "version": "10.5.20",
+ "version": "10.5.21",
"source": {
"type": "git",
"url": "https://github.com/sebastianbergmann/phpunit.git",
- "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3"
+ "reference": "ac837816fa52078f7a5e17ed774f256a72a51af6"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/547d314dc24ec1e177720d45c6263fb226cc2ae3",
- "reference": "547d314dc24ec1e177720d45c6263fb226cc2ae3",
+ "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/ac837816fa52078f7a5e17ed774f256a72a51af6",
+ "reference": "ac837816fa52078f7a5e17ed774f256a72a51af6",
"shasum": ""
},
"require": {
@@ -18639,7 +18642,7 @@
"support": {
"issues": "https://github.com/sebastianbergmann/phpunit/issues",
"security": "https://github.com/sebastianbergmann/phpunit/security/policy",
- "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.20"
+ "source": "https://github.com/sebastianbergmann/phpunit/tree/10.5.21"
},
"funding": [
{
@@ -18655,7 +18658,7 @@
"type": "tidelift"
}
],
- "time": "2024-04-24T06:32:35+00:00"
+ "time": "2024-06-15T09:13:15+00:00"
},
{
"name": "react/cache",
@@ -20752,5 +20755,5 @@
"platform-dev": {
"php": "^8.2"
},
- "plugin-api-version": "2.6.0"
+ "plugin-api-version": "2.3.0"
}
diff --git a/lang/en/texts.php b/lang/en/texts.php
index b2aeb1a1aed6..758575e06cdf 100644
--- a/lang/en/texts.php
+++ b/lang/en/texts.php
@@ -2934,13 +2934,6 @@ $lang = array(
'mime_types' => 'Mime types',
'mime_types_placeholder' => '.pdf , .docx, .jpg',
'mime_types_help' => 'Comma separated list of allowed mime types, leave blank for all',
- 'ticket_number_start_help' => 'Ticket number must be greater than the current ticket number',
- 'new_ticket_template_id' => 'New ticket',
- 'new_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a new ticket is created',
- 'update_ticket_template_id' => 'Updated ticket',
- 'update_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is updated',
- 'close_ticket_template_id' => 'Closed ticket',
- 'close_ticket_autoresponder_help' => 'Selecting a template will send an auto response to a client/contact when a ticket is closed',
'default_priority' => 'Default priority',
'alert_new_comment_id' => 'New comment',
'alert_comment_ticket_help' => 'Selecting a template will send a notification (to agent) when a comment is made.',
@@ -2957,8 +2950,6 @@ $lang = array(
'alert_ticket_overdue_email' => 'Additional overdue ticket notifications',
'alert_ticket_overdue_email_help' => 'Comma separated emails to bcc on ticket overdue.',
'alert_ticket_overdue_agent_id_help' => 'Selecting a template will send a notification (to agent) when a ticket becomes overdue.',
- 'ticket_master' => 'Ticket Master',
- 'ticket_master_help' => 'Has the ability to assign and transfer tickets. Assigned as the default agent for all tickets.',
'default_agent' => 'Default Agent',
'default_agent_help' => 'If selected will automatically be assigned to all inbound tickets',
'show_agent_details' => 'Show agent details on responses',
@@ -2966,43 +2957,19 @@ $lang = array(
'remove_avatar' => 'Remove avatar',
'ticket_not_found' => 'Ticket not found',
'add_template' => 'Add Template',
- 'ticket_template' => 'Ticket Template',
- 'ticket_templates' => 'Ticket Templates',
'updated_ticket_template' => 'Updated Ticket Template',
'created_ticket_template' => 'Created Ticket Template',
'archive_ticket_template' => 'Archive Template',
'restore_ticket_template' => 'Restore Template',
'archived_ticket_template' => 'Successfully archived template',
'restored_ticket_template' => 'Successfully restored template',
- 'close_reason' => 'Let us know why you are closing this ticket',
- 'reopen_reason' => 'Let us know why you are reopening this ticket',
'enter_ticket_message' => 'Please enter a message to update the ticket',
'show_hide_all' => 'Show / Hide all',
'subject_required' => 'Subject required',
'mobile_refresh_warning' => 'If you\'re using the mobile app you may need to do a full refresh.',
- 'enable_proposals_for_background' => 'To upload a background image :link to enable the proposals module.',
- 'ticket_assignment' => 'Ticket :ticket_number has been assigned to :agent',
- 'ticket_contact_reply' => 'Ticket :ticket_number has been updated by client :contact',
- 'ticket_new_template_subject' => 'Ticket :ticket_number has been created.',
- 'ticket_updated_template_subject' => 'Ticket :ticket_number has been updated.',
- 'ticket_closed_template_subject' => 'Ticket :ticket_number has been closed.',
- 'ticket_overdue_template_subject' => 'Ticket :ticket_number is now overdue',
'merge' => 'Merge',
'merged' => 'Merged',
'agent' => 'Agent',
- 'parent_ticket' => 'Parent Ticket',
- 'linked_tickets' => 'Linked Tickets',
- 'merge_prompt' => 'Enter ticket number to merge into',
- 'merge_from_to' => 'Ticket #:old_ticket merged into Ticket #:new_ticket',
- 'merge_closed_ticket_text' => 'Ticket #:old_ticket was closed and merged into Ticket#:new_ticket - :subject',
- 'merge_updated_ticket_text' => 'Ticket #:old_ticket was closed and merged into this ticket',
- 'merge_placeholder' => 'Merge ticket #:ticket into the following ticket',
- 'select_ticket' => 'Select Ticket',
- 'new_internal_ticket' => 'New internal ticket',
- 'internal_ticket' => 'Internal ticket',
- 'create_ticket' => 'Create ticket',
- 'allow_inbound_email_tickets_external' => 'New Tickets by email (Client)',
- 'allow_inbound_email_tickets_external_help' => 'Allow clients to create new tickets by email',
'include_in_filter' => 'Include in filter',
'custom_client1' => ':VALUE',
'custom_client2' => ':VALUE',
@@ -5335,7 +5302,7 @@ $lang = array(
'currency_mauritanian_ouguiya' => 'Mauritanian Ouguiya',
'currency_bhutan_ngultrum' => 'Bhutan Ngultrum',
'end_of_month' => 'End Of Month',
- 'merge_e_invoice_to_pdf' => 'Merge E-Invoice to PDF',
+ 'merge_e_invoice_to_pdf' => 'Merge E-Invoice and PDF',
);
return $lang;
\ No newline at end of file
diff --git a/phpstan.neon b/phpstan.neon
index 5c586c4bb520..718f0385499c 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -3,7 +3,7 @@ includes:
- ./vendor/spaze/phpstan-stripe/extension.neon
- phpstan-baseline.neon
parameters:
- level: 3
+ level: 4
paths:
- app
excludePaths:
diff --git a/resources/views/portal/ninja2020/gateways/paypal/ppcp/card.blade.php b/resources/views/portal/ninja2020/gateways/paypal/ppcp/card.blade.php
index b90ae91f753a..b740e554157a 100644
--- a/resources/views/portal/ninja2020/gateways/paypal/ppcp/card.blade.php
+++ b/resources/views/portal/ninja2020/gateways/paypal/ppcp/card.blade.php
@@ -14,7 +14,10 @@
@endphp
@section('gateway_head')
-
+
@endsection
@section('gateway_content')
@@ -85,7 +88,7 @@
@if(isset($merchantId))
-
+
@else
@endif
diff --git a/resources/views/portal/ninja2020/gateways/stripe/acss/authorize.blade.php b/resources/views/portal/ninja2020/gateways/stripe/acss/authorize.blade.php
index ee9b21d32f0b..5199d8d8427f 100644
--- a/resources/views/portal/ninja2020/gateways/stripe/acss/authorize.blade.php
+++ b/resources/views/portal/ninja2020/gateways/stripe/acss/authorize.blade.php
@@ -34,7 +34,7 @@
You have certain recourse rights if any debit does not comply with this agreement. For example, you have the right to receive reimbursement for any debit that is not authorized or is not consistent with this PAD Agreement. To obtain more information on your recourse rights, contact your financial institution.
- You may amend or cancel this authorization at any time by providing the merchant with thirty (30) days notice at {{ $company->present()->email() }}. To obtain a sample cancellation form, or further information on cancelling a PAD agreement, please contact your financial institution.
+ You may amend or cancel this authorization at any time by providing the merchant with thirty (30) days notice at {{ $company->owner()->email }}. To obtain a sample cancellation form, or further information on cancelling a PAD agreement, please contact your financial institution.
{{ $company->present()->name() }} partners with Stripe to provide payment processing.
diff --git a/tests/Feature/CreditTest.php b/tests/Feature/CreditTest.php
index 28aba2164bda..40e4409e08f0 100644
--- a/tests/Feature/CreditTest.php
+++ b/tests/Feature/CreditTest.php
@@ -43,6 +43,102 @@ class CreditTest extends TestCase
$this->makeTestData();
}
+ public function testPaidToDateAdjustments()
+ {
+
+ $c = Client::factory()->create([
+ 'company_id' => $this->company->id,
+ 'user_id' => $this->user->id,
+ 'balance' => 0,
+ ]);
+
+ $ii = new InvoiceItem();
+ $ii->cost = 100;
+ $ii->quantity = 1;
+ $ii->product_key = 'xx';
+ $ii->notes = 'yy';
+
+ $i = \App\Models\Invoice::factory()->create([
+ 'company_id' => $this->company->id,
+ 'user_id' => $this->user->id,
+ 'client_id' => $c->id,
+ 'tax_name1' => '',
+ 'tax_name2' => '',
+ 'tax_name3' => '',
+ 'tax_rate1' => 0,
+ 'tax_rate2' => 0,
+ 'tax_rate3' => 0,
+ 'discount' => 0,
+ 'line_items' => [
+ $ii
+ ],
+ 'status_id' => 1,
+ ]);
+
+ $i = $i->calc()->getInvoice();
+
+ $this->assertEquals(0, $i->balance);
+ $this->assertEquals(100, $i->amount);
+
+ $i->service()->markSent()->save();
+
+ $this->assertEquals(100, $i->balance);
+
+ $i->service()->markPaid()->save();
+ $i = $i->fresh();
+ $c = $c->fresh();
+
+ $this->assertEquals(0, $i->balance);
+ $this->assertEquals(0, $c->balance);
+
+ $this->assertEquals(100, $c->paid_to_date);
+
+ $i->service()->handleReversal()->save();
+
+
+ $data = $i->toArray();
+ $data['invoice_id'] = $i->hashed_id;
+ $data['user_id'] = $this->encodePrimaryKey($i->user_id);
+ $data['client_id'] = $this->encodePrimaryKey($i->client_id);
+ $data['status_id'] = 1;
+
+ $response = $this->withHeaders([
+ 'X-API-SECRET' => config('ninja.api_secret'),
+ 'X-API-TOKEN' => $this->token,
+ ])->postJson("/api/v1/credits?mark_sent=true", $data);
+
+ $response->assertStatus(200);
+ $arr = $response->json();
+
+ $cr_id = $arr['data']['id'];
+
+ $i = $i->fresh();
+ $c = $c->fresh();
+
+ $credit = $i->credits()->first();
+
+ $this->assertNotNull($credit);
+
+ $this->assertEquals(0, $i->balance);
+ $this->assertEquals(100, $c->credit_balance);
+ $this->assertEquals(0, $c->paid_to_date);
+
+ $credit->service()->deleteCredit()->save();
+
+ $c = $c->fresh();
+
+ $this->assertEquals(100, $c->paid_to_date);
+ $this->assertEquals(0, $c->credit_balance);
+
+ $credit->service()->restoreCredit()->save();
+
+ $c = $c->fresh();
+
+ $this->assertEquals(0, $c->paid_to_date);
+ $this->assertEquals(100, $c->credit_balance);
+
+ }
+
public function testCreditPaymentsPaidToDates()
{
$c = Client::factory()->create([
diff --git a/tests/Feature/MultiPaymentDeleteTest.php b/tests/Feature/MultiPaymentDeleteTest.php
index 72c5e3640ac6..1b73e583495e 100644
--- a/tests/Feature/MultiPaymentDeleteTest.php
+++ b/tests/Feature/MultiPaymentDeleteTest.php
@@ -166,6 +166,7 @@ class MultiPaymentDeleteTest extends TestCase
],
],
'date' => '2019/12/12',
+ 'idempotency_key' => md5(time()),
];
$response = $this->withHeaders([
@@ -219,6 +220,7 @@ class MultiPaymentDeleteTest extends TestCase
$this->assertEquals(162, $invoice->client->fresh()->balance);
$this->assertEquals(163, $invoice->client->fresh()->paid_to_date);
+ sleep(1);
// Pay 162 again and create payment #3
$data = [
@@ -232,6 +234,7 @@ class MultiPaymentDeleteTest extends TestCase
],
],
'date' => '2019/12/12',
+ 'idempotency_key' => md5(time()),
];
$response = $this->withHeaders([
diff --git a/tests/Feature/PaymentTest.php b/tests/Feature/PaymentTest.php
index cf5816191f4d..696bf0b937e2 100644
--- a/tests/Feature/PaymentTest.php
+++ b/tests/Feature/PaymentTest.php
@@ -62,6 +62,38 @@ class PaymentTest extends TestCase
);
}
+ public function testIdempotencyTrigger()
+ {
+
+ $data = [
+ 'amount' => 5,
+ 'client_id' => $this->client->hashed_id,
+ 'invoices' => [
+ [
+ 'invoice_id' => $this->invoice->hashed_id,
+ 'amount' => 5,
+ ],
+ ],
+ 'date' => '2020/12/11',
+ ];
+
+ $response = $this->withHeaders([
+ 'X-API-SECRET' => config('ninja.api_secret'),
+ 'X-API-TOKEN' => $this->token,
+ ])->postJson('/api/v1/payments/', $data);
+
+ $response->assertStatus(200);
+
+ $response = $this->withHeaders([
+ 'X-API-SECRET' => config('ninja.api_secret'),
+ 'X-API-TOKEN' => $this->token,
+ ])->postJson('/api/v1/payments/', $data);
+
+ $response->assertStatus(422);
+
+ }
+
+
public function testInvoicesValidationProp()
{