Partially Refunded<\/span><\/h6>","amount":"$10,986.26","applied":"$10,986.26","balance":"-$146.26","refunded":"$146.26","amount_raw":"10986.260000","applied_raw":"10986.260000","refunded_raw":"146.260000","balance_raw":-146.26000000000022,"date":"30\/Sep\/2023","method":"UnionPay","currency":"USD","exchange_rate":1,"transaction_reference":"Manual entry","is_manual":1,"number":"0007","custom_value1":"","custom_value2":"","custom_value3":"","custom_value4":"","client":{"name":"Jakubowski Group","balance":"28296.170000","payment_balance":"0.000000","credit_balance":"1084.840000"},"paymentables":[{"invoice":"0025","amount_raw":"10986.2600","refunded_raw":"146.2600","net_raw":10840,"amount":"$10,986.26","refunded":"$146.26","net":"$10,840.00","is_credit":false,"created_at":"01\/Oct\/2023","updated_at":"01\/Oct\/2023","timestamp":1696150843}]}],"total_tax_map":[{"name":"CA Sales Tax 5%","total":"$141.90","total_raw":141.9}],"line_tax_map":[{"name":"CA Sales Tax 5%","total":"$141.90","total_raw":141.9}]}]';
public string $quote_data = '[{"id":1,"client_id":1,"user_id":1,"assigned_user_id":null,"company_id":1,"status_id":2,"project_id":null,"vendor_id":null,"recurring_id":null,"design_id":2,"invoice_id":null,"number":"0001","discount":1,"is_amount_discount":false,"po_number":"Molestias.","date":"1986-08-02","last_sent_date":null,"due_date":null,"next_send_date":null,"is_deleted":false,"line_items":[{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":false,"tax_name1":"VAT","tax_rate1":17.5,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":"637.00","gross_line_total":747.36,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":110.36,"date":"","tax_id":"","task_id":"","expense_id":""},{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":false,"tax_name1":"GST","tax_rate1":10,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":"637.00","gross_line_total":700.06,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":63.06,"date":"","tax_id":"","task_id":"","expense_id":""},{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":false,"tax_name1":"","tax_rate1":0,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":"637.00","gross_line_total":637,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":0,"date":"","tax_id":"","task_id":"","expense_id":""},{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":false,"tax_name1":"GST","tax_rate1":10,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":"637.00","gross_line_total":700.06,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":63.06,"date":"","tax_id":"","task_id":"","expense_id":""},{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":false,"tax_name1":"Sales Tax","tax_rate1":5,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":"637.00","gross_line_total":668.53,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":31.53,"date":"","tax_id":"","task_id":"","expense_id":""},{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":false,"tax_name1":"GST","tax_rate1":10,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":"637.00","gross_line_total":700.06,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":63.06,"date":"","tax_id":"","task_id":"","expense_id":""},{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":false,"tax_name1":"Sales Tax","tax_rate1":5,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":"637.00","gross_line_total":668.53,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":31.53,"date":"","tax_id":"","task_id":"","expense_id":""}],"backup":null,"footer":null,"public_notes":null,"private_notes":null,"terms":null,"tax_name1":"GST","tax_rate1":"10.000000","tax_name2":"VAT","tax_rate2":"17.500000","tax_name3":"THIRDTAX","tax_rate3":"5.000000","total_taxes":"1797.280000","uses_inclusive_taxes":0,"custom_value1":null,"custom_value2":null,"custom_value3":null,"custom_value4":null,"custom_surcharge1":null,"custom_surcharge2":null,"custom_surcharge3":null,"custom_surcharge4":null,"custom_surcharge_tax1":0,"custom_surcharge_tax2":0,"custom_surcharge_tax3":0,"custom_surcharge_tax4":0,"exchange_rate":"1.000000","amount":"6211.690000","balance":"0.000000","partial":null,"partial_due_date":null,"last_viewed":null,"created_at":1695943654,"updated_at":1695943658,"deleted_at":null,"reminder1_sent":null,"reminder2_sent":null,"reminder3_sent":null,"reminder_last_sent":null,"paid_to_date":"0.000000","subscription_id":null,"hashed_id":"VolejRejNm"},{"id":2,"client_id":1,"user_id":1,"assigned_user_id":null,"company_id":1,"status_id":2,"project_id":null,"vendor_id":null,"recurring_id":null,"design_id":2,"invoice_id":null,"number":"0002","discount":9,"is_amount_discount":true,"po_number":"Omnis.","date":"1988-11-22","last_sent_date":null,"due_date":null,"next_send_date":null,"is_deleted":false,"line_items":[{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":true,"tax_name1":"VAT","tax_rate1":17.5,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":637,"gross_line_total":738.44,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":101.44,"date":"","tax_id":"","task_id":"","expense_id":""},{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":true,"tax_name1":"Sales Tax","tax_rate1":5,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":637,"gross_line_total":665.98,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":28.98,"date":"","tax_id":"","task_id":"","expense_id":""},{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":true,"tax_name1":"Sales Tax","tax_rate1":5,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":637,"gross_line_total":665.98,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":28.98,"date":"","tax_id":"","task_id":"","expense_id":""},{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":true,"tax_name1":"GST","tax_rate1":10,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":637,"gross_line_total":694.97,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":57.97,"date":"","tax_id":"","task_id":"","expense_id":""},{"quantity":1,"cost":637,"product_key":"Nisi.","notes":"Ut ipsa rerum.","discount":0,"is_amount_discount":true,"tax_name1":"VAT","tax_rate1":17.5,"tax_name2":"","tax_rate2":0,"tax_name3":"","tax_rate3":0,"sort_id":0,"line_total":637,"gross_line_total":738.44,"custom_value1":"https:\/\/picsum.photos\/200","custom_value2":"42","custom_value3":"Maxime dolores.","custom_value4":"Odio consequatur.","type_id":"1","product_cost":0,"tax_amount":101.44,"date":"","tax_id":"","task_id":"","expense_id":""}],"backup":null,"footer":null,"public_notes":null,"private_notes":null,"terms":null,"tax_name1":"GST","tax_rate1":"10.000000","tax_name2":"VAT","tax_rate2":"17.500000","tax_name3":"THIRDTAX","tax_rate3":"5.000000","total_taxes":"1381.560000","uses_inclusive_taxes":0,"custom_value1":null,"custom_value2":null,"custom_value3":null,"custom_value4":null,"custom_surcharge1":null,"custom_surcharge2":null,"custom_surcharge3":null,"custom_surcharge4":null,"custom_surcharge_tax1":0,"custom_surcharge_tax2":0,"custom_surcharge_tax3":0,"custom_surcharge_tax4":0,"exchange_rate":"1.000000","amount":"4557.560000","balance":"0.000000","partial":null,"partial_due_date":null,"last_viewed":null,"created_at":1695943654,"updated_at":1696118643,"deleted_at":null,"reminder1_sent":null,"reminder2_sent":null,"reminder3_sent":null,"reminder_last_sent":null,"paid_to_date":"0.000000","subscription_id":null,"hashed_id":"Wpmbk5ezJn"}]';
-
+
public function __construct(public Company $company)
{
}
-
+
public function init(): self
{
@@ -56,12 +55,12 @@ class TemplateMock
$this->engines['projects'] = json_decode($this->project_data, true);
$this->engines['payments'] = json_decode($this->payment_data, true);
$this->engines['purchase_orders'] = json_decode($this->purchase_order_data, true);
-
+
// nlog("engines");
// nlog($this->engines);
return $this;
-
+
}
/**
diff --git a/app/Services/Template/TemplateService.php b/app/Services/Template/TemplateService.php
index 90e4169d6ef6..6cab89f1b4bb 100644
--- a/app/Services/Template/TemplateService.php
+++ b/app/Services/Template/TemplateService.php
@@ -115,7 +115,7 @@ class TemplateService
if(!is_array($array)) {
return 0;
}
-
+
return array_sum(array_column($array, $column));
});
@@ -163,7 +163,7 @@ class TemplateService
foreach($this->global_vars as $key => $value) {
$this->twig->addGlobal($key, $value);
}
-
+
$this->global_vars = [];
return $this;
@@ -193,7 +193,7 @@ class TemplateService
public function addGlobal(array $var): self
{
$this->global_vars = array_merge($this->global_vars, $var);
-
+
return $this;
}
@@ -441,7 +441,7 @@ class TemplateService
// nlog($key);
// nlog($processed);
-
+
return $processed;
})->toArray();
@@ -683,7 +683,7 @@ class TemplateService
'paymentables' => $pivot,
'refund_activity' => $this->getPaymentRefundActivity($payment),
];
-
+
return $data;
}
@@ -743,7 +743,7 @@ class TemplateService
*/
public function processQuotes($quotes): array
{
-
+
return collect($quotes)->map(function ($quote) {
return [
@@ -757,7 +757,7 @@ class TemplateService
'credit_balance' => $quote->client->credit_balance,
'vat_number' => $quote->client->vat_number ?? '',
],
- 'status_id' =>$quote->status_id,
+ 'status_id' => $quote->status_id,
'status' => Quote::stringStatus($quote->status_id),
'number' => $quote->number ?: '',
'discount' => (float) $quote->discount,
@@ -975,7 +975,7 @@ class TemplateService
private function transformProject(Project $project, bool $nested = false): array
{
-
+
return [
'name' => $project->name ?: '',
'number' => $project->number ?: '',
@@ -993,7 +993,7 @@ class TemplateService
'custom_value4' => (string) $project->custom_value4 ?: '',
'color' => (string) $project->color ?: '',
'current_hours' => (int) $project->current_hours ?: 0,
- 'tasks' => ($project->tasks && !$nested) ? $this->processTasks($project->tasks, true) : [],
+ 'tasks' => ($project->tasks && !$nested) ? $this->processTasks($project->tasks, true) : [],
'client' => $project->client ? [
'name' => $project->client->present()->name(),
'balance' => $project->client->balance,
@@ -1058,7 +1058,7 @@ class TemplateService
'is_amount_discount' => (bool)($purchase_order->is_amount_discount ?: false),
'footer' => $purchase_order->footer ?: '',
'partial' => (float)($purchase_order->partial ?: 0.0),
- 'partial_due_date' => $purchase_order->partial_due_date ? $this->translateDate($purchase_order->partial_due_date, $purchase_order->vendor->date_format(), $purchase_order->vendor->locale()): '',
+ 'partial_due_date' => $purchase_order->partial_due_date ? $this->translateDate($purchase_order->partial_due_date, $purchase_order->vendor->date_format(), $purchase_order->vendor->locale()) : '',
'custom_value1' => (string)$purchase_order->custom_value1 ?: '',
'custom_value2' => (string)$purchase_order->custom_value2 ?: '',
'custom_value3' => (string)$purchase_order->custom_value3 ?: '',
@@ -1073,7 +1073,7 @@ class TemplateService
'custom_surcharge_tax2' => (bool)$purchase_order->custom_surcharge_tax2,
'custom_surcharge_tax3' => (bool)$purchase_order->custom_surcharge_tax3,
'custom_surcharge_tax4' => (bool)$purchase_order->custom_surcharge_tax4,
- 'line_items' => $purchase_order->line_items ? $this->padLineItems($purchase_order->line_items, $purchase_order->vendor): (array)[],
+ 'line_items' => $purchase_order->line_items ? $this->padLineItems($purchase_order->line_items, $purchase_order->vendor) : (array)[],
'exchange_rate' => (float)$purchase_order->exchange_rate,
'currency_id' => $purchase_order->currency_id ? (string) $purchase_order->currency_id : '',
];
@@ -1367,7 +1367,7 @@ class TemplateService
$var = str_replace("custom", "custom_value", $_variable);
$hidden_prop = ($data_ref == 'entity_details-') ? $this->entityVariableCheck($variable) : false;
-
+
if (in_array($_variable, $_customs) && !empty($this->entity->{$var})) {
$elements[] = ['element' => 'tr', 'elements' => [
['element' => 'th', 'content' => $variable . '_label', 'properties' => ['data-ref' => $data_ref . substr($variable, 1) . '_label']],
@@ -1532,7 +1532,7 @@ class TemplateService
}
}
-
+
return $this;
}
diff --git a/app/Services/User/UserService.php b/app/Services/User/UserService.php
index 7b6a996c1211..ed51ffc56d47 100644
--- a/app/Services/User/UserService.php
+++ b/app/Services/User/UserService.php
@@ -25,11 +25,11 @@ class UserService
{
}
- public function invite(Company $company, bool $is_react=true)
+ public function invite(Company $company, bool $is_react = true)
{
try {
- $nmo = new NinjaMailerObject;
+ $nmo = new NinjaMailerObject();
$nmo->mailable = new NinjaMailer((new VerifyUserObject($this->user, $company, $is_react))->build());
$nmo->company = $company;
$nmo->to_user = $this->user;
diff --git a/app/Transformers/BankTransactionRuleTransformer.php b/app/Transformers/BankTransactionRuleTransformer.php
index ca3bf7262acd..12eea7e595e8 100644
--- a/app/Transformers/BankTransactionRuleTransformer.php
+++ b/app/Transformers/BankTransactionRuleTransformer.php
@@ -78,7 +78,7 @@ class BankTransactionRuleTransformer extends EntityTransformer
}
$transformer = new ClientTransformer($this->serializer);
-
+
return $this->includeItem($bank_transaction_rule->client, $transformer, Client::class);
}
diff --git a/app/Transformers/ClientContactLoginTransformer.php b/app/Transformers/ClientContactLoginTransformer.php
index ba0062c16863..f73c9b02dc39 100644
--- a/app/Transformers/ClientContactLoginTransformer.php
+++ b/app/Transformers/ClientContactLoginTransformer.php
@@ -43,7 +43,7 @@ class ClientContactLoginTransformer extends EntityTransformer
'custom_value2' => $contact->custom_value2 ?: '',
'custom_value3' => $contact->custom_value3 ?: '',
'custom_value4' => $contact->custom_value4 ?: '',
- 'token'=> $contact->token ?: '',
+ 'token' => $contact->token ?: '',
];
}
}
diff --git a/app/Transformers/ClientGatewayTokenTransformer.php b/app/Transformers/ClientGatewayTokenTransformer.php
index bb839486b36d..be03c39d4030 100644
--- a/app/Transformers/ClientGatewayTokenTransformer.php
+++ b/app/Transformers/ClientGatewayTokenTransformer.php
@@ -46,7 +46,7 @@ class ClientGatewayTokenTransformer extends EntityTransformer
private function typeCastMeta($meta)
{
- $casted = new stdClass;
+ $casted = new stdClass();
if (property_exists($meta, 'exp_month')) {
$casted->exp_month = (string) $meta->exp_month;
diff --git a/app/Transformers/ClientTransformer.php b/app/Transformers/ClientTransformer.php
index 8bbddfa9f257..c1f4ea72010f 100644
--- a/app/Transformers/ClientTransformer.php
+++ b/app/Transformers/ClientTransformer.php
@@ -102,7 +102,7 @@ class ClientTransformer extends EntityTransformer
if (!$client->group_settings) {
return null;
}
-
+
$transformer = new GroupSettingTransformer($this->serializer);
return $this->includeItem($client->group_settings, $transformer, GroupSetting::class);
@@ -150,7 +150,7 @@ class ClientTransformer extends EntityTransformer
'shipping_state' => $client->shipping_state ?: '',
'shipping_postal_code' => $client->shipping_postal_code ?: '',
'shipping_country_id' => (string) $client->shipping_country_id ?: '',
- 'settings' => $client->settings ?: new stdClass,
+ 'settings' => $client->settings ?: new stdClass(),
'is_deleted' => (bool) $client->is_deleted,
'vat_number' => $client->vat_number ?: '',
'id_number' => $client->id_number ?: '',
@@ -162,7 +162,7 @@ class ClientTransformer extends EntityTransformer
'has_valid_vat_number' => (bool) $client->has_valid_vat_number,
'is_tax_exempt' => (bool) $client->is_tax_exempt,
'routing_id' => (string) $client->routing_id,
- 'tax_info' => $client->tax_data ?: new \stdClass,
+ 'tax_info' => $client->tax_data ?: new \stdClass(),
'classification' => $client->classification ?: '',
];
}
diff --git a/app/Transformers/CompanyGatewayTransformer.php b/app/Transformers/CompanyGatewayTransformer.php
index 768e8f903b5f..6fbd9e83e48d 100644
--- a/app/Transformers/CompanyGatewayTransformer.php
+++ b/app/Transformers/CompanyGatewayTransformer.php
@@ -68,7 +68,7 @@ class CompanyGatewayTransformer extends EntityTransformer
'show_shipping_address' => (bool) $company_gateway->show_shipping_address, //@deprecated
'update_details' => (bool) $company_gateway->update_details,
'config' => (string) $company_gateway->getConfigTransformed(),
- 'fees_and_limits' => $company_gateway->fees_and_limits ?: new stdClass,
+ 'fees_and_limits' => $company_gateway->fees_and_limits ?: new stdClass(),
'updated_at' => (int) $company_gateway->updated_at,
'archived_at' => (int) $company_gateway->deleted_at,
'created_at' => (int) $company_gateway->created_at,
diff --git a/app/Transformers/CompanyTokenHashedTransformer.php b/app/Transformers/CompanyTokenHashedTransformer.php
index d9c1ee132fc4..59a53b4d7a02 100644
--- a/app/Transformers/CompanyTokenHashedTransformer.php
+++ b/app/Transformers/CompanyTokenHashedTransformer.php
@@ -45,7 +45,7 @@ class CompanyTokenHashedTransformer extends EntityTransformer
'user_id' => $this->encodePrimaryKey($company_token->user_id),
'token' => substr($company_token->token, 0, 10).'xxxxxxxxxxx',
'name' => $company_token->name ?: '',
- 'is_system' =>(bool) $company_token->is_system,
+ 'is_system' => (bool) $company_token->is_system,
'updated_at' => (int) $company_token->updated_at,
'archived_at' => (int) $company_token->deleted_at,
'created_at' => (int) $company_token->created_at,
diff --git a/app/Transformers/CompanyTokenTransformer.php b/app/Transformers/CompanyTokenTransformer.php
index 76083f063ff7..cbd30be079aa 100644
--- a/app/Transformers/CompanyTokenTransformer.php
+++ b/app/Transformers/CompanyTokenTransformer.php
@@ -45,7 +45,7 @@ class CompanyTokenTransformer extends EntityTransformer
'user_id' => $this->encodePrimaryKey($company_token->user_id),
'token' => $company_token->token,
'name' => $company_token->name ?: '',
- 'is_system' =>(bool) $company_token->is_system,
+ 'is_system' => (bool) $company_token->is_system,
'updated_at' => (int) $company_token->updated_at,
'archived_at' => (int) $company_token->deleted_at,
'created_at' => (int) $company_token->created_at,
diff --git a/app/Transformers/CompanyTransformer.php b/app/Transformers/CompanyTransformer.php
index 0ea80a1e33ec..a52cb317b094 100644
--- a/app/Transformers/CompanyTransformer.php
+++ b/app/Transformers/CompanyTransformer.php
@@ -116,7 +116,7 @@ class CompanyTransformer extends EntityTransformer
*/
public function transform(Company $company)
{
- $std = new stdClass;
+ $std = new stdClass();
return [
'id' => (string) $this->encodePrimaryKey($company->id),
@@ -146,7 +146,7 @@ class CompanyTransformer extends EntityTransformer
'enabled_modules' => (int) $company->enabled_modules,
'updated_at' => (int) $company->updated_at,
'archived_at' => (int) $company->deleted_at,
- 'created_at' =>(int) $company->created_at,
+ 'created_at' => (int) $company->created_at,
'slack_webhook_url' => (string) $company->slack_webhook_url,
'google_analytics_url' => (string) $company->google_analytics_key, //@deprecate 1-2-2021
'google_analytics_key' => (string) $company->google_analytics_key,
@@ -158,7 +158,7 @@ class CompanyTransformer extends EntityTransformer
'is_large' => (bool) $this->isLarge($company),
'is_disabled' => (bool) $company->is_disabled,
'enable_shop_api' => (bool) $company->enable_shop_api,
- 'mark_expenses_invoiceable'=> (bool) $company->mark_expenses_invoiceable,
+ 'mark_expenses_invoiceable' => (bool) $company->mark_expenses_invoiceable,
'mark_expenses_paid' => (bool) $company->mark_expenses_paid,
'invoice_expense_documents' => (bool) $company->invoice_expense_documents,
'invoice_task_timelog' => (bool) $company->invoice_task_timelog,
@@ -168,10 +168,10 @@ class CompanyTransformer extends EntityTransformer
'use_credits_payment' => 'always', // @deprecate 1-2-2021
'default_task_is_date_based' => (bool) $company->default_task_is_date_based,
'enable_product_discount' => (bool) $company->enable_product_discount,
- 'calculate_expense_tax_by_amount' =>(bool) $company->calculate_expense_tax_by_amount,
+ 'calculate_expense_tax_by_amount' => (bool) $company->calculate_expense_tax_by_amount,
'hide_empty_columns_on_pdf' => false, // @deprecate 1-2-2021
'expense_inclusive_taxes' => (bool) $company->expense_inclusive_taxes,
- 'expense_amount_is_pretax' =>(bool) true, //@deprecate 1-2-2021
+ 'expense_amount_is_pretax' => (bool) true, //@deprecate 1-2-2021
'oauth_password_required' => (bool) $company->oauth_password_required,
'session_timeout' => (int) $company->session_timeout,
'default_password_timeout' => (int) $company->default_password_timeout,
@@ -198,12 +198,12 @@ class CompanyTransformer extends EntityTransformer
'notify_vendor_when_paid' => (bool) $company->notify_vendor_when_paid,
'invoice_task_hours' => (bool) $company->invoice_task_hours,
'calculate_taxes' => (bool) $company->calculate_taxes,
- 'tax_data' => $company->tax_data ?: new \stdClass,
+ 'tax_data' => $company->tax_data ?: new \stdClass(),
'has_e_invoice_certificate' => $company->e_invoice_certificate ? true : false,
'has_e_invoice_certificate_passphrase' => $company->e_invoice_certificate_passphrase ? true : false,
'invoice_task_project_header' => (bool) $company->invoice_task_project_header,
'invoice_task_item_description' => (bool) $company->invoice_task_item_description,
- 'origin_tax_data' => $company->origin_tax_data ?: new \stdClass,
+ 'origin_tax_data' => $company->origin_tax_data ?: new \stdClass(),
];
}
diff --git a/app/Transformers/CompanyUserTransformer.php b/app/Transformers/CompanyUserTransformer.php
index 43e76a0f84c0..e3a3f54ac5af 100644
--- a/app/Transformers/CompanyUserTransformer.php
+++ b/app/Transformers/CompanyUserTransformer.php
@@ -38,7 +38,7 @@ class CompanyUserTransformer extends EntityTransformer
public function transform(CompanyUser $company_user)
{
- $blank_obj = new \stdClass;
+ $blank_obj = new \stdClass();
return [
'permissions' => $company_user->permissions ?: '',
diff --git a/app/Transformers/EntityTransformer.php b/app/Transformers/EntityTransformer.php
index acc4177be080..88c940dddabb 100644
--- a/app/Transformers/EntityTransformer.php
+++ b/app/Transformers/EntityTransformer.php
@@ -17,9 +17,9 @@ class EntityTransformer extends TransformerAbstract
{
protected $serializer;
- const API_SERIALIZER_ARRAY = 'array';
+ public const API_SERIALIZER_ARRAY = 'array';
- const API_SERIALIZER_JSON = 'json';
+ public const API_SERIALIZER_JSON = 'json';
public function __construct($serializer = null)
{
diff --git a/app/Transformers/ExpenseTransformer.php b/app/Transformers/ExpenseTransformer.php
index aa13889a9298..c0fd15a71b19 100644
--- a/app/Transformers/ExpenseTransformer.php
+++ b/app/Transformers/ExpenseTransformer.php
@@ -28,7 +28,7 @@ class ExpenseTransformer extends EntityTransformer
{
use MakesHash;
use SoftDeletes;
-
+
protected array $defaultIncludes = [
'documents',
];
diff --git a/app/Transformers/GroupSettingTransformer.php b/app/Transformers/GroupSettingTransformer.php
index 17e47c80562c..dcafb1425fe4 100644
--- a/app/Transformers/GroupSettingTransformer.php
+++ b/app/Transformers/GroupSettingTransformer.php
@@ -42,7 +42,7 @@ class GroupSettingTransformer extends EntityTransformer
return [
'id' => $this->encodePrimaryKey($group_setting->id),
'name' => (string) $group_setting->name ?: '',
- 'settings' => $group_setting->settings ?: new stdClass,
+ 'settings' => $group_setting->settings ?: new stdClass(),
'created_at' => (int) $group_setting->created_at,
'updated_at' => (int) $group_setting->updated_at,
'archived_at' => (int) $group_setting->deleted_at,
diff --git a/app/Transformers/InvoiceTransformer.php b/app/Transformers/InvoiceTransformer.php
index 3f3b57e169e6..c732fa945de1 100644
--- a/app/Transformers/InvoiceTransformer.php
+++ b/app/Transformers/InvoiceTransformer.php
@@ -157,7 +157,7 @@ class InvoiceTransformer extends EntityTransformer
'paid_to_date' => (float) $invoice->paid_to_date,
'subscription_id' => $this->encodePrimaryKey($invoice->subscription_id),
'auto_bill_enabled' => (bool) $invoice->auto_bill_enabled,
- 'tax_info' => $invoice->tax_data ?: new \stdClass,
+ 'tax_info' => $invoice->tax_data ?: new \stdClass(),
];
if (request()->has('reminder_schedule') && request()->query('reminder_schedule') == 'true') {
diff --git a/app/Transformers/PaymentTransformer.php b/app/Transformers/PaymentTransformer.php
index 0f37438bce7e..86e970113c9a 100644
--- a/app/Transformers/PaymentTransformer.php
+++ b/app/Transformers/PaymentTransformer.php
@@ -82,7 +82,7 @@ class PaymentTransformer extends EntityTransformer
public function includeType(Payment $payment)
{
- return $this->includeItem($payment, new PaymentTypeTransformer, PaymentType::class);
+ return $this->includeItem($payment, new PaymentTypeTransformer(), PaymentType::class);
}
public function transform(Payment $payment)
@@ -114,7 +114,7 @@ class PaymentTransformer extends EntityTransformer
'client_contact_id' => (string) $this->encodePrimaryKey($payment->client_contact_id),
'company_gateway_id' => (string) $this->encodePrimaryKey($payment->company_gateway_id),
'gateway_type_id' => (string) $payment->gateway_type_id ?: '',
- 'status_id'=> (string) $payment->status_id,
+ 'status_id' => (string) $payment->status_id,
'project_id' => (string) $this->encodePrimaryKey($payment->project_id),
'vendor_id' => (string) $this->encodePrimaryKey($payment->vendor_id),
'currency_id' => (string) $payment->currency_id ?: '',
diff --git a/app/Transformers/PaymentTypeTransformer.php b/app/Transformers/PaymentTypeTransformer.php
index 3d9aae3da634..5c7a91861ba0 100644
--- a/app/Transformers/PaymentTypeTransformer.php
+++ b/app/Transformers/PaymentTypeTransformer.php
@@ -15,7 +15,6 @@ use App\Models\Payment;
class PaymentTypeTransformer extends EntityTransformer
{
-
public function transform(Payment $payment)
{
return [
diff --git a/app/Transformers/PurchaseOrderTransformer.php b/app/Transformers/PurchaseOrderTransformer.php
index 8404dd56d7f9..d8015a7b26bd 100644
--- a/app/Transformers/PurchaseOrderTransformer.php
+++ b/app/Transformers/PurchaseOrderTransformer.php
@@ -62,7 +62,7 @@ class PurchaseOrderTransformer extends EntityTransformer
return $this->includeCollection($purchase_order->documents, $transformer, Document::class);
}
-
+
public function includeExpense(PurchaseOrder $purchase_order)
{
$transformer = new ExpenseTransformer($this->serializer);
diff --git a/app/Transformers/SchedulerTransformer.php b/app/Transformers/SchedulerTransformer.php
index cbc4af3d7e1e..ea012a8185d9 100644
--- a/app/Transformers/SchedulerTransformer.php
+++ b/app/Transformers/SchedulerTransformer.php
@@ -27,7 +27,7 @@ class SchedulerTransformer extends EntityTransformer
'next_run' => $scheduler->next_run_client->format('Y-m-d'),
'template' => (string) $scheduler->template,
'is_paused' => (bool) $scheduler->is_paused,
- 'parameters'=> (array) $scheduler->parameters,
+ 'parameters' => (array) $scheduler->parameters,
'is_deleted' => (bool) $scheduler->is_deleted,
'updated_at' => (int) $scheduler->updated_at,
'created_at' => (int) $scheduler->created_at,
diff --git a/app/Transformers/Shop/CompanyShopProfileTransformer.php b/app/Transformers/Shop/CompanyShopProfileTransformer.php
index 358ad5e321bd..6674f7a6f3ee 100644
--- a/app/Transformers/Shop/CompanyShopProfileTransformer.php
+++ b/app/Transformers/Shop/CompanyShopProfileTransformer.php
@@ -42,7 +42,7 @@ class CompanyShopProfileTransformer extends EntityTransformer
*/
public function transform(Company $company)
{
- $std = new stdClass;
+ $std = new stdClass();
return [
'company_key' => (string) $company->company_key ?: '',
@@ -52,7 +52,7 @@ class CompanyShopProfileTransformer extends EntityTransformer
private function trimCompany($company)
{
- $std = new stdClass;
+ $std = new stdClass();
$trimmed_company_settings = [
'custom_fields' => $company->custom_fields ?: $std,
@@ -74,7 +74,7 @@ class CompanyShopProfileTransformer extends EntityTransformer
'vat_number' => $company->settings->vat_number,
];
- $new_settings = new stdClass;
+ $new_settings = new stdClass();
foreach ($trimmed_company_settings as $key => $value) {
$new_settings->{$key} = $value;
diff --git a/app/Transformers/SubscriptionTransformer.php b/app/Transformers/SubscriptionTransformer.php
index 7a9b53535ceb..f06537d2421f 100644
--- a/app/Transformers/SubscriptionTransformer.php
+++ b/app/Transformers/SubscriptionTransformer.php
@@ -69,7 +69,7 @@ class SubscriptionTransformer extends EntityTransformer
'archived_at' => (int) $subscription->deleted_at,
'plan_map' => '', //@deprecated 03/04/2021
'use_inventory_management' => (bool) $subscription->use_inventory_management,
- 'optional_recurring_product_ids' =>(string)$subscription->optional_recurring_product_ids,
+ 'optional_recurring_product_ids' => (string)$subscription->optional_recurring_product_ids,
'optional_product_ids' => (string) $subscription->optional_product_ids,
'registration_required' => (bool) $subscription->registration_required,
];
diff --git a/app/Utils/ClientPortal/MagicLink.php b/app/Utils/ClientPortal/MagicLink.php
index 066377b9a3da..e336a02086e2 100644
--- a/app/Utils/ClientPortal/MagicLink.php
+++ b/app/Utils/ClientPortal/MagicLink.php
@@ -17,7 +17,7 @@ use Illuminate\Support\Str;
class MagicLink
{
//return a magic login link URL
- public static function create($email, $company_id, $url = null) :string
+ public static function create($email, $company_id, $url = null): string
{
$magic_key = Str::random(64);
$timeout = 600; //seconds
diff --git a/app/Utils/EmailStats.php b/app/Utils/EmailStats.php
index 6af60ece2fe6..3ca23f432451 100644
--- a/app/Utils/EmailStats.php
+++ b/app/Utils/EmailStats.php
@@ -18,7 +18,7 @@ use Illuminate\Support\Facades\Cache;
*/
class EmailStats
{
- const EMAIL = 'email_';
+ public const EMAIL = 'email_';
/**
* Increments the counter for emails sent
diff --git a/app/Utils/Helpers.php b/app/Utils/Helpers.php
index 029d79372bf9..0092fe007671 100644
--- a/app/Utils/Helpers.php
+++ b/app/Utils/Helpers.php
@@ -27,7 +27,7 @@ class Helpers
{
if (! $client) {
$elements['signature'] = '';
- $elements['settings'] = new stdClass;
+ $elements['settings'] = new stdClass();
$elements['whitelabel'] = true;
$elements['company'] = '';
diff --git a/app/Utils/HtmlEngine.php b/app/Utils/HtmlEngine.php
index 2d2d3e7fc6a1..d4fe57993252 100644
--- a/app/Utils/HtmlEngine.php
+++ b/app/Utils/HtmlEngine.php
@@ -35,7 +35,7 @@ class HtmlEngine
use AppSetup;
use MakesHash;
use DesignCalculator;
-
+
/** @var \App\Models\Invoice | \App\Models\Credit | \App\Models\RecurringInvoice | \App\Models\Quote $entity **/
public $entity;
@@ -60,7 +60,7 @@ class HtmlEngine
private $helpers;
-
+
/**
* __construct
*
@@ -78,9 +78,9 @@ class HtmlEngine
$this->company = $invitation->company;
$this->contact = $invitation->contact->load('client');
-
+
$this->client = $this->contact->client->load('company', 'country');
-
+
$this->entity->load('client');
$this->settings = $this->client->getMergedSettings();
@@ -116,7 +116,7 @@ class HtmlEngine
}
}
- public function buildEntityDataArray() :array
+ public function buildEntityDataArray(): array
{
if (! $this->client->currency()) {
throw new Exception(debug_backtrace()[1]['function'], 1);
@@ -136,7 +136,7 @@ class HtmlEngine
$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['$order_number'] = ['value' => '', 'label' => ctrans('texts.order_number')];
$data['$tax'] = ['value' => '', 'label' => ctrans('texts.tax')];
$data['$quantity'] = ['value' => '', 'label' => ctrans('texts.quantity')];
@@ -161,7 +161,7 @@ class HtmlEngine
$data['$due_date'] = ['value' => $this->translateDate($this->entity->due_date, $this->client->date_format(), $this->client->locale()) ?: ' ', 'label' => ctrans('texts.'.$this->entity_string.'_due_date')];
$data['$partial_due_date'] = ['value' => $this->translateDate($this->entity->partial_due_date, $this->client->date_format(), $this->client->locale()) ?: ' ', 'label' => ctrans('texts.'.$this->entity_string.'_due_date')];
-
+
$data['$dueDate'] = &$data['$due_date'];
$data['$payment_due'] = ['value' => $this->translateDate($this->entity->due_date, $this->client->date_format(), $this->client->locale()) ?: ' ', 'label' => ctrans('texts.payment_due')];
@@ -181,7 +181,7 @@ class HtmlEngine
$data['$triangular_tax'] = ['value' => ctrans('texts.triangular_tax'), 'label' => ''];
$data['$tax_info'] = ['value' => $this->taxLabel(), 'label' => ''];
$data['$net'] = ['value' => '', 'label' => ctrans('texts.net')];
-
+
if ($this->entity_string == 'invoice' || $this->entity_string == 'recurring_invoice') {
$data['$entity'] = ['value' => ctrans('texts.invoice'), 'label' => ctrans('texts.invoice')];
$data['$number'] = ['value' => $this->entity->number ?: ' ', 'label' => ctrans('texts.invoice_number')];
@@ -225,7 +225,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' => ''];
-
+
if ($this->entity->vendor) {
$data['$invoice.vendor'] = ['value' => $this->entity->vendor->present()->name(), 'label' => ctrans('texts.vendor_name')];
}
@@ -318,7 +318,7 @@ class HtmlEngine
$data['$invoice.custom4'] = &$data['$credit.custom4'];
}
- $data['$portal_url'] = ['value' => $this->invitation->getPortalLink(), 'label' =>''];
+ $data['$portal_url'] = ['value' => $this->invitation->getPortalLink(), 'label' => ''];
$data['$entity_number'] = &$data['$number'];
$data['$invoice.discount'] = ['value' => Number::formatMoney($this->entity_calc->getTotalDiscount(), $this->client) ?: ' ', 'label' => ($this->entity->is_amount_discount) ? ctrans('texts.discount') : ctrans('texts.discount').' '.$this->entity->discount.'%'];
@@ -337,19 +337,19 @@ class HtmlEngine
/* Do not change the order of these */
if ($this->entity->partial > 0) {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->client) ?: ' ', 'label' => ctrans('texts.partial_due')];
- $data['$balance_due_dec'] = ['value' => sprintf("%01.2f",$this->entity->partial), 'label' => ctrans('texts.partial_due')];
+ $data['$balance_due_dec'] = ['value' => sprintf("%01.2f", $this->entity->partial), 'label' => ctrans('texts.partial_due')];
$data['$balance_due_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.partial_due')];
$data['$amount_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.partial_due')];
$data['$due_date'] = ['value' => $this->translateDate($this->entity->partial_due_date, $this->client->date_format(), $this->client->locale()) ?: ' ', 'label' => ctrans('texts.'.$this->entity_string.'_due_date')];
} else {
if ($this->entity->status_id == 1 || $this->entity_string == 'recurring_invoice') {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->amount, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
- $data['$balance_due_dec'] = ['value' => sprintf("%01.2f",$this->entity->amount), 'label' => ctrans('texts.balance_due')];
+ $data['$balance_due_dec'] = ['value' => sprintf("%01.2f", $this->entity->amount), 'label' => ctrans('texts.balance_due')];
$data['$balance_due_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.balance_due')];
$data['$amount_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.amount')];
} else {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.balance_due')];
- $data['$balance_due_dec'] = ['value' => sprintf("%01.2f",$this->entity->balance), 'label' => ctrans('texts.balance_due')];
+ $data['$balance_due_dec'] = ['value' => sprintf("%01.2f", $this->entity->balance), 'label' => ctrans('texts.balance_due')];
$data['$balance_due_raw'] = ['value' => $this->entity->balance, 'label' => ctrans('texts.balance_due')];
$data['$amount_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.amount')];
}
@@ -361,14 +361,14 @@ class HtmlEngine
if ($this->entity_string == 'credit') {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->client) ?: ' ', 'label' => ctrans('texts.credit_balance')];
- $data['$balance_due_dec'] = ['value' => sprintf("%01.2f",$this->entity->balance), 'label' => ctrans('texts.credit_balance')];
+ $data['$balance_due_dec'] = ['value' => sprintf("%01.2f", $this->entity->balance), 'label' => ctrans('texts.credit_balance')];
$data['$balance_due_raw'] = ['value' => $this->entity->balance, 'label' => ctrans('texts.credit_balance')];
$data['$amount_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.amount')];
}
if ($this->entity_string == 'credit' && $this->entity->status_id == 1) {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->amount, $this->client) ?: ' ', 'label' => ctrans('texts.credit_balance')];
- $data['$balance_due_dec'] = ['value' => sprintf("%01.2f",$this->entity->amount), 'label' => ctrans('texts.credit_balance')];
+ $data['$balance_due_dec'] = ['value' => sprintf("%01.2f", $this->entity->amount), 'label' => ctrans('texts.credit_balance')];
$data['$balance_due_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.credit_balance')];
$data['$amount_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.amount')];
}
@@ -451,7 +451,7 @@ class HtmlEngine
$data['$country'] = ['value' => isset($this->client->country->name) ? ctrans('texts.country_' . $this->client->country->name) : '', 'label' => ctrans('texts.country')];
$data['$country_2'] = ['value' => isset($this->client->country) ? $this->client->country->iso_3166_2 : '', 'label' => ctrans('texts.country')];
$data['$email'] = ['value' => isset($this->contact) ? $this->contact->email : 'no contact email on record', 'label' => ctrans('texts.email')];
-
+
if (str_contains($data['$email']['value'], 'example.com')) {
$data['$email'] = ['value' => '', 'label' => ctrans('texts.email')];
}
@@ -621,7 +621,7 @@ class HtmlEngine
if ($this->settings->signature_on_pdf) {
$data['$contact.signature'] = ['value' => $this->invitation->signature_base64, 'label' => ctrans('texts.signature')];
$data['$contact.signature_date'] = ['value' => $this->translateDate($this->invitation->signature_date, $this->client->date_format(), $this->client->locale()), 'label' => ctrans('texts.date')];
-
+
} else {
$data['$contact.signature'] = ['value' => '', 'label' => ''];
$data['$contact.signature_date'] = ['value' => '', 'label' => ctrans('texts.date')];
@@ -656,7 +656,7 @@ class HtmlEngine
//$data['$entity_footer'] = ['value' => $this->client->getSetting("{$this->entity_string}_footer"), 'label' => ''];
$data['$entity_footer'] = ['value' => Helpers::processReservedKeywords(\nl2br($this->entity->footer ?: ''), $this->client), 'label' => ''];
$data['$footer'] = &$data['$entity_footer'];
-
+
$data['$page_size'] = ['value' => $this->settings->page_size, 'label' => ''];
$data['$page_layout'] = ['value' => property_exists($this->settings, 'page_layout') ? $this->settings->page_layout : 'Portrait', 'label' => ''];
@@ -667,7 +667,7 @@ class HtmlEngine
/*Payment Aliases*/
$data['$paymentLink'] = &$data['$payment_link'];
$data['$payment_url'] = &$data['$payment_link'];
-
+
$data['$dir'] = ['value' => in_array(optional($this->client->language())->locale, ['ar', 'he']) ? 'rtl' : 'ltr', 'label' => ''];
$data['$dir_text_align'] = ['value' => in_array(optional($this->client->language())->locale, ['ar', 'he']) ? 'right' : 'left', 'label' => ''];
@@ -725,7 +725,7 @@ class HtmlEngine
return $data;
}
-
+
/**
* Returns a localized string for tax compliance purposes
*
@@ -755,7 +755,7 @@ class HtmlEngine
return $this->entity->balance;
}
- public function makeValues() :array
+ public function makeValues(): array
{
$data = [];
@@ -768,7 +768,7 @@ class HtmlEngine
return $data;
}
- public function makeValuesNoPrefix() :array
+ public function makeValuesNoPrefix(): array
{
$data = [];
@@ -796,7 +796,7 @@ class HtmlEngine
return $data;
}
- private function totalTaxLabels() :string
+ private function totalTaxLabels(): string
{
$data = '';
@@ -811,7 +811,7 @@ class HtmlEngine
return $data;
}
- private function totalTaxValues() :string
+ private function totalTaxValues(): string
{
$data = '';
@@ -826,7 +826,7 @@ class HtmlEngine
return $data;
}
- private function lineTaxLabels() :string
+ private function lineTaxLabels(): string
{
$tax_map = $this->entity_calc->getTaxMap();
@@ -839,7 +839,7 @@ class HtmlEngine
return $data;
}
- private function getCountryName() :string
+ private function getCountryName(): string
{
$countries = Cache::get('countries');
@@ -865,7 +865,7 @@ class HtmlEngine
}
- private function getCountryCode() :string
+ private function getCountryCode(): string
{
$country = Country::find($this->settings->country_id);
@@ -884,7 +884,7 @@ class HtmlEngine
* @return string a collection of rows with line item
* aggregate data
*/
- private function makeLineTaxes() :string
+ private function makeLineTaxes(): string
{
$tax_map = $this->entity_calc->getTaxMap();
@@ -899,7 +899,7 @@ class HtmlEngine
return $data;
}
- private function lineTaxValues() :string
+ private function lineTaxValues(): string
{
$tax_map = $this->entity_calc->getTaxMap();
@@ -912,7 +912,7 @@ class HtmlEngine
return $data;
}
- private function makeTotalTaxes() :string
+ private function makeTotalTaxes(): string
{
$data = '';
@@ -930,7 +930,7 @@ class HtmlEngine
return $data;
}
- private function parseLabelsAndValues($labels, $values, $section) :string
+ private function parseLabelsAndValues($labels, $values, $section): string
{
$section = strtr($section, $labels);
@@ -951,7 +951,7 @@ class HtmlEngine
* of Repeating headers and footers on the PDF.
* @return string The css string
*/
- private function generateCustomCSS() :string
+ private function generateCustomCSS(): string
{
$header_and_footer = '
.header, .header-space {
@@ -1079,10 +1079,10 @@ html {
$html = $dom->saveHTML();
$dom = null;
-
+
return $html;
}
-
+
/**
* buildViewButton
*
diff --git a/app/Utils/Ninja.php b/app/Utils/Ninja.php
index 5a788bb44a7a..ab8bd9eee575 100644
--- a/app/Utils/Ninja.php
+++ b/app/Utils/Ninja.php
@@ -19,7 +19,7 @@ use Illuminate\Support\Facades\Http;
*/
class Ninja
{
- const TEST_USERNAME = 'user@example.com';
+ public const TEST_USERNAME = 'user@example.com';
public static function isSelfHost()
{
@@ -136,7 +136,7 @@ class Ninja
];
}
- public static function transformTranslations($settings) :array
+ public static function transformTranslations($settings): array
{
$translations = [];
@@ -211,7 +211,7 @@ class Ninja
* but can't guarantee that it is a base64 encoded string
*
*/
- public static function isBase64Encoded(string $s) : bool
+ public static function isBase64Encoded(string $s): bool
{
// Check if there are valid base64 characters
if (! preg_match('/^[a-zA-Z0-9\/\r\n+]*={0,2}$/', $s)) {
diff --git a/app/Utils/Number.php b/app/Utils/Number.php
index b29466641441..67568d6da81b 100644
--- a/app/Utils/Number.php
+++ b/app/Utils/Number.php
@@ -25,7 +25,7 @@ class Number
*
* @return float
*/
- public static function roundValue(float $value, int $precision = 2) : float
+ public static function roundValue(float $value, int $precision = 2): float
{
return round($value, $precision, PHP_ROUND_HALF_UP);
}
@@ -38,7 +38,7 @@ class Number
*
* @return string The formatted value
*/
- public static function formatValue($value, $currency) :string
+ public static function formatValue($value, $currency): string
{
$value = floatval($value);
@@ -56,7 +56,7 @@ class Number
*
* @return string The formatted value
*/
- public static function formatValueNoTrailingZeroes($value, $entity) :string
+ public static function formatValueNoTrailingZeroes($value, $entity): string
{
$value = floatval($value);
@@ -133,7 +133,7 @@ class Number
* @param $entity
* @return string The formatted value
*/
- public static function formatMoney($value, $entity) :string
+ public static function formatMoney($value, $entity): string
{
$value = floatval($value);
@@ -198,10 +198,10 @@ class Number
* @param mixed $entity
* @return string The formatted value
*/
- public static function formatMoneyNoRounding($value, $entity) :string
+ public static function formatMoneyNoRounding($value, $entity): string
{
$currency = $entity->currency();
-
+
$_value = $value;
$thousand = $currency->thousand_separator;
@@ -239,7 +239,7 @@ class Number
} elseif ($v < 1) {
$precision = strlen($v) - strrpos($v, '.') - 1;
}
-
+
if (is_array($parts) && $parts[0] != 0) {
$precision = 2;
}
diff --git a/app/Utils/PaymentHtmlEngine.php b/app/Utils/PaymentHtmlEngine.php
index 7c376d20cd43..7e0bdefbb0a7 100644
--- a/app/Utils/PaymentHtmlEngine.php
+++ b/app/Utils/PaymentHtmlEngine.php
@@ -45,20 +45,20 @@ class PaymentHtmlEngine
$this->helpers = new Helpers();
}
- public function setSettings($settings):self
+ public function setSettings($settings): self
{
$this->settings = $settings;
return $this;
}
-
+
public function makePaymentVariables()
{
App::forgetInstance('translator');
$t = app('translator');
App::setLocale($this->contact->preferredLocale());
$t->replace(Ninja::transformTranslations($this->client->getMergedSettings()));
-
+
$data = [];
$data['$from'] = ['value' => '', 'label' => ctrans('texts.from')];
@@ -173,7 +173,7 @@ class PaymentHtmlEngine
$data['$viewButton'] = &$data['$view_link'];
$data['$viewLink'] = &$data['$view_link'];
$data['$paymentLink'] = &$data['$view_link'];
- $data['$portalButton'] = ['value' => $this->buildViewButton($this->payment->getPortalLink(), ctrans('texts.login')), 'label' =>''];
+ $data['$portalButton'] = ['value' => $this->buildViewButton($this->payment->getPortalLink(), ctrans('texts.login')), 'label' => ''];
$data['$portal_url'] = &$data['$portalButton'];
$data['$view_url'] = ['value' => $this->payment->getLink(), 'label' => ctrans('texts.view_payment')];
@@ -203,14 +203,13 @@ class PaymentHtmlEngine
$data['$reference'] = ['value' => '', 'label' => ctrans('texts.reference')];
$data['$total'] = ['value' => '', 'label' => ctrans('texts.total')];
$data['$history'] = ['value' => '', 'label' => ctrans('texts.history')];
-
+
if ($this->payment->status_id == 4) {
$data['$status_logo'] = ['value' => ' ' . ctrans('texts.paid') .'
', 'label' => ''];
} else {
$data['$status_logo'] = ['value' => '', 'label' => ''];
}
-
$arrKeysLength = array_map('strlen', array_keys($data));
array_multisort($arrKeysLength, SORT_DESC, $data);
@@ -289,7 +288,7 @@ class PaymentHtmlEngine
return $invoice_list;
}
- public function makeValues() :array
+ public function makeValues(): array
{
$data = [];
@@ -301,7 +300,7 @@ class PaymentHtmlEngine
return $data;
}
-
+
/**
* generateLabelsAndValues
*
diff --git a/app/Utils/PhantomJS/Phantom.php b/app/Utils/PhantomJS/Phantom.php
index d0acd053b570..524e50b2b928 100644
--- a/app/Utils/PhantomJS/Phantom.php
+++ b/app/Utils/PhantomJS/Phantom.php
@@ -33,7 +33,8 @@ use Illuminate\Support\Str;
class Phantom
{
- use MakesHash, PageNumbering;
+ use MakesHash;
+ use PageNumbering;
/**
* Generate a PDF from the
diff --git a/app/Utils/Statics.php b/app/Utils/Statics.php
index cd6f9bcdd3f6..1fc8e766745d 100644
--- a/app/Utils/Statics.php
+++ b/app/Utils/Statics.php
@@ -65,7 +65,7 @@ class Statics
* @param string|bool $locale The user locale
* @return array Array of statics
*/
- public static function company($locale = false) :array
+ public static function company($locale = false): array
{
$data = [];
diff --git a/app/Utils/SystemHealth.php b/app/Utils/SystemHealth.php
index ef90d1dc3cb7..1db1eaacbbd1 100644
--- a/app/Utils/SystemHealth.php
+++ b/app/Utils/SystemHealth.php
@@ -217,7 +217,7 @@ class SystemHealth
if (!function_exists('exec')) {
return "Unable to check CLI version";
}
-
+
try {
exec('php -v', $foo, $exitCode);
diff --git a/app/Utils/TempFile.php b/app/Utils/TempFile.php
index 9d7fe59ff3d9..a1646dbc6a73 100644
--- a/app/Utils/TempFile.php
+++ b/app/Utils/TempFile.php
@@ -13,7 +13,7 @@ namespace App\Utils;
class TempFile
{
- public static function path($url) :string
+ public static function path($url): string
{
$temp_path = @tempnam(sys_get_temp_dir().'/'.sha1(time()), basename($url));
copy($url, $temp_path);
@@ -22,7 +22,7 @@ class TempFile
}
/* Downloads a file to temp storage and returns the path - used for mailers */
- public static function filePath($data, $filename) :string
+ public static function filePath($data, $filename): string
{
$dir_hash = sys_get_temp_dir().'/'.sha1(microtime());
diff --git a/app/Utils/TemplateEngine.php b/app/Utils/TemplateEngine.php
index b65392118765..dec33845b82c 100644
--- a/app/Utils/TemplateEngine.php
+++ b/app/Utils/TemplateEngine.php
@@ -323,7 +323,7 @@ class TemplateEngine
'applied' => 10,
'refunded' => 5,
]);
-
+
$this->entity_obj = $payment;
/** @var \App\Models\Invoice $invoice */
@@ -377,7 +377,7 @@ class TemplateEngine
'company_id' => $user->company()->id,
'client_id' => $client->id,
]);
-
+
$this->entity_obj = $quote;
$invitation = QuoteInvitation::factory()->create([
@@ -403,14 +403,14 @@ class TemplateEngine
'is_primary' => 1,
'send_email' => true,
]);
-
+
/** @var \App\Models\PurchaseOrder $purchase_order **/
$purchase_order = PurchaseOrder::factory()->create([
'user_id' => $user->id,
'company_id' => $user->company()->id,
'vendor_id' => $vendor->id,
]);
-
+
$this->entity_obj = $purchase_order;
/** @var \App\Models\PurchaseOrderInvitation $invitation **/
diff --git a/app/Utils/Traits/ChecksEntityStatus.php b/app/Utils/Traits/ChecksEntityStatus.php
index 64aa9bc8f375..c44cc4fe7b34 100644
--- a/app/Utils/Traits/ChecksEntityStatus.php
+++ b/app/Utils/Traits/ChecksEntityStatus.php
@@ -23,6 +23,6 @@ trait ChecksEntityStatus
public function disallowUpdate()
{
- return response()->json(['message'=>'Record is deleted and cannot be edited. Restore the record to enable editing'], 400);
+ return response()->json(['message' => 'Record is deleted and cannot be edited. Restore the record to enable editing'], 400);
}
}
diff --git a/app/Utils/Traits/CleanLineItems.php b/app/Utils/Traits/CleanLineItems.php
index 8ccb07d02922..2a734b106c90 100644
--- a/app/Utils/Traits/CleanLineItems.php
+++ b/app/Utils/Traits/CleanLineItems.php
@@ -19,7 +19,7 @@ use App\DataMapper\InvoiceItem;
*/
trait CleanLineItems
{
- public function cleanItems($items) :array
+ public function cleanItems($items): array
{
if (! isset($items) || ! is_array($items)) {
return [];
@@ -65,15 +65,15 @@ trait CleanLineItems
if (! array_key_exists('tax_id', $item)) {
$item['tax_id'] = '1';
} elseif(array_key_exists('tax_id', $item) && $item['tax_id'] == '') {
-
+
if($item['type_id'] == '2') {
$item['tax_id'] = '2';
} else {
$item['tax_id'] = '1';
}
-
+
}
-
+
}
if (array_key_exists('id', $item) || array_key_exists('_id', $item)) {
diff --git a/app/Utils/Traits/ClientGroupSettingsSaver.php b/app/Utils/Traits/ClientGroupSettingsSaver.php
index 2d32b3468417..f5311cc71ddb 100644
--- a/app/Utils/Traits/ClientGroupSettingsSaver.php
+++ b/app/Utils/Traits/ClientGroupSettingsSaver.php
@@ -156,7 +156,7 @@ trait ClientGroupSettingsSaver
* @param array $settings The settings request() array
* @return stdClass stdClass object
*/
- private function checkSettingType($settings) : stdClass
+ private function checkSettingType($settings): stdClass
{
$settings = (object) $settings;
$casts = CompanySettings::$casts;
@@ -216,7 +216,7 @@ trait ClientGroupSettingsSaver
* @param string $value The object property
* @return bool TRUE if the property is the expected type
*/
- private function checkAttribute($key, $value) :bool
+ private function checkAttribute($key, $value): bool
{
switch ($key) {
case 'int':
diff --git a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
index d5b664824890..edcfd783e6c0 100644
--- a/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
+++ b/app/Utils/Traits/CompanyGatewayFeesAndLimitsSaver.php
@@ -53,7 +53,7 @@ trait CompanyGatewayFeesAndLimitsSaver
* @param string $value The object property
* @return bool TRUE if the property is the expected type
*/
- private function checkAttribute($key, $value) :bool
+ private function checkAttribute($key, $value): bool
{
switch ($key) {
case 'int':
@@ -87,7 +87,7 @@ trait CompanyGatewayFeesAndLimitsSaver
$new_arr = [];
foreach ($fees_and_limits as $key => $value) {
- $fal = new FeesAndLimits;
+ $fal = new FeesAndLimits();
// $fal->{$key} = $value;
foreach ($value as $k => $v) {
diff --git a/app/Utils/Traits/CompanySettingsSaver.php b/app/Utils/Traits/CompanySettingsSaver.php
index 043d8db5c93f..63a1d5b6cdb4 100644
--- a/app/Utils/Traits/CompanySettingsSaver.php
+++ b/app/Utils/Traits/CompanySettingsSaver.php
@@ -27,7 +27,6 @@ use stdClass;
*/
trait CompanySettingsSaver
{
-
private array $string_ids = [
'payment_refund_design_id',
'payment_receipt_design_id',
@@ -89,18 +88,18 @@ trait CompanySettingsSaver
if($entity?->calculate_taxes && $company_settings->country_id == "840" && array_key_exists('settings', $entity->getDirty()) && !$entity?->account->isFreeHostedClient()) {
$old_settings = $entity->getOriginal()['settings'];
-
+
/** Monitor changes of the Postal code */
if($old_settings->postal_code != $company_settings->postal_code) {
CompanyTaxRate::dispatch($entity);
}
-
-
+
+
} elseif($entity?->calculate_taxes && $company_settings->country_id == "840" && array_key_exists('calculate_taxes', $entity->getDirty()) && $entity->getOriginal('calculate_taxes') == 0 && !$entity?->account->isFreeHostedClient()) {
CompanyTaxRate::dispatch($entity);
}
-
-
+
+
$entity->save();
}
@@ -178,7 +177,7 @@ trait CompanySettingsSaver
* @param array $settings The settings request() array
* @return stdClass stdClass object
*/
- private function checkSettingType($settings) : stdClass
+ private function checkSettingType($settings): stdClass
{
$settings = (object) $settings;
@@ -207,7 +206,7 @@ trait CompanySettingsSaver
$value = 'integer';
if(in_array($key, $this->string_ids)) {
- $value ='string';
+ $value = 'string';
}
// if ($key == 'gmail_sending_user_id') {
@@ -266,7 +265,7 @@ trait CompanySettingsSaver
* @param string $value The object property
* @return bool TRUE if the property is the expected type
*/
- private function checkAttribute($key, $value) :bool
+ private function checkAttribute($key, $value): bool
{
switch ($key) {
case 'int':
diff --git a/app/Utils/Traits/DesignCalculator.php b/app/Utils/Traits/DesignCalculator.php
index 83bf016a13d3..9f11d04cc0a3 100644
--- a/app/Utils/Traits/DesignCalculator.php
+++ b/app/Utils/Traits/DesignCalculator.php
@@ -60,7 +60,7 @@ trait DesignCalculator
if ($default_design_id == 'recurring_invoice_design_id') {
$default_design_id = 'invoice_design_id';
}
-
+
$design_id = $this->settings->{$default_design_id};
if (array_key_exists($design_id, $design_map)) {
diff --git a/app/Utils/Traits/GeneratesConvertedQuoteCounter.php b/app/Utils/Traits/GeneratesConvertedQuoteCounter.php
index 314b994e1ba0..0e43c8d68414 100644
--- a/app/Utils/Traits/GeneratesConvertedQuoteCounter.php
+++ b/app/Utils/Traits/GeneratesConvertedQuoteCounter.php
@@ -53,7 +53,7 @@ trait GeneratesConvertedQuoteCounter
return $this->getNextEntityNumber($invoice, $client, intval($counter));
}
- private function getNextEntityNumber($invoice, Client $client, $counter='')
+ private function getNextEntityNumber($invoice, Client $client, $counter = '')
{
$settings = $client->getMergedSettings();
@@ -157,7 +157,7 @@ trait GeneratesConvertedQuoteCounter
* @param Invoice|null $invoice
* @return string The next invoice number.
*/
- public function getNextInvoiceNumber(Client $client, ?Invoice $invoice, $is_recurring = false) :string
+ public function getNextInvoiceNumber(Client $client, ?Invoice $invoice, $is_recurring = false): string
{
$entity_number = $this->getNextEntityNumber(Invoice::class, $client, $is_recurring);
@@ -171,7 +171,7 @@ trait GeneratesConvertedQuoteCounter
*
* @return string The next credit number.
*/
- public function getNextCreditNumber(Client $client, ?Credit $credit) :string
+ public function getNextCreditNumber(Client $client, ?Credit $credit): string
{
$entity_number = $this->getNextEntityNumber(Credit::class, $client);
@@ -213,7 +213,7 @@ trait GeneratesConvertedQuoteCounter
*
* @return string The next payment number.
*/
- public function getNextPaymentNumber(Client $client, ?Payment $payment) :string
+ public function getNextPaymentNumber(Client $client, ?Payment $payment): string
{
$entity_number = $this->getNextEntityNumber(Payment::class, $client);
@@ -228,7 +228,7 @@ trait GeneratesConvertedQuoteCounter
* @return string The next client number.
* @throws \Exception
*/
- public function getNextClientNumber(Client $client) :string
+ public function getNextClientNumber(Client $client): string
{
//Reset counters if enabled
$this->resetCounters($client);
@@ -251,7 +251,7 @@ trait GeneratesConvertedQuoteCounter
* @param Vendor $vendor The vendor
* @return string The next vendor number.
*/
- public function getNextVendorNumber(Vendor $vendor) :string
+ public function getNextVendorNumber(Vendor $vendor): string
{
$this->resetCompanyCounters($vendor->company);
@@ -272,7 +272,7 @@ trait GeneratesConvertedQuoteCounter
* @param Project $project
* @return string The project number
*/
- public function getNextProjectNumber(Project $project) :string
+ public function getNextProjectNumber(Project $project): string
{
$entity_number = $this->getNextEntityNumber(Project::class, $project->client, false);
@@ -285,7 +285,7 @@ trait GeneratesConvertedQuoteCounter
* @param Task $task The task
* @return string The next task number.
*/
- public function getNextTaskNumber(Task $task) :string
+ public function getNextTaskNumber(Task $task): string
{
$this->resetCompanyCounters($task->company);
@@ -307,7 +307,7 @@ trait GeneratesConvertedQuoteCounter
* @param Expense $expense The expense
* @return string The next expense number.
*/
- public function getNextExpenseNumber(Expense $expense) :string
+ public function getNextExpenseNumber(Expense $expense): string
{
$this->resetCompanyCounters($expense->company);
@@ -329,7 +329,7 @@ trait GeneratesConvertedQuoteCounter
* @param RecurringExpense $expense The expense
* @return string The next expense number.
*/
- public function getNextRecurringExpenseNumber(RecurringExpense $expense) :string
+ public function getNextRecurringExpenseNumber(RecurringExpense $expense): string
{
$this->resetCompanyCounters($expense->company);
@@ -361,7 +361,7 @@ trait GeneratesConvertedQuoteCounter
*
* @return bool True if has shared counter, False otherwise.
*/
- public function hasSharedCounter(Client $client, string $type = 'quote') : bool
+ public function hasSharedCounter(Client $client, string $type = 'quote'): bool
{
if ($type == 'quote') {
return (bool) $client->getSetting('shared_invoice_quote_counter');
@@ -409,7 +409,7 @@ trait GeneratesConvertedQuoteCounter
}
/*Check if a number is available for use. */
- public function checkNumberAvailable($class, $entity, $number) :bool
+ public function checkNumberAvailable($class, $entity, $number): bool
{
if ($entity = $class::whereCompanyId($entity->company_id)->whereNumber($number)->withTrashed()->exists()) {
return false;
@@ -424,7 +424,7 @@ trait GeneratesConvertedQuoteCounter
* @param $entity
* @param string $counter_name The counter name
*/
- private function incrementCounter($entity, string $counter_name) :void
+ private function incrementCounter($entity, string $counter_name): void
{
$settings = $entity->settings;
@@ -443,7 +443,7 @@ trait GeneratesConvertedQuoteCounter
$entity->save();
}
- private function prefixCounter($counter, $prefix) : string
+ private function prefixCounter($counter, $prefix): string
{
if (strlen($prefix) == 0) {
return $counter;
@@ -460,7 +460,7 @@ trait GeneratesConvertedQuoteCounter
*
* @return string the padded counter
*/
- private function padCounter($counter, $padding) :string
+ private function padCounter($counter, $padding): string
{
return str_pad($counter, $padding, '0', STR_PAD_LEFT);
}
@@ -618,7 +618,7 @@ trait GeneratesConvertedQuoteCounter
*
* @return string The formatted number pattern
*/
- private function applyNumberPattern($entity, string $counter, $pattern) :string
+ private function applyNumberPattern($entity, string $counter, $pattern): string
{
if (! $pattern) {
return $counter;
diff --git a/app/Utils/Traits/GeneratesCounter.php b/app/Utils/Traits/GeneratesCounter.php
index bf49f5438cad..883ac1ddd2c4 100644
--- a/app/Utils/Traits/GeneratesCounter.php
+++ b/app/Utils/Traits/GeneratesCounter.php
@@ -124,7 +124,7 @@ trait GeneratesCounter
switch ($entity) {
case Invoice::class:
return 'invoice_number_counter';
-
+
case Quote::class:
if ($this->hasSharedCounter($client, 'quote')) {
@@ -132,29 +132,29 @@ trait GeneratesCounter
}
return 'quote_number_counter';
-
+
case RecurringInvoice::class:
return 'recurring_invoice_number_counter';
-
+
case RecurringQuote::class:
return 'recurring_quote_number_counter';
-
+
case RecurringExpense::class:
return 'recurring_expense_number_counter';
-
+
case Payment::class:
return 'payment_number_counter';
-
+
case Credit::class:
if ($this->hasSharedCounter($client, 'credit')) {
return 'invoice_number_counter';
}
return 'credit_number_counter';
-
+
case Project::class:
return 'project_number_counter';
-
+
case PurchaseOrder::class:
return 'purchase_order_number_counter';
@@ -171,7 +171,7 @@ trait GeneratesCounter
* @param Invoice|null $invoice
* @return string The next invoice number.
*/
- public function getNextInvoiceNumber(Client $client, ?Invoice $invoice, $is_recurring = false) :string
+ public function getNextInvoiceNumber(Client $client, ?Invoice $invoice, $is_recurring = false): string
{
$entity_number = $this->getNextEntityNumber(Invoice::class, $client, $is_recurring);
@@ -185,7 +185,7 @@ trait GeneratesCounter
*
* @return string The next credit number.
*/
- public function getNextCreditNumber(Client $client, ?Credit $credit) :string
+ public function getNextCreditNumber(Client $client, ?Credit $credit): string
{
$entity_number = $this->getNextEntityNumber(Credit::class, $client);
@@ -227,7 +227,7 @@ trait GeneratesCounter
*
* @return string The next payment number.
*/
- public function getNextPaymentNumber(Client $client, ?Payment $payment) :string
+ public function getNextPaymentNumber(Client $client, ?Payment $payment): string
{
$entity_number = $this->getNextEntityNumber(Payment::class, $client);
@@ -242,7 +242,7 @@ trait GeneratesCounter
* @return string The next client number.
* @throws \Exception
*/
- public function getNextClientNumber(Client $client) :string
+ public function getNextClientNumber(Client $client): string
{
//Reset counters if enabled
$this->resetCounters($client);
@@ -265,7 +265,7 @@ trait GeneratesCounter
* @param Vendor $vendor The vendor
* @return string The next vendor number.
*/
- public function getNextVendorNumber(Vendor $vendor) :string
+ public function getNextVendorNumber(Vendor $vendor): string
{
$this->resetCompanyCounters($vendor->company);
@@ -286,7 +286,7 @@ trait GeneratesCounter
* @param Project $project
* @return string The project number
*/
- public function getNextProjectNumber(Project $project) :string
+ public function getNextProjectNumber(Project $project): string
{
$entity_number = $this->getNextEntityNumber(Project::class, $project->client, false);
@@ -299,7 +299,7 @@ trait GeneratesCounter
* @param Task $task The task
* @return string The next task number.
*/
- public function getNextTaskNumber(Task $task) :string
+ public function getNextTaskNumber(Task $task): string
{
$this->resetCompanyCounters($task->company);
@@ -321,7 +321,7 @@ trait GeneratesCounter
* @param Expense $expense The expense
* @return string The next expense number.
*/
- public function getNextExpenseNumber(Expense $expense) :string
+ public function getNextExpenseNumber(Expense $expense): string
{
$this->resetCompanyCounters($expense->company);
@@ -337,7 +337,7 @@ trait GeneratesCounter
return $this->replaceUserVars($expense, $entity_number);
}
- public function getNextPurchaseOrderNumber(PurchaseOrder $purchase_order) :string
+ public function getNextPurchaseOrderNumber(PurchaseOrder $purchase_order): string
{
$this->resetCompanyCounters($purchase_order->company);
@@ -359,7 +359,7 @@ trait GeneratesCounter
* @param RecurringExpense $expense The expense
* @return string The next expense number.
*/
- public function getNextRecurringExpenseNumber(RecurringExpense $expense) :string
+ public function getNextRecurringExpenseNumber(RecurringExpense $expense): string
{
$this->resetCompanyCounters($expense->company);
@@ -391,7 +391,7 @@ trait GeneratesCounter
*
* @return bool True if has shared counter, False otherwise.
*/
- public function hasSharedCounter(Client $client, string $type = 'quote') : bool
+ public function hasSharedCounter(Client $client, string $type = 'quote'): bool
{
if ($type == 'quote') {
return (bool) $client->getSetting('shared_invoice_quote_counter');
@@ -413,7 +413,7 @@ trait GeneratesCounter
* @param string $prefix
* @return string The padded and prefixed entity number
*/
- private function checkEntityNumber($class, $entity, $counter, $padding, $pattern, $prefix = '') :string
+ private function checkEntityNumber($class, $entity, $counter, $padding, $pattern, $prefix = ''): string
{
$check = false;
$check_counter = 1;
@@ -443,7 +443,7 @@ trait GeneratesCounter
}
/*Check if a number is available for use. */
- public function checkNumberAvailable($class, $entity, $number) :bool
+ public function checkNumberAvailable($class, $entity, $number): bool
{
if ($entity = $class::whereCompanyId($entity->company_id)->whereNumber($number)->withTrashed()->exists()) {
return false;
@@ -458,7 +458,7 @@ trait GeneratesCounter
* @param $entity
* @param string $counter_name The counter name
*/
- private function incrementCounter($entity, string $counter_name) :void
+ private function incrementCounter($entity, string $counter_name): void
{
$settings = $entity->settings;
@@ -478,7 +478,7 @@ trait GeneratesCounter
$entity->save();
}
- private function prefixCounter($counter, $prefix) : string
+ private function prefixCounter($counter, $prefix): string
{
if (strlen($prefix) == 0) {
return $counter;
@@ -495,7 +495,7 @@ trait GeneratesCounter
*
* @return string the padded counter
*/
- private function padCounter($counter, $padding) :string
+ private function padCounter($counter, $padding): string
{
return str_pad($counter, $padding, '0', STR_PAD_LEFT);
}
@@ -682,7 +682,7 @@ trait GeneratesCounter
*
* @return string The formatted number pattern
*/
- private function applyNumberPattern($entity, string $counter, $pattern) :string
+ private function applyNumberPattern($entity, string $counter, $pattern): string
{
if (! $pattern) {
return $counter;
diff --git a/app/Utils/Traits/Inviteable.php b/app/Utils/Traits/Inviteable.php
index d21e6d055201..5990c7e3da0d 100644
--- a/app/Utils/Traits/Inviteable.php
+++ b/app/Utils/Traits/Inviteable.php
@@ -28,7 +28,7 @@ trait Inviteable
*
* @return string The status.
*/
- public function getStatus() :string
+ public function getStatus(): string
{
$status = '';
@@ -86,7 +86,7 @@ trait Inviteable
return $domain.'/client/unsubscribe/'.$entity_type.'/'.$this->key;
}
- public function getLink() :string
+ public function getLink(): string
{
$entity_type = Str::snake(class_basename($this->entityType()));
@@ -113,7 +113,7 @@ trait Inviteable
}
}
- public function getPortalLink() :string
+ public function getPortalLink(): string
{
if (Ninja::isHosted()) {
$domain = $this->company->domain();
@@ -138,7 +138,7 @@ trait Inviteable
}
}
- public function getAdminLink($use_react_link = false) :string
+ public function getAdminLink($use_react_link = false): string
{
return $use_react_link ? $this->getReactLink() : $this->getLink().'?silent=true';
}
diff --git a/app/Utils/Traits/Invoice/ActionsInvoice.php b/app/Utils/Traits/Invoice/ActionsInvoice.php
index 0ed140d5b320..a533abb30b03 100644
--- a/app/Utils/Traits/Invoice/ActionsInvoice.php
+++ b/app/Utils/Traits/Invoice/ActionsInvoice.php
@@ -15,7 +15,7 @@ use App\Models\Invoice;
trait ActionsInvoice
{
- public function invoiceDeletable($invoice) :bool
+ public function invoiceDeletable($invoice): bool
{
if ($invoice->status_id <= Invoice::STATUS_SENT &&
$invoice->is_deleted == false &&
@@ -27,7 +27,7 @@ trait ActionsInvoice
return false;
}
- public function invoiceCancellable($invoice) :bool
+ public function invoiceCancellable($invoice): bool
{
if (($invoice->status_id == Invoice::STATUS_SENT ||
$invoice->status_id == Invoice::STATUS_PARTIAL) &&
@@ -39,7 +39,7 @@ trait ActionsInvoice
return false;
}
- public function invoiceReversable($invoice) :bool
+ public function invoiceReversable($invoice): bool
{
if (($invoice->status_id == Invoice::STATUS_SENT ||
$invoice->status_id == Invoice::STATUS_PARTIAL ||
diff --git a/app/Utils/Traits/MakesDates.php b/app/Utils/Traits/MakesDates.php
index a33afbd19fde..43aa5231f491 100644
--- a/app/Utils/Traits/MakesDates.php
+++ b/app/Utils/Traits/MakesDates.php
@@ -57,7 +57,7 @@ trait MakesDates
* @param string $format The date display format
* @return string The formatted date
*/
- public function formatDate($date, string $format) :string
+ public function formatDate($date, string $format): string
{
if (! isset($date)) {
return '';
@@ -76,7 +76,7 @@ trait MakesDates
* @param string $format The date display format
* @return string The formatted date
*/
- public function formatDatetime($date, string $format) :string
+ public function formatDatetime($date, string $format): string
{
return Carbon::createFromTimestamp($date)->format($format.' g:i a');
}
@@ -87,7 +87,7 @@ trait MakesDates
* @param string $format The date display format
* @return string The formatted date
*/
- public function formatDateTimestamp($timestamp, string $format) :string
+ public function formatDateTimestamp($timestamp, string $format): string
{
return Carbon::createFromTimestamp($timestamp)->format($format);
}
@@ -130,7 +130,7 @@ trait MakesDates
if(now()->lt($fin_year_start)) {
$fin_year_start->subYearNoOverflow();
}
-
+
}
//override for financial years
@@ -143,7 +143,7 @@ trait MakesDates
if(now()->subYear()->lt($fin_year_start)) {
$fin_year_start->subYearNoOverflow();
}
-
+
}
diff --git a/app/Utils/Traits/MakesHash.php b/app/Utils/Traits/MakesHash.php
index dc8d6d158a40..f458ca0ccf60 100644
--- a/app/Utils/Traits/MakesHash.php
+++ b/app/Utils/Traits/MakesHash.php
@@ -24,7 +24,7 @@ trait MakesHash
* Creates a simple alphanumeric Hash.
* @return string - asd89f7as89df6asf78as6fds
*/
- public function createHash() : string
+ public function createHash(): string
{
return Str::random(config('ninja.key_length'));
}
@@ -35,7 +35,7 @@ trait MakesHash
* @param $db - Full database name
* @return string 01-asfas8df76a78f6a78dfsdf
*/
- public function createDbHash($db) : string
+ public function createDbHash($db): string
{
if (config('ninja.db.multi_db_enabled')) {
return $this->getDbCode($db).'-'.Str::random(config('ninja.key_length'));
@@ -48,14 +48,14 @@ trait MakesHash
* @param $db - Full database name
* @return string - hashed and encoded int 01,02,03,04
*/
- public function getDbCode($db) : string
+ public function getDbCode($db): string
{
$hashids = new Hashids(config('ninja.hash_salt'), 10);
return $hashids->encode(str_replace(MultiDB::DB_PREFIX, '', $db));
}
- public function encodePrimaryKey($value) : string
+ public function encodePrimaryKey($value): string
{
$hashids = new Hashids(config('ninja.hash_salt'), 10);
@@ -79,7 +79,7 @@ trait MakesHash
}
} catch (\Exception $e) {
- return response()->json(['error'=>'Invalid primary key'], 400);
+ return response()->json(['error' => 'Invalid primary key'], 400);
}
/*
diff --git a/app/Utils/Traits/MakesHeaderData.php b/app/Utils/Traits/MakesHeaderData.php
index 4345e3da4d2d..81788381bb13 100644
--- a/app/Utils/Traits/MakesHeaderData.php
+++ b/app/Utils/Traits/MakesHeaderData.php
@@ -21,7 +21,7 @@ trait MakesHeaderData
/**
* @return array
*/
- public function headerData() : array
+ public function headerData(): array
{
//companies
$companies = auth()->user()->companies;
diff --git a/app/Utils/Traits/MakesInvoiceHtml.php b/app/Utils/Traits/MakesInvoiceHtml.php
index dc8889dda85f..1359640f7d5b 100644
--- a/app/Utils/Traits/MakesInvoiceHtml.php
+++ b/app/Utils/Traits/MakesInvoiceHtml.php
@@ -22,7 +22,7 @@ use Throwable;
*/
trait MakesInvoiceHtml
{
- private function parseLabelsAndValues($labels, $values, $section) :string
+ private function parseLabelsAndValues($labels, $values, $section): string
{
$section = strtr($section, $labels);
$section = strtr($section, $values);
@@ -38,7 +38,7 @@ trait MakesInvoiceHtml
* @return string The return HTML string
* @throws FatalThrowableError
*/
- public function renderView($string, $data = []) :string
+ public function renderView($string, $data = []): string
{
$data['__env'] = app(Factory::class);
diff --git a/app/Utils/Traits/MakesInvoiceValues.php b/app/Utils/Traits/MakesInvoiceValues.php
index 764be096900b..a3d7c3de448d 100644
--- a/app/Utils/Traits/MakesInvoiceValues.php
+++ b/app/Utils/Traits/MakesInvoiceValues.php
@@ -81,7 +81,7 @@ trait MakesInvoiceValues
return '';
}
- public function makeLabels($contact = null) :array
+ public function makeLabels($contact = null): array
{
$data = [];
@@ -102,7 +102,7 @@ trait MakesInvoiceValues
* @return array returns an array
* of keyed labels (appended with _label)
*/
- public function makeValues($contact = null) :array
+ public function makeValues($contact = null): array
{
$data = [];
@@ -120,7 +120,7 @@ trait MakesInvoiceValues
* @param array $columns The array (or string of column headers)
* @return string injectable HTML string
*/
- public function buildTableHeader($columns) :?string
+ public function buildTableHeader($columns): ?string
{
$data = $this->makeLabels();
@@ -144,7 +144,7 @@ trait MakesInvoiceValues
* @param string $table_prefix
* @return string injectable HTML string
*/
- public function buildTableBody(array $default_columns, $user_columns, string $table_prefix) :?string
+ public function buildTableBody(array $default_columns, $user_columns, string $table_prefix): ?string
{
$items = $this->transformLineItems($this->line_items, $table_prefix);
@@ -189,7 +189,7 @@ trait MakesInvoiceValues
* @param array $columns The column header values
* @return array The new column header variables
*/
- private function transformColumnsForHeader(array $columns) :array
+ private function transformColumnsForHeader(array $columns): array
{
if (count($columns) == 0) {
return [];
@@ -221,7 +221,7 @@ trait MakesInvoiceValues
* @param array $columns The column header values
* @return array The invoice variables
*/
- private function transformColumnsForLineItems(array $columns) :array
+ private function transformColumnsForLineItems(array $columns): array
{
/* Removes any invalid columns the user has entered. */
$columns = array_intersect($columns, self::$master_columns);
@@ -258,7 +258,7 @@ trait MakesInvoiceValues
*
* @return array
*/
- public function transformLineItems($items, $table_type = '$product') :array
+ public function transformLineItems($items, $table_type = '$product'): array
{ //$start = microtime(true);
$entity = $this->client ? $this->client : $this->vendor;
@@ -366,7 +366,7 @@ trait MakesInvoiceValues
}
//nlog(microtime(true) - $start);
-
+
return $data;
}
@@ -379,7 +379,7 @@ trait MakesInvoiceValues
* @return string a collection of
rows with line item
* aggregate data
*/
- private function makeLineTaxes() :string
+ private function makeLineTaxes(): string
{
$tax_map = $this->calc()->getTaxMap();
$entity = $this->client ? $this->client : $this->vendor;
@@ -399,7 +399,7 @@ trait MakesInvoiceValues
* @return string a collectino of
with
* itemised total tax data
*/
- private function makeTotalTaxes() :string
+ private function makeTotalTaxes(): string
{
$data = '';
$entity = $this->client ? $this->client : $this->vendor;
@@ -417,7 +417,7 @@ trait MakesInvoiceValues
return $data;
}
- private function totalTaxLabels() :string
+ private function totalTaxLabels(): string
{
$data = '';
@@ -432,7 +432,7 @@ trait MakesInvoiceValues
return $data;
}
- private function totalTaxValues() :string
+ private function totalTaxValues(): string
{
$data = '';
$entity = $this->client ? $this->client : $this->vendor;
@@ -448,7 +448,7 @@ trait MakesInvoiceValues
return $data;
}
- private function lineTaxLabels() :string
+ private function lineTaxLabels(): string
{
$tax_map = $this->calc()->getTaxMap();
@@ -461,7 +461,7 @@ trait MakesInvoiceValues
return $data;
}
- private function lineTaxValues() :string
+ private function lineTaxValues(): string
{
$tax_map = $this->calc()->getTaxMap();
$entity = $this->client ? $this->client : $this->vendor;
@@ -489,7 +489,7 @@ trait MakesInvoiceValues
* of Repeating headers and footers on the PDF.
* @return string The css string
*/
- public function generateCustomCSS() :string
+ public function generateCustomCSS(): string
{
$settings = $this->client ? $this->client->getMergedSettings() : $this->company->settings;
diff --git a/app/Utils/Traits/MakesMenu.php b/app/Utils/Traits/MakesMenu.php
index 2c284d8bd6f3..bca4b9768f86 100644
--- a/app/Utils/Traits/MakesMenu.php
+++ b/app/Utils/Traits/MakesMenu.php
@@ -23,7 +23,7 @@ trait MakesMenu
* @param string $entity Class name
* @return array of modules
*/
- public function makeEntityTabMenu(string $entity) : array
+ public function makeEntityTabMenu(string $entity): array
{
$tabs = [];
diff --git a/app/Utils/Traits/MakesReminders.php b/app/Utils/Traits/MakesReminders.php
index 4ef6a7368322..d73ec2ea773e 100644
--- a/app/Utils/Traits/MakesReminders.php
+++ b/app/Utils/Traits/MakesReminders.php
@@ -80,7 +80,7 @@ trait MakesReminders
}
- private function checkEndlessReminder($last_sent_date, $endless_reminder_frequency_id) :bool
+ private function checkEndlessReminder($last_sent_date, $endless_reminder_frequency_id): bool
{
if (Carbon::now()->startOfDay()->eq($this->addTimeInterval($last_sent_date, $endless_reminder_frequency_id))) {
return true;
@@ -89,7 +89,7 @@ trait MakesReminders
return false;
}
- private function addTimeInterval($date, $endless_reminder_frequency_id) :?Carbon
+ private function addTimeInterval($date, $endless_reminder_frequency_id): ?Carbon
{
if (! $date) {
return null;
diff --git a/app/Utils/Traits/MakesTemplateData.php b/app/Utils/Traits/MakesTemplateData.php
index 8658e39562ae..91112e106ee3 100644
--- a/app/Utils/Traits/MakesTemplateData.php
+++ b/app/Utils/Traits/MakesTemplateData.php
@@ -16,7 +16,7 @@ namespace App\Utils\Traits;
*/
trait MakesTemplateData
{
- public function makeFakerLabels() :array
+ public function makeFakerLabels(): array
{
$data = [];
@@ -36,7 +36,7 @@ trait MakesTemplateData
* @return array returns an array
* of keyed labels (appended with _label)
*/
- public function makeFakerValues() :array
+ public function makeFakerValues(): array
{
$data = [];
@@ -227,7 +227,7 @@ trait MakesTemplateData
$data['$vendor.postal_city'] = &$data['$postal_city'];
$data['$vendor.country'] = &$data['$country'];
$data['$vendor.email'] = &$data['$email'];
-
+
$data['$vendor.billing_address1'] = &$data['$vendor.address1'];
$data['$vendor.billing_address2'] = &$data['$vendor.address2'];
$data['$vendor.billing_city'] = &$data['$vendor.city'];
diff --git a/app/Utils/Traits/Notifications/UserNotifies.php b/app/Utils/Traits/Notifications/UserNotifies.php
index 153a9d65d21a..dbc871badab1 100644
--- a/app/Utils/Traits/Notifications/UserNotifies.php
+++ b/app/Utils/Traits/Notifications/UserNotifies.php
@@ -28,7 +28,7 @@ use App\Models\Quote;
*/
trait UserNotifies
{
- public function findUserNotificationTypes($invitation, $company_user, $entity_name, $required_permissions) :array
+ public function findUserNotificationTypes($invitation, $company_user, $entity_name, $required_permissions): array
{
$notifiable_methods = [];
$notifications = $company_user->notifications;
@@ -43,7 +43,7 @@ trait UserNotifies
//if a user owns this record or is assigned to it, they are attached the permission for notification.
if ($invitation->{$entity_name}->user_id == $company_user->user_id || $invitation->{$entity_name}->assigned_user_id == $company_user->user_id) {
-
+
} else {
$required_permissions = $this->removeSpecialUserPermissionForEntity($invitation->{$entity_name}, $required_permissions);
}
@@ -55,7 +55,7 @@ trait UserNotifies
return $notifiable_methods;
}
- public function findUserEntityNotificationType($entity, $company_user, array $required_permissions) :array
+ public function findUserEntityNotificationType($entity, $company_user, array $required_permissions): array
{
$notifiable_methods = [];
$notifications = $company_user->notifications;
@@ -81,7 +81,7 @@ trait UserNotifies
return $notifiable_methods;
}
- private function addSpecialUserPermissionForEntity($entity, array $required_permissions) :array
+ private function addSpecialUserPermissionForEntity($entity, array $required_permissions): array
{
return array_merge($required_permissions, ['all_notifications', 'all_user_notifications']);
}
@@ -109,7 +109,7 @@ trait UserNotifies
}
}
- public function findCompanyUserNotificationType($company_user, $required_permissions) :array
+ public function findCompanyUserNotificationType($company_user, $required_permissions): array
{
if ($company_user->company->is_disabled ||
$company_user->trashed() ||
diff --git a/app/Utils/Traits/NumberFormatter.php b/app/Utils/Traits/NumberFormatter.php
index e2ea72649e10..64cad0124296 100644
--- a/app/Utils/Traits/NumberFormatter.php
+++ b/app/Utils/Traits/NumberFormatter.php
@@ -36,7 +36,7 @@ trait NumberFormatter
* @param string $value The value
* @return float Consumable float value
*/
- private function parseFloat($value) : float
+ private function parseFloat($value): float
{
// check for comma as decimal separator
if (preg_match('/,[\d]{1,2}$/', $value)) {
diff --git a/app/Utils/Traits/Payment/Refundable.php b/app/Utils/Traits/Payment/Refundable.php
index 7a7098bb0684..24567841349c 100644
--- a/app/Utils/Traits/Payment/Refundable.php
+++ b/app/Utils/Traits/Payment/Refundable.php
@@ -200,7 +200,7 @@ trait Refundable
private function createActivity(array $data, int $credit_id)
{
- $fields = new stdClass;
+ $fields = new stdClass();
$activity_repo = new ActivityRepository();
$fields->payment_id = $this->id;
@@ -221,7 +221,7 @@ trait Refundable
}
}
- private function buildCreditNote(array $data) :?Credit
+ private function buildCreditNote(array $data): ?Credit
{
$credit_note = CreditFactory::create($this->company_id, $this->user_id);
$credit_note->assigned_user_id = isset($this->assigned_user_id) ?: null;
diff --git a/app/Utils/Traits/SettingsSaver.php b/app/Utils/Traits/SettingsSaver.php
index 71877bad3161..07f84fc240a1 100644
--- a/app/Utils/Traits/SettingsSaver.php
+++ b/app/Utils/Traits/SettingsSaver.php
@@ -99,7 +99,7 @@ trait SettingsSaver
* @param string $value The object property
* @return bool TRUE if the property is the expected type
*/
- private function checkAttribute($key, $value) :bool
+ private function checkAttribute($key, $value): bool
{
switch ($key) {
case 'int':
diff --git a/app/Utils/Traits/SubscriptionHooker.php b/app/Utils/Traits/SubscriptionHooker.php
index df03068464b7..ee286a949423 100644
--- a/app/Utils/Traits/SubscriptionHooker.php
+++ b/app/Utils/Traits/SubscriptionHooker.php
@@ -51,7 +51,7 @@ trait SubscriptionHooker
return array_merge($body, json_decode($response->getBody(), true));
} catch (ClientException $e) {
$message = $e->getMessage();
-
+
$error = json_decode($e->getResponse()->getBody()->getContents());
if (is_null($error)) {
diff --git a/app/Utils/Traits/UserSessionAttributes.php b/app/Utils/Traits/UserSessionAttributes.php
index 3f9df0007aab..e94231b11bf3 100644
--- a/app/Utils/Traits/UserSessionAttributes.php
+++ b/app/Utils/Traits/UserSessionAttributes.php
@@ -19,7 +19,7 @@ trait UserSessionAttributes
/**
* @param $value
*/
- public function setCurrentCompanyId($value) : void
+ public function setCurrentCompanyId($value): void
{
session(['current_company_id' => $value]);
}
@@ -27,7 +27,7 @@ trait UserSessionAttributes
/**
* @return int
*/
- public function getCurrentCompanyId() : int
+ public function getCurrentCompanyId(): int
{
return session('current_company_id');
}
diff --git a/app/Utils/Traits/UserSettings.php b/app/Utils/Traits/UserSettings.php
index 654b241a4b1f..944f46e01b77 100644
--- a/app/Utils/Traits/UserSettings.php
+++ b/app/Utils/Traits/UserSettings.php
@@ -22,7 +22,7 @@ trait UserSettings
* @param string $entity
* @return stdClass
*/
- public function getEntity(string $entity) : stdClass
+ public function getEntity(string $entity): stdClass
{
return $this->settings()->{$entity};
}
@@ -31,7 +31,7 @@ trait UserSettings
* @param string $entity
* @return stdClass
*/
- public function getColumnVisibility(string $entity) : stdClass
+ public function getColumnVisibility(string $entity): stdClass
{
return $this->settings()->{class_basename($entity)}->datatable->column_visibility;
}
diff --git a/app/Utils/TranslationHelper.php b/app/Utils/TranslationHelper.php
index 20ffbd984ecb..15b1307c3158 100644
--- a/app/Utils/TranslationHelper.php
+++ b/app/Utils/TranslationHelper.php
@@ -11,7 +11,7 @@
namespace App\Utils;
-use \Illuminate\Support\Facades\Cache;
+use Illuminate\Support\Facades\Cache;
use App\Models\PaymentTerm;
use Illuminate\Support\Str;
diff --git a/app/Utils/VendorHtmlEngine.php b/app/Utils/VendorHtmlEngine.php
index 28ebb9fb3a68..533f4893a85f 100644
--- a/app/Utils/VendorHtmlEngine.php
+++ b/app/Utils/VendorHtmlEngine.php
@@ -36,7 +36,7 @@ class VendorHtmlEngine
use MakesDates;
use AppSetup;
use DesignCalculator;
-
+
public $entity;
public $invitation;
@@ -66,9 +66,9 @@ class VendorHtmlEngine
$this->company = $invitation->company;
$this->contact = $invitation->contact->load('vendor');
-
+
$this->vendor = $this->contact->vendor->load('company', 'country');
-
+
if (!$this->vendor->currency_id) {
$this->vendor->currency_id = $this->company->settings->currency_id;
$this->vendor->save();
@@ -83,13 +83,13 @@ class VendorHtmlEngine
$this->helpers = new Helpers();
}
- public function setSettings($settings):self
+ public function setSettings($settings): self
{
$this->settings = $settings;
return $this;
}
-
+
///////////////////////////////////////////////////////////////////////////////////////////////////////////////////
@@ -112,7 +112,7 @@ class VendorHtmlEngine
}
}
- public function buildEntityDataArray() :array
+ public function buildEntityDataArray(): array
{
if (! $this->vendor->currency()) {
throw new Exception(debug_backtrace()[1]['function'], 1);
@@ -139,7 +139,7 @@ class VendorHtmlEngine
$data['$due_date'] = ['value' => $this->translateDate($this->entity->due_date, $this->company->date_format(), $this->vendor->locale()) ?: ' ', 'label' => ctrans('texts.due_date')];
$data['$partial_due_date'] = ['value' => $this->translateDate($this->entity->partial_due_date, $this->company->date_format(), $this->vendor->locale()) ?: ' ', 'label' => ctrans('texts.'.$this->entity_string.'_due_date')];
-
+
$data['$dueDate'] = &$data['$due_date'];
$data['$purchase_order.due_date'] = &$data['$due_date'];
@@ -168,7 +168,7 @@ class VendorHtmlEngine
$data['$purchase_order.due_date'] = &$data['$due_date'];
$data['$entity_issued_to'] = ['value' => '', 'label' => ctrans("texts.purchase_order_issued_to")];
- $data['$portal_url'] = ['value' => $this->invitation->getPortalLink(), 'label' =>''];
+ $data['$portal_url'] = ['value' => $this->invitation->getPortalLink(), 'label' => ''];
$data['$entity_number'] = &$data['$number'];
$data['$discount'] = ['value' => $this->entity->discount, 'label' => ctrans('texts.discount')];
@@ -183,19 +183,19 @@ class VendorHtmlEngine
if ($this->entity->partial > 0) {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->vendor) ?: ' ', 'label' => ctrans('texts.partial_due')];
- $data['$balance_due_dec'] = ['value' => sprintf("%01.2f",$this->entity->partial), 'label' => ctrans('texts.partial_due')];
+ $data['$balance_due_dec'] = ['value' => sprintf("%01.2f", $this->entity->partial), 'label' => ctrans('texts.partial_due')];
$data['$balance_due_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.partial_due')];
$data['$amount_raw'] = ['value' => $this->entity->partial, 'label' => ctrans('texts.partial_due')];
$data['$due_date'] = ['value' => $this->translateDate($this->entity->partial_due_date, $this->company->date_format(), $this->vendor->locale()) ?: ' ', 'label' => ctrans('texts.'.$this->entity_string.'_due_date')];
} else {
if ($this->entity->status_id == 1) {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->amount, $this->vendor) ?: ' ', 'label' => ctrans('texts.balance_due')];
- $data['$balance_due_dec'] = ['value' => sprintf("%01.2f",$this->entity->amount), 'label' => ctrans('texts.balance_due')];
+ $data['$balance_due_dec'] = ['value' => sprintf("%01.2f", $this->entity->amount), 'label' => ctrans('texts.balance_due')];
$data['$balance_due_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.balance_due')];
$data['$amount_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.amount')];
} else {
$data['$balance_due'] = ['value' => Number::formatMoney($this->entity->balance, $this->vendor) ?: ' ', 'label' => ctrans('texts.balance_due')];
- $data['$balance_due_dec'] = ['value' => sprintf("%01.2f",$this->entity->balance), 'label' => ctrans('texts.balance_due')];
+ $data['$balance_due_dec'] = ['value' => sprintf("%01.2f", $this->entity->balance), 'label' => ctrans('texts.balance_due')];
$data['$balance_due_raw'] = ['value' => $this->entity->balance, 'label' => ctrans('texts.balance_due')];
$data['$amount_raw'] = ['value' => $this->entity->amount, 'label' => ctrans('texts.amount')];
}
@@ -203,7 +203,7 @@ class VendorHtmlEngine
$data['$outstanding'] = &$data['$balance_due'];
$data['$purchase_order.balance_due'] = &$data['$balance_due'];
-
+
$data['$partial_due'] = ['value' => Number::formatMoney($this->entity->partial, $this->vendor) ?: ' ', 'label' => ctrans('texts.partial_due')];
$data['$partial'] = &$data['$partial_due'];
@@ -255,7 +255,7 @@ class VendorHtmlEngine
$data['$country'] = ['value' => isset($this->vendor->country->name) ? ctrans('texts.country_' . $this->vendor->country->name) : '', 'label' => ctrans('texts.country')];
$data['$country_2'] = ['value' => isset($this->vendor->country) ? $this->vendor->country->iso_3166_2 : '', 'label' => ctrans('texts.country')];
$data['$email'] = ['value' => isset($this->contact) ? $this->contact->email : 'no contact email on record', 'label' => ctrans('texts.email')];
-
+
if (str_contains($data['$email']['value'], 'example.com')) {
$data['$email'] = ['value' => '', 'label' => ctrans('texts.email')];
}
@@ -284,7 +284,7 @@ class VendorHtmlEngine
$data['$vendor.postal_city'] = &$data['$postal_city'];
$data['$vendor.country'] = &$data['$country'];
$data['$vendor.email'] = &$data['$email'];
-
+
$data['$vendor.billing_address'] = &$data['$vendor_address'];
$data['$vendor.billing_address1'] = &$data['$vendor.address1'];
$data['$vendor.billing_address2'] = &$data['$vendor.address2'];
@@ -406,7 +406,7 @@ class VendorHtmlEngine
$data['$entity_footer'] = ['value' => Helpers::processReservedKeywords(\nl2br($this->entity->footer), $this->company), 'label' => ''];
$data['$footer'] = &$data['$entity_footer'];
-
+
$data['$page_size'] = ['value' => $this->settings->page_size, 'label' => ''];
$data['$page_layout'] = ['value' => property_exists($this->settings, 'page_layout') ? $this->settings->page_layout : 'Portrait', 'label' => ''];
@@ -463,7 +463,7 @@ class VendorHtmlEngine
$data['$client.postal_city'] = &$data['$postal_city'];
$data['$client.country'] = &$data['$country'];
$data['$client.email'] = &$data['$email'];
-
+
$data['$client.billing_address'] = &$data['$client_address'];
$data['$client.billing_address1'] = &$data['$client.address1'];
$data['$client.billing_address2'] = &$data['$client.address2'];
@@ -495,7 +495,7 @@ class VendorHtmlEngine
return $data;
}
- public function makeValues() :array
+ public function makeValues(): array
{
$data = [];
@@ -522,7 +522,7 @@ class VendorHtmlEngine
return $data;
}
- private function totalTaxLabels() :string
+ private function totalTaxLabels(): string
{
$data = '';
@@ -537,7 +537,7 @@ class VendorHtmlEngine
return $data;
}
- private function totalTaxValues() :string
+ private function totalTaxValues(): string
{
$data = '';
@@ -552,7 +552,7 @@ class VendorHtmlEngine
return $data;
}
- private function lineTaxLabels() :string
+ private function lineTaxLabels(): string
{
$tax_map = $this->entity_calc->getTaxMap();
@@ -565,7 +565,7 @@ class VendorHtmlEngine
return $data;
}
- private function getCountryName() :string
+ private function getCountryName(): string
{
$countries = Cache::get('countries');
@@ -591,7 +591,7 @@ class VendorHtmlEngine
}
- private function getCountryCode() :string
+ private function getCountryCode(): string
{
$country = Country::find($this->settings->country_id);
@@ -755,7 +755,7 @@ html {
}
*/
- private function lineTaxValues() :string
+ private function lineTaxValues(): string
{
$tax_map = $this->entity_calc->getTaxMap();
@@ -795,7 +795,7 @@ html {
$container = $dom->createElement('div');
$container->setAttribute('style', 'display:grid; grid-auto-flow: row; grid-template-columns: repeat(2, 1fr); grid-template-rows: repeat(2, 1fr);justify-items: center;');
-
+
foreach ($this->entity->documents()->where('is_public', true)->get() as $document) {
if (!$document->isImage()) {
continue;
@@ -814,7 +814,7 @@ html {
$html = $dom->saveHTML();
$dom = null;
-
+
return $html;
}
diff --git a/phpstan.neon b/phpstan.neon
index 6f2c4251a087..1d97fbf4e6f4 100644
--- a/phpstan.neon
+++ b/phpstan.neon
@@ -8,9 +8,8 @@ parameters:
- app
excludePaths:
- 'vendor/*'
- - '../resources/*'
- - resources/
- resources/*
+ - '../resources/views/*'
- 'app/Jobs/Ninja/*'
- 'app/Models/Presenters/*'
- 'app/Console/Commands/*'