php-cs-fixer

This commit is contained in:
David Bomba 2024-06-14 17:09:44 +10:00
parent 9c288cd452
commit 72aadc0c16
232 changed files with 1436 additions and 1417 deletions

View File

@ -172,18 +172,18 @@ class CheckData extends Command
CompanyUser::query()->cursor()->each(function ($cu) { CompanyUser::query()->cursor()->each(function ($cu) {
if (CompanyToken::where('user_id', $cu->user_id)->where('company_id', $cu->company_id)->where('is_system', 1)->doesntExist()) { if (CompanyToken::where('user_id', $cu->user_id)->where('company_id', $cu->company_id)->where('is_system', 1)->doesntExist()) {
if ($cu->company && $cu->user) { if ($cu->company && $cu->user) {
$this->logMessage("Creating missing company token for user # {$cu->user_id} for company id # {$cu->company_id}"); $this->logMessage("Creating missing company token for user # {$cu->user_id} for company id # {$cu->company_id}");
(new CreateCompanyToken($cu->company, $cu->user, 'System'))->handle(); (new CreateCompanyToken($cu->company, $cu->user, 'System'))->handle();
} }
if (!$cu->user) { if (!$cu->user) {
$this->logMessage("No user found for company user - removing company user"); $this->logMessage("No user found for company user - removing company user");
$cu->forceDelete(); $cu->forceDelete();
} }
} }
}); });
} }
@ -477,14 +477,13 @@ class CheckData extends Command
} }
} else { } else {
$this->logMessage("No contact present, so cannot add invitation for {$entity_key} - {$entity->id}"); $this->logMessage("No contact present, so cannot add invitation for {$entity_key} - {$entity->id}");
try{ try {
$entity->service()->createInvitations()->save(); $entity->service()->createInvitations()->save();
} } catch(\Exception $e) {
catch(\Exception $e){
} }
} }
try { try {
@ -949,12 +948,12 @@ class CheckData extends Command
}); });
Company::whereDoesntHave('company_users', function ($query){ Company::whereDoesntHave('company_users', function ($query) {
$query->where('is_owner', 1); $query->where('is_owner', 1);
}) })
->cursor() ->cursor()
->when(Ninja::isHosted()) ->when(Ninja::isHosted())
->each(function ($c){ ->each(function ($c) {
$this->logMessage("Orphan Account # {$c->account_id}"); $this->logMessage("Orphan Account # {$c->account_id}");
@ -963,8 +962,8 @@ class CheckData extends Command
CompanyUser::whereDoesntHave('tokens') CompanyUser::whereDoesntHave('tokens')
->cursor() ->cursor()
->when(Ninja::isHosted()) ->when(Ninja::isHosted())
->each(function ($cu){ ->each(function ($cu) {
$this->logMessage("Missing tokens for Company User # {$cu->id}"); $this->logMessage("Missing tokens for Company User # {$cu->id}");
}); });

View File

@ -1016,7 +1016,7 @@ class CreateSingleAccount extends Command
$cg->fees_and_limits = $fees_and_limits; $cg->fees_and_limits = $fees_and_limits;
$cg->save(); $cg->save();
} }
if (config('ninja.testvars.eway') && ($this->gateway == 'all' || $this->gateway == 'eway')) { if (config('ninja.testvars.eway') && ($this->gateway == 'all' || $this->gateway == 'eway')) {
$cg = new CompanyGateway(); $cg = new CompanyGateway();
$cg->company_id = $company->id; $cg->company_id = $company->id;
@ -1038,12 +1038,12 @@ class CreateSingleAccount extends Command
$cg->save(); $cg->save();
} }
if (config('ninja.testvars.gocardless') && ($this->gateway == 'all' || $this->gateway == 'gocardless')) { if (config('ninja.testvars.gocardless') && ($this->gateway == 'all' || $this->gateway == 'gocardless')) {
$c_settings = ClientSettings::defaults(); $c_settings = ClientSettings::defaults();
$c_settings->currency_id = '2'; $c_settings->currency_id = '2';
$client = Client::factory()->create([ $client = Client::factory()->create([
'user_id' => $user->id, 'user_id' => $user->id,
'company_id' => $company->id, 'company_id' => $company->id,

View File

@ -48,37 +48,37 @@ class ReactBuilder extends Command
{ {
if($this->option('type') == 'local') { if($this->option('type') == 'local') {
$includes = '';
$directoryIterator = false; $includes = '';
try { $directoryIterator = false;
$directoryIterator = new \RecursiveDirectoryIterator(public_path('react/v'.config('ninja.app_version').'/'), \RecursiveDirectoryIterator::SKIP_DOTS);
} catch (\Exception $e) {
$this->error('React files not found');
return;
}
foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) { try {
if ($file->getExtension() == 'js') { $directoryIterator = new \RecursiveDirectoryIterator(public_path('react/v'.config('ninja.app_version').'/'), \RecursiveDirectoryIterator::SKIP_DOTS);
if (str_contains($file->getFileName(), 'index-')) { } catch (\Exception $e) {
$includes .= '<script type="module" crossorigin src="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'"></script>'."\n"; $this->error('React files not found');
} else { return;
$includes .= '<link rel="modulepreload" href="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'">'."\n"; }
foreach (new \RecursiveIteratorIterator($directoryIterator) as $file) {
if ($file->getExtension() == 'js') {
if (str_contains($file->getFileName(), 'index-')) {
$includes .= '<script type="module" crossorigin src="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'"></script>'."\n";
} else {
$includes .= '<link rel="modulepreload" href="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'">'."\n";
}
}
if (str_contains($file->getFileName(), '.css')) {
$includes .= '<link rel="stylesheet" href="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'">'."\n";
} }
} }
if (str_contains($file->getFileName(), '.css')) { file_put_contents(resource_path('views/react/head.blade.php'), $includes);
$includes .= '<link rel="stylesheet" href="/react/v'.config('ninja.app_version').'/'.$file->getFileName().'">'."\n";
}
}
file_put_contents(resource_path('views/react/head.blade.php'), $includes);
} }
} }
} }

View File

@ -55,7 +55,7 @@ class DbQuery extends GenericMixedMetric
public $string_metric8 = 'client_version'; public $string_metric8 = 'client_version';
public $string_metric9 = 'platform'; public $string_metric9 = 'platform';
/** /**
* The counter * The counter
* set to 1. * set to 1.

View File

@ -64,9 +64,9 @@ class InvoiceItem
public $task_id = ''; public $task_id = '';
public $expense_id = ''; public $expense_id = '';
public $unit_code = 'C62'; public $unit_code = 'C62';
public static $casts = [ public static $casts = [
'task_id' => 'string', 'task_id' => 'string',
'expense_id' => 'string', 'expense_id' => 'string',

View File

@ -15,7 +15,6 @@ use App\DataMapper\InvoiceItem;
class PayPalBalanceAffecting class PayPalBalanceAffecting
{ {
private array $key_map = [ private array $key_map = [
'Date' => 'date', 'Date' => 'date',
'Time' => 'time', 'Time' => 'time',
@ -105,8 +104,10 @@ class PayPalBalanceAffecting
public $discount; public $discount;
public $creditTransactionalFee; public $creditTransactionalFee;
public $originalInvoiceId; public $originalInvoiceId;
public function __construct(private array $import_row){} public function __construct(private array $import_row)
{
}
public function run(): self public function run(): self
{ {
@ -116,11 +117,11 @@ class PayPalBalanceAffecting
$prop = $this->key_map[$key] ?? false; $prop = $this->key_map[$key] ?? false;
if($prop){ if($prop) {
echo "Setting {$prop} to {$value}".PHP_EOL; echo "Setting {$prop} to {$value}".PHP_EOL;
$this->{$prop} = $value; $this->{$prop} = $value;
} }
} }
@ -130,7 +131,7 @@ class PayPalBalanceAffecting
private function cleanUp(): self private function cleanUp(): self
{ {
foreach($this->key_map as $value){ foreach($this->key_map as $value) {
echo "Setting {$value} to null".PHP_EOL; echo "Setting {$value} to null".PHP_EOL;
$this->{$value} = null; $this->{$value} = null;
} }
@ -154,7 +155,7 @@ class PayPalBalanceAffecting
public function getInvoice(): array public function getInvoice(): array
{ {
$item = new InvoiceItem; $item = new InvoiceItem();
$item->cost = $this->gross ?? 0; $item->cost = $this->gross ?? 0;
$item->product_key = $this->itemId ?? ''; $item->product_key = $this->itemId ?? '';
$item->notes = $this->subject ?? $this->itemDetails; $item->notes = $this->subject ?? $this->itemDetails;
@ -162,7 +163,7 @@ class PayPalBalanceAffecting
return [ return [
'number' => trim($this->invoiceNumber ?? $this->transactionId), 'number' => trim($this->invoiceNumber ?? $this->transactionId),
'date' => str_replace('/','-', $this->date ?? ''), 'date' => str_replace('/', '-', $this->date ?? ''),
'line_items' => [$item], 'line_items' => [$item],
'name' => $this->name ?? '', 'name' => $this->name ?? '',
'email' => $this->fromEmailAddress ?? '', 'email' => $this->fromEmailAddress ?? '',
@ -174,12 +175,10 @@ class PayPalBalanceAffecting
{ {
$name_parts = explode(" ", $this->name ?? ''); $name_parts = explode(" ", $this->name ?? '');
if(count($name_parts) == 2) if(count($name_parts) == 2) {
{
$contact['first_name'] = $name_parts[0]; $contact['first_name'] = $name_parts[0];
$contact['last_name'] = $name_parts[1]; $contact['last_name'] = $name_parts[1];
} } else {
else {
$contact['first_name'] = $this->name ?? ''; $contact['first_name'] = $this->name ?? '';
} }
@ -188,7 +187,7 @@ class PayPalBalanceAffecting
return $contact; return $contact;
} }
private function returnAddress(): array private function returnAddress(): array
{ {
return [ return [
@ -203,13 +202,15 @@ class PayPalBalanceAffecting
private function returnShippingAddress(): array private function returnShippingAddress(): array
{ {
if(strlen($this->shippingAddress ?? '') <3) if(strlen($this->shippingAddress ?? '') < 3) {
return []; return [];
}
$ship_parts = explode(",", $this->shippingAddress); $ship_parts = explode(",", $this->shippingAddress);
if(count($ship_parts) != 7) if(count($ship_parts) != 7) {
return []; return [];
}
return [ return [
'shipping_address1' => $ship_parts[2], 'shipping_address1' => $ship_parts[2],

View File

@ -838,12 +838,12 @@ class BaseExport
return ''; return '';
} }
/** /**
* Apply Product Filters * Apply Product Filters
* *
* @param Builder $query * @param Builder $query
* *
* @return Builder * @return Builder
*/ */
public function applyProductFilters(Builder $query): Builder public function applyProductFilters(Builder $query): Builder
@ -863,13 +863,13 @@ class BaseExport
return $query; return $query;
} }
/** /**
* Add Client Filter * Add Client Filter
* *
* @param Builder $query * @param Builder $query
* @param mixed $clients * @param mixed $clients
* *
* @return Builder * @return Builder
*/ */
protected function addClientFilter(Builder $query, $clients): Builder protected function addClientFilter(Builder $query, $clients): Builder
@ -886,13 +886,13 @@ class BaseExport
return $query; return $query;
} }
/** /**
* Add Vendor Filter * Add Vendor Filter
* *
* @param Builder $query * @param Builder $query
* @param string $vendors * @param string $vendors
* *
* @return Builder * @return Builder
*/ */
protected function addVendorFilter(Builder$query, string $vendors): Builder protected function addVendorFilter(Builder$query, string $vendors): Builder
@ -910,13 +910,13 @@ class BaseExport
return $query; return $query;
} }
/** /**
* AddProjectFilter * AddProjectFilter
* *
* @param Builder $query * @param Builder $query
* @param string $projects * @param string $projects
* *
* @return Builder * @return Builder
*/ */
protected function addProjectFilter(Builder $query, string $projects): Builder protected function addProjectFilter(Builder $query, string $projects): Builder
@ -934,13 +934,13 @@ class BaseExport
return $query; return $query;
} }
/** /**
* Add Category Filter * Add Category Filter
* *
* @param Builder $query * @param Builder $query
* @param string $expense_categories * @param string $expense_categories
* *
* @return Builder * @return Builder
*/ */
protected function addCategoryFilter(Builder $query, string $expense_categories): Builder protected function addCategoryFilter(Builder $query, string $expense_categories): Builder
@ -959,13 +959,13 @@ class BaseExport
return $query; return $query;
} }
/** /**
* Add Payment Status Filters * Add Payment Status Filters
* *
* @param Builder $query * @param Builder $query
* @param string $status * @param string $status
* *
* @return Builder * @return Builder
*/ */
protected function addPaymentStatusFilters(Builder $query, string $status): Builder protected function addPaymentStatusFilters(Builder $query, string $status): Builder
@ -976,7 +976,7 @@ class BaseExport
if(in_array('all', $status_parameters) || count($status_parameters) == 0) { if(in_array('all', $status_parameters) || count($status_parameters) == 0) {
return $query; return $query;
} }
$query->where(function ($query) use ($status_parameters) { $query->where(function ($query) use ($status_parameters) {
$payment_filters = []; $payment_filters = [];
@ -1016,13 +1016,13 @@ class BaseExport
return $query; return $query;
} }
/** /**
* Add RecurringInvoice Status Filter * Add RecurringInvoice Status Filter
* *
* @param Builder $query * @param Builder $query
* @param string $status * @param string $status
* *
* @return Builder * @return Builder
*/ */
protected function addRecurringInvoiceStatusFilter(Builder $query, string $status): Builder protected function addRecurringInvoiceStatusFilter(Builder $query, string $status): Builder
@ -1030,7 +1030,7 @@ class BaseExport
$status_parameters = explode(',', $status); $status_parameters = explode(',', $status);
if (in_array('all', $status_parameters) || count($status_parameters) == 0){ if (in_array('all', $status_parameters) || count($status_parameters) == 0) {
return $query; return $query;
} }
@ -1060,7 +1060,7 @@ class BaseExport
* *
* @param Builder $query * @param Builder $query
* @param string $status * @param string $status
* *
* @return Builder * @return Builder
*/ */
protected function addQuoteStatusFilter(Builder $query, string $status): Builder protected function addQuoteStatusFilter(Builder $query, string $status): Builder
@ -1126,12 +1126,12 @@ class BaseExport
* *
* @param Builder $query * @param Builder $query
* @param string $status * @param string $status
* *
* @return Builder * @return Builder
*/ */
protected function addPurchaseOrderStatusFilter(Builder $query, string $status): Builder protected function addPurchaseOrderStatusFilter(Builder $query, string $status): Builder
{ {
$status_parameters = explode(',', $status); $status_parameters = explode(',', $status);
if (in_array('all', $status_parameters) || count($status_parameters) == 0) { if (in_array('all', $status_parameters) || count($status_parameters) == 0) {
@ -1234,7 +1234,7 @@ class BaseExport
return $query; return $query;
} }
/** /**
* Add Date Range * Add Date Range
* *
@ -1578,7 +1578,7 @@ class BaseExport
public function queueDocuments(Builder $query) public function queueDocuments(Builder $query)
{ {
if($query->getModel() instanceof Document) { if($query->getModel() instanceof Document) {
$documents = $query->pluck('id')->toArray(); $documents = $query->pluck('id')->toArray();
} else { } else {

View File

@ -127,8 +127,9 @@ class ClientExport extends BaseExport
->withTrashed() ->withTrashed()
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false) if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
}
$query = $this->addDateRange($query); $query = $this->addDateRange($query);

View File

@ -59,7 +59,7 @@ class ContactExport extends BaseExport
$query = ClientContact::query() $query = ClientContact::query()
->where('company_id', $this->company->id) ->where('company_id', $this->company->id)
->whereHas('client', function ($q){ ->whereHas('client', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}); });

View File

@ -102,7 +102,7 @@ class CreditExport extends BaseExport
$query = Credit::query() $query = Credit::query()
->withTrashed() ->withTrashed()
->with('client') ->with('client')
->whereHas('client', function ($q){ ->whereHas('client', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}) })
->where('company_id', $this->company->id) ->where('company_id', $this->company->id)

View File

@ -83,9 +83,9 @@ class ExpenseExport extends BaseExport
->with('client') ->with('client')
->withTrashed() ->withTrashed()
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){ if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

View File

@ -57,13 +57,13 @@ class InvoiceExport extends BaseExport
$query = Invoice::query() $query = Invoice::query()
->withTrashed() ->withTrashed()
->with('client') ->with('client')
->whereHas('client', function ($q){ ->whereHas('client', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}) })
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){
if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

View File

@ -70,12 +70,12 @@ class InvoiceItemExport extends BaseExport
$query = Invoice::query() $query = Invoice::query()
->withTrashed() ->withTrashed()
->with('client') ->with('client')
->whereHas('client', function ($q){ ->whereHas('client', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}) })
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){ if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

View File

@ -56,7 +56,7 @@ class PaymentExport extends BaseExport
$query = Payment::query() $query = Payment::query()
->withTrashed() ->withTrashed()
->whereHas('client', function ($q){ ->whereHas('client', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}) })
->where('company_id', $this->company->id) ->where('company_id', $this->company->id)
@ -71,7 +71,7 @@ class PaymentExport extends BaseExport
} }
$query = $this->addPaymentStatusFilters($query, $this->input['status'] ?? ''); $query = $this->addPaymentStatusFilters($query, $this->input['status'] ?? '');
if($this->input['document_email_attachment'] ?? false) { if($this->input['document_email_attachment'] ?? false) {
$this->queueDocuments($query); $this->queueDocuments($query);
} }

View File

@ -74,9 +74,9 @@ class ProductExport extends BaseExport
$query = Product::query() $query = Product::query()
->withTrashed() ->withTrashed()
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){ if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

View File

@ -80,20 +80,20 @@ class ProductSalesExport extends BaseExport
public function filterByProducts($query) public function filterByProducts($query)
{ {
$product_keys = &$this->input['product_key']; $product_keys = &$this->input['product_key'];
if ($product_keys && !empty($this->input['product_key'])) { if ($product_keys && !empty($this->input['product_key'])) {
$keys = explode(",", $product_keys); $keys = explode(",", $product_keys);
$query->where(function ($q) use ($keys){ $query->where(function ($q) use ($keys) {
foreach($keys as $key) { foreach($keys as $key) {
$q->orWhereJsonContains('line_items', ['product_key' => $key]); $q->orWhereJsonContains('line_items', ['product_key' => $key]);
} }
}); });
} }
return $query; return $query;
@ -121,7 +121,7 @@ class ProductSalesExport extends BaseExport
//insert the header //insert the header
$query = Invoice::query() $query = Invoice::query()
->withTrashed() ->withTrashed()
->whereHas('client', function ($q){ ->whereHas('client', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}) })
->where('company_id', $this->company->id) ->where('company_id', $this->company->id)
@ -138,30 +138,29 @@ class ProductSalesExport extends BaseExport
$product_keys = &$this->input['product_key']; $product_keys = &$this->input['product_key'];
if($product_keys){ if($product_keys) {
$product_keys = explode(",", $product_keys); $product_keys = explode(",", $product_keys);
} }
$query->cursor() $query->cursor()
->each(function ($invoice) use($product_keys) { ->each(function ($invoice) use ($product_keys) {
foreach ($invoice->line_items as $item) { foreach ($invoice->line_items as $item) {
if($product_keys) if($product_keys) {
{ if(in_array($item->product_key, $product_keys)) {
if(in_array($item->product_key, $product_keys)) $this->csv->insertOne($this->buildRow($invoice, $item));
$this->csv->insertOne($this->buildRow($invoice, $item)); }
} } else {
else { $this->csv->insertOne($this->buildRow($invoice, $item));
$this->csv->insertOne($this->buildRow($invoice, $item)); }
}
} }
}); });
$grouped = $this->sales->groupBy('product_key')->map(function ($key, $value) use($product_keys){ $grouped = $this->sales->groupBy('product_key')->map(function ($key, $value) use ($product_keys) {
if($product_keys && !in_array($value, $product_keys)){ if($product_keys && !in_array($value, $product_keys)) {
return false; return false;
} }
@ -185,7 +184,8 @@ class ProductSalesExport extends BaseExport
})->reject(function ($value) { })->reject(function ($value) {
return $value === false; return $value === false;
});; });
;
$this->csv->insertOne([]); $this->csv->insertOne([]);
$this->csv->insertOne([]); $this->csv->insertOne([]);

View File

@ -58,12 +58,12 @@ class PurchaseOrderExport extends BaseExport
$query = PurchaseOrder::query() $query = PurchaseOrder::query()
->withTrashed() ->withTrashed()
->with('vendor') ->with('vendor')
->whereHas('vendor', function ($q){ ->whereHas('vendor', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}) })
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){ if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }
@ -72,8 +72,9 @@ class PurchaseOrderExport extends BaseExport
$clients = &$this->input['client_id']; $clients = &$this->input['client_id'];
if($clients) if($clients) {
$query = $this->addClientFilter($query, $clients); $query = $this->addClientFilter($query, $clients);
}
$query = $this->addPurchaseOrderStatusFilter($query, $this->input['status'] ?? ''); $query = $this->addPurchaseOrderStatusFilter($query, $this->input['status'] ?? '');

View File

@ -62,12 +62,12 @@ class PurchaseOrderItemExport extends BaseExport
$query = PurchaseOrder::query() $query = PurchaseOrder::query()
->withTrashed() ->withTrashed()
->whereHas('vendor', function ($q){ ->whereHas('vendor', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}) })
->with('vendor')->where('company_id', $this->company->id); ->with('vendor')->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){ if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

View File

@ -64,12 +64,12 @@ class QuoteExport extends BaseExport
$query = Quote::query() $query = Quote::query()
->withTrashed() ->withTrashed()
->with('client') ->with('client')
->whereHas('client', function ($q){ ->whereHas('client', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}) })
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){ if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

View File

@ -65,12 +65,12 @@ class QuoteItemExport extends BaseExport
$query = Quote::query() $query = Quote::query()
->withTrashed() ->withTrashed()
->whereHas('client', function ($q){ ->whereHas('client', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}) })
->with('client')->where('company_id', $this->company->id); ->with('client')->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){ if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

View File

@ -56,12 +56,12 @@ class RecurringInvoiceExport extends BaseExport
$query = RecurringInvoice::query() $query = RecurringInvoice::query()
->withTrashed() ->withTrashed()
->with('client') ->with('client')
->whereHas('client', function ($q){ ->whereHas('client', function ($q) {
$q->where('is_deleted', false); $q->where('is_deleted', false);
}) })
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){ if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

View File

@ -69,22 +69,24 @@ class TaskExport extends BaseExport
$query = Task::query() $query = Task::query()
->withTrashed() ->withTrashed()
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){ if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }
$query = $this->addDateRange($query); $query = $this->addDateRange($query);
$clients = &$this->input['client_id']; $clients = &$this->input['client_id'];
if($clients) if($clients) {
$query = $this->addClientFilter($query, $clients); $query = $this->addClientFilter($query, $clients);
}
$document_attachments = &$this->input['document_email_attachment']; $document_attachments = &$this->input['document_email_attachment'];
if($document_attachments) if($document_attachments) {
$this->queueDocuments($query); $this->queueDocuments($query);
}
return $query; return $query;
@ -224,7 +226,7 @@ class TaskExport extends BaseExport
} }
} }
/** /**
* Add Task Status Filter * Add Task Status Filter
* *
@ -234,7 +236,7 @@ class TaskExport extends BaseExport
*/ */
protected function addTaskStatusFilter(Builder $query, string $status): Builder protected function addTaskStatusFilter(Builder $query, string $status): Builder
{ {
$status_parameters = explode(',', $status); $status_parameters = explode(',', $status);
if (in_array('all', $status_parameters) || count($status_parameters) == 0) { if (in_array('all', $status_parameters) || count($status_parameters) == 0) {

View File

@ -63,8 +63,8 @@ class VendorExport extends BaseExport
$query = Vendor::query()->with('contacts') $query = Vendor::query()->with('contacts')
->withTrashed() ->withTrashed()
->where('company_id', $this->company->id); ->where('company_id', $this->company->id);
if(!$this->input['include_deleted'] ?? false){ if(!$this->input['include_deleted'] ?? false) {
$query->where('is_deleted', 0); $query->where('is_deleted', 0);
} }

View File

@ -25,7 +25,7 @@ class ContactDecorator implements DecoratorInterface
$contact = $entity->contacts()->first(); $contact = $entity->contacts()->first();
} elseif($entity->client) { } elseif($entity->client) {
$contact = $entity->client->primary_contact->first() ?? $entity->client->contacts()->whereNotNull('email')->first(); $contact = $entity->client->primary_contact->first() ?? $entity->client->contacts()->whereNotNull('email')->first();
} elseif($entity->vendor) { } elseif($entity->vendor) {
$contact = $entity->vendor->primary_contact->first() ?? $entity->vendor->contacts()->whereNotNull('email')->first(); $contact = $entity->vendor->primary_contact->first() ?? $entity->vendor->contacts()->whereNotNull('email')->first();
} }

View File

@ -56,7 +56,7 @@ class CompanyFactory
$company->smtp_port = ''; $company->smtp_port = '';
$company->smtp_username = ''; $company->smtp_username = '';
$company->smtp_verify_peer = true; $company->smtp_verify_peer = true;
return $company; return $company;
} }
} }

View File

@ -24,7 +24,7 @@ class CompanyGatewayFactory
$company_gateway->require_shipping_address = false; $company_gateway->require_shipping_address = false;
$company_gateway->config = encrypt(json_encode(new \stdClass())); $company_gateway->config = encrypt(json_encode(new \stdClass()));
$company_gateway->always_show_required_fields = true; $company_gateway->always_show_required_fields = true;
return $company_gateway; return $company_gateway;
} }
} }

View File

@ -52,7 +52,7 @@ class PurchaseOrderFactory
$purchase_order->exchange_rate = 1; $purchase_order->exchange_rate = 1;
$purchase_order->total_taxes = 0; $purchase_order->total_taxes = 0;
$purchase_order->uses_inclusive_taxes = false; $purchase_order->uses_inclusive_taxes = false;
return $purchase_order; return $purchase_order;
} }
} }

View File

@ -23,7 +23,7 @@ class SubscriptionFactory
$billing_subscription->company_id = $company_id; $billing_subscription->company_id = $company_id;
$billing_subscription->user_id = $user_id; $billing_subscription->user_id = $user_id;
$billing_subscription->steps = collect(Purchase::defaultSteps()) $billing_subscription->steps = collect(Purchase::defaultSteps())
->map(fn($step) => StepService::mapClassNameToString($step)) ->map(fn ($step) => StepService::mapClassNameToString($step))
->implode(','); ->implode(',');
return $billing_subscription; return $billing_subscription;

View File

@ -115,7 +115,7 @@ class BankTransactionFilters extends QueryFilters
return $this->builder; return $this->builder;
} }
/** /**
* Filters the list based on Bank Accounts. * Filters the list based on Bank Accounts.
* *
@ -124,11 +124,12 @@ class BankTransactionFilters extends QueryFilters
*/ */
public function bank_integration_ids(string $ids = ''): Builder public function bank_integration_ids(string $ids = ''): Builder
{ {
if(strlen($ids) == 0) if(strlen($ids) == 0) {
return $this->builder; return $this->builder;
}
$ids = $this->transformKeys(explode(",", $ids)); $ids = $this->transformKeys(explode(",", $ids));
$this->builder->where(function ($query) use ($ids) { $this->builder->where(function ($query) use ($ids) {
$query->whereIn('bank_integration_id', $ids); $query->whereIn('bank_integration_id', $ids);
}); });

View File

@ -160,8 +160,9 @@ class ClientFilters extends QueryFilters
return $this->builder; return $this->builder;
} }
if($sort_col[0] == 'documents') if($sort_col[0] == 'documents') {
return $this->builder; return $this->builder;
}
if ($sort_col[0] == 'display_name') { if ($sort_col[0] == 'display_name') {
$sort_col[0] = 'name'; $sort_col[0] = 'name';

View File

@ -58,10 +58,11 @@ class DesignFilters extends QueryFilters
public function entities(string $entities = ''): Builder public function entities(string $entities = ''): Builder
{ {
if(stripos($entities, 'statement') !== false) if(stripos($entities, 'statement') !== false) {
$entities = 'client'; $entities = 'client';
}
if (strlen($entities) == 0 || str_contains($entities, ',')) { if (strlen($entities) == 0 || str_contains($entities, ',')) {
return $this->builder; return $this->builder;
} }

View File

@ -49,22 +49,22 @@ class DocumentFilters extends QueryFilters
*/ */
public function client_id(string $client_id = ''): Builder public function client_id(string $client_id = ''): Builder
{ {
return $this->builder->where(function ($query) use ($client_id) { return $this->builder->where(function ($query) use ($client_id) {
$query->whereHasMorph('documentable', [ $query->whereHasMorph('documentable', [
\App\Models\Invoice::class, \App\Models\Invoice::class,
\App\Models\Quote::class, \App\Models\Quote::class,
\App\Models\Credit::class, \App\Models\Credit::class,
\App\Models\Expense::class, \App\Models\Expense::class,
\App\Models\Payment::class, \App\Models\Payment::class,
\App\Models\Task::class, \App\Models\Task::class,
\App\Models\RecurringExpense::class, \App\Models\RecurringExpense::class,
\App\Models\RecurringInvoice::class, \App\Models\RecurringInvoice::class,
\App\Models\Project::class, \App\Models\Project::class,
], function ($q2) use ($client_id) { ], function ($q2) use ($client_id) {
$q2->where('client_id', $this->decodePrimaryKey($client_id)); $q2->where('client_id', $this->decodePrimaryKey($client_id));
})->orWhereHasMorph('documentable', [\App\Models\Client::class], function ($q3) use ($client_id) { })->orWhereHasMorph('documentable', [\App\Models\Client::class], function ($q3) use ($client_id) {
$q3->where('id', $this->decodePrimaryKey($client_id)); $q3->where('id', $this->decodePrimaryKey($client_id));
}); });
}); });
@ -74,8 +74,7 @@ class DocumentFilters extends QueryFilters
{ {
$types = explode(',', $types); $types = explode(',', $types);
foreach ($types as $type) foreach ($types as $type) {
{
match($type) { match($type) {
'private' => $this->builder->where('is_public', 0), 'private' => $this->builder->where('is_public', 0),
'public' => $this->builder->where('is_public', 1), 'public' => $this->builder->where('is_public', 1),
@ -87,7 +86,7 @@ class DocumentFilters extends QueryFilters
} }
return $this->builder; return $this->builder;
} }
/** /**
* Sorts the list based on $sort. * Sorts the list based on $sort.

View File

@ -111,8 +111,8 @@ class ExpenseFilters extends QueryFilters
}); });
} }
if(in_array('uncategorized', $status_parameters)){ if(in_array('uncategorized', $status_parameters)) {
$query->orWhere(function ($query){ $query->orWhere(function ($query) {
$query->whereNull('category_id'); $query->whereNull('category_id');
}); });
} }

View File

@ -228,10 +228,9 @@ class InvoiceFilters extends QueryFilters
$date = Carbon::createFromTimestamp((int)$date); $date = Carbon::createFromTimestamp((int)$date);
} else { } else {
try{ try {
$date = Carbon::parse($date); $date = Carbon::parse($date);
} } catch(\Exception $e) {
catch(\Exception $e){
return $this->builder; return $this->builder;
} }
} }
@ -339,7 +338,7 @@ class InvoiceFilters extends QueryFilters
// return $this->builder->orderByRaw('CAST(number AS UNSIGNED), number ' . $dir); // return $this->builder->orderByRaw('CAST(number AS UNSIGNED), number ' . $dir);
// return $this->builder->orderByRaw("number REGEXP '^[A-Za-z]+$',CAST(number as SIGNED INTEGER),CAST(REPLACE(number,'-','')AS SIGNED INTEGER) ,number"); // return $this->builder->orderByRaw("number REGEXP '^[A-Za-z]+$',CAST(number as SIGNED INTEGER),CAST(REPLACE(number,'-','')AS SIGNED INTEGER) ,number");
// return $this->builder->orderByRaw('ABS(number) ' . $dir); // return $this->builder->orderByRaw('ABS(number) ' . $dir);
return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir); return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir);
} }
return $this->builder->orderBy($sort_col[0], $dir); return $this->builder->orderBy($sort_col[0], $dir);

View File

@ -133,7 +133,7 @@ class RecurringInvoiceFilters extends QueryFilters
return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir); return $this->builder->orderByRaw("REGEXP_REPLACE(number,'[^0-9]+','')+0 " . $dir);
} }
if($sort_col[0] == 'next_send_datetime'){ if($sort_col[0] == 'next_send_datetime') {
$sort_col[0] = 'next_send_date'; $sort_col[0] = 'next_send_date';
} }

View File

@ -100,7 +100,7 @@ class Nordigen
} catch (\Exception $e) { } catch (\Exception $e) {
nlog("Nordigen getAccount() failed => {$account_id} => " . $e->getMessage()); nlog("Nordigen getAccount() failed => {$account_id} => " . $e->getMessage());
return false; return false;
} }
@ -151,9 +151,10 @@ class Nordigen
public function disabledAccountEmail(BankIntegration $bank_integration): void public function disabledAccountEmail(BankIntegration $bank_integration): void
{ {
$cache_key = "email_quota:{$bank_integration->company->company_key}:{$bank_integration->id}"; $cache_key = "email_quota:{$bank_integration->company->company_key}:{$bank_integration->id}";
if(Cache::has($cache_key)) if(Cache::has($cache_key)) {
return; return;
}
App::setLocale($bank_integration->company->getLocale()); App::setLocale($bank_integration->company->getLocale());
@ -168,7 +169,7 @@ class Nordigen
$mo->email_template_subject = 'nordigen_requisition_subject'; $mo->email_template_subject = 'nordigen_requisition_subject';
Email::dispatch($mo, $bank_integration->company); Email::dispatch($mo, $bank_integration->company);
Cache::put($cache_key, true, 60 * 60 * 24); Cache::put($cache_key, true, 60 * 60 * 24);
} }

View File

@ -71,7 +71,7 @@ class TransactionTransformer implements BankRevenueInterface
private Company $company; private Company $company;
function __construct(Company $company) public function __construct(Company $company)
{ {
$this->company = $company; $this->company = $company;
} }
@ -192,7 +192,7 @@ class TransactionTransformer implements BankRevenueInterface
} }
try { try {
return Carbon::createFromFormat("d-m-Y", $input)->setTimezone($timezone_name)->format($date_format_default) ?? $input; return Carbon::createFromFormat("d-m-Y", $input)->setTimezone($timezone_name)->format($date_format_default) ?? $input;
} catch (\Exception $e) { } catch (\Exception $e) {
return $input; return $input;
} }

View File

@ -105,7 +105,7 @@ class EpcQrGenerator
return implode("\n", $data); return implode("\n", $data);
} }
// substr("{$this->invoice->number} {$this->invoice->client->number}", 0,139), // substr("{$this->invoice->number} {$this->invoice->client->number}", 0,139),

View File

@ -27,7 +27,7 @@ trait CustomValuer
public function valuerTax($custom_value, $has_custom_invoice_taxes) public function valuerTax($custom_value, $has_custom_invoice_taxes)
{ {
if (isset($custom_value) && is_numeric($custom_value) && $has_custom_invoice_taxes !== false) { if (isset($custom_value) && is_numeric($custom_value) && $has_custom_invoice_taxes !== false) {
return round($custom_value * ($this->invoice->tax_rate1 / 100), 2) + round($custom_value * ($this->invoice->tax_rate2 / 100), 2) + round($custom_value * ($this->invoice->tax_rate3 / 100), 2); return round($custom_value * ($this->invoice->tax_rate1 / 100), 2) + round($custom_value * ($this->invoice->tax_rate2 / 100), 2) + round($custom_value * ($this->invoice->tax_rate3 / 100), 2);
} }
@ -35,17 +35,18 @@ trait CustomValuer
return 0; return 0;
} }
public function multiInclusiveTax($custom_value, $has_custom_invoice_taxes) { public function multiInclusiveTax($custom_value, $has_custom_invoice_taxes)
{
if (isset($custom_value) && is_numeric($custom_value) && $has_custom_invoice_taxes !== false) { if (isset($custom_value) && is_numeric($custom_value) && $has_custom_invoice_taxes !== false) {
$tax = 0; $tax = 0;
$tax += $this->formatValue($custom_value - ($custom_value / (1 + ($this->invoice->tax_rate1 / 100))), 2); $tax += $this->formatValue($custom_value - ($custom_value / (1 + ($this->invoice->tax_rate1 / 100))), 2);
$tax += $this->formatValue($custom_value - ($custom_value / (1 + ($this->invoice->tax_rate2 / 100))), 2); $tax += $this->formatValue($custom_value - ($custom_value / (1 + ($this->invoice->tax_rate2 / 100))), 2);
$tax += $this->formatValue($custom_value - ($custom_value / (1 + ($this->invoice->tax_rate3 / 100))), 2); $tax += $this->formatValue($custom_value - ($custom_value / (1 + ($this->invoice->tax_rate3 / 100))), 2);
return round($tax,2); return round($tax, 2);
} }
return 0; return 0;

View File

@ -182,7 +182,7 @@ class InvoiceItemSum
$class = "App\DataMapper\Tax\\".$this->client->company->country()->iso_3166_2."\\Rule"; $class = "App\DataMapper\Tax\\".$this->client->company->country()->iso_3166_2."\\Rule";
$this->rule = new $class(); $this->rule = new $class();
if($this->rule->regionWithNoTaxCoverage($this->client->country->iso_3166_2)) { if($this->rule->regionWithNoTaxCoverage($this->client->country->iso_3166_2)) {
return $this; return $this;
} }

View File

@ -229,7 +229,7 @@ class InvoiceSum
{ {
// $this->invoice->amount = $this->formatValue($this->getTotal(), $this->precision); // $this->invoice->amount = $this->formatValue($this->getTotal(), $this->precision);
// $this->invoice->total_taxes = $this->getTotalTaxes(); // $this->invoice->total_taxes = $this->getTotalTaxes();
$this->setCalculatedAttributes(); $this->setCalculatedAttributes();
$this->invoice->balance = $this->invoice->amount; $this->invoice->balance = $this->invoice->amount;
$this->invoice->saveQuietly(); $this->invoice->saveQuietly();
@ -245,10 +245,9 @@ class InvoiceSum
*/ */
private function setCalculatedAttributes(): self private function setCalculatedAttributes(): self
{ {
if($this->invoice->status_id == Invoice::STATUS_CANCELLED){ if($this->invoice->status_id == Invoice::STATUS_CANCELLED) {
$this->invoice->balance = 0; $this->invoice->balance = 0;
} } elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
if ($this->invoice->amount != $this->invoice->balance) { if ($this->invoice->amount != $this->invoice->balance) {
$this->invoice->balance = Number::roundValue($this->getTotal(), $this->precision) - $this->invoice->paid_to_date; //21-02-2024 cannot use the calculated $paid_to_date here as it could send the balance backward. $this->invoice->balance = Number::roundValue($this->getTotal(), $this->precision) - $this->invoice->paid_to_date; //21-02-2024 cannot use the calculated $paid_to_date here as it could send the balance backward.
} else { } else {
@ -258,7 +257,7 @@ class InvoiceSum
/* Set new calculated total */ /* Set new calculated total */
$this->invoice->amount = $this->formatValue($this->getTotal(), $this->precision); $this->invoice->amount = $this->formatValue($this->getTotal(), $this->precision);
if($this->rappen_rounding){ if($this->rappen_rounding) {
$this->invoice->amount = $this->roundRappen($this->invoice->amount); $this->invoice->amount = $this->roundRappen($this->invoice->amount);
$this->invoice->balance = $this->roundRappen($this->invoice->balance); $this->invoice->balance = $this->roundRappen($this->invoice->balance);
} }
@ -269,7 +268,7 @@ class InvoiceSum
} }
function roundRappen($value): float public function roundRappen($value): float
{ {
return round($value / .05, 0) * .05; return round($value / .05, 0) * .05;
} }

View File

@ -171,7 +171,7 @@ class InvoiceSumInclusive
$this->total_taxes += $tax; $this->total_taxes += $tax;
$this->total_tax_map[] = ['name' => $this->invoice->tax_name3.' '.floatval($this->invoice->tax_rate3).'%', 'total' => $tax]; $this->total_tax_map[] = ['name' => $this->invoice->tax_name3.' '.floatval($this->invoice->tax_rate3).'%', 'total' => $tax];
} }
return $this; return $this;
} }
@ -279,10 +279,9 @@ class InvoiceSumInclusive
private function setCalculatedAttributes() private function setCalculatedAttributes()
{ {
/* If amount != balance then some money has been paid on the invoice, need to subtract this difference from the total to set the new balance */ /* If amount != balance then some money has been paid on the invoice, need to subtract this difference from the total to set the new balance */
if($this->invoice->status_id == Invoice::STATUS_CANCELLED){ if($this->invoice->status_id == Invoice::STATUS_CANCELLED) {
$this->invoice->balance = 0; $this->invoice->balance = 0;
} } elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
elseif ($this->invoice->status_id != Invoice::STATUS_DRAFT) {
if ($this->invoice->amount != $this->invoice->balance) { if ($this->invoice->amount != $this->invoice->balance) {
$this->invoice->balance = $this->formatValue($this->getTotal(), $this->precision) - $this->invoice->paid_to_date; $this->invoice->balance = $this->formatValue($this->getTotal(), $this->precision) - $this->invoice->paid_to_date;
} else { } else {
@ -302,8 +301,8 @@ class InvoiceSumInclusive
return $this; return $this;
} }
function roundRappen($value): float public function roundRappen($value): float
{ {
return round($value / .05, 0) * .05; return round($value / .05, 0) * .05;
} }
@ -373,7 +372,7 @@ class InvoiceSumInclusive
$this->total_taxes += $total_line_tax; $this->total_taxes += $total_line_tax;
} }
return $this; return $this;
} }

View File

@ -65,18 +65,18 @@ class GmailTransport extends AbstractTransport
$body->setRaw($this->base64_encode($bcc_list.$message->toString())); $body->setRaw($this->base64_encode($bcc_list.$message->toString()));
// try { // try {
$service->users_messages->send('me', $body, []); $service->users_messages->send('me', $body, []);
// } catch(\Google\Service\Exception $e) { // } catch(\Google\Service\Exception $e) {
// /* Need to slow down */ // /* Need to slow down */
// if ($e->getCode() == '429') { // if ($e->getCode() == '429') {
// nlog("429 google - retrying "); // nlog("429 google - retrying ");
// sleep(rand(3,8)); // sleep(rand(3,8));
// try { // try {
// $service->users_messages->send('me', $body, []); // $service->users_messages->send('me', $body, []);
// } catch(\Google\Service\Exception $e) { // } catch(\Google\Service\Exception $e) {
// } // }
// } // }

View File

@ -54,17 +54,17 @@ class Office365MailTransport extends AbstractTransport
->setReturnType(\Microsoft\Graph\Model\Message::class) ->setReturnType(\Microsoft\Graph\Model\Message::class)
->execute(); ->execute();
} catch (\Exception $e) { } catch (\Exception $e) {
sleep(rand(5,10)); sleep(rand(5, 10));
try { try {
$graphMessage = $graph->createRequest('POST', '/users/'.$symfony_message->getFrom()[0]->getAddress().'/sendmail') $graphMessage = $graph->createRequest('POST', '/users/'.$symfony_message->getFrom()[0]->getAddress().'/sendmail')
->attachBody(base64_encode($bcc_list.$message->toString())) ->attachBody(base64_encode($bcc_list.$message->toString()))
->addHeaders(['Content-Type' => 'text/plain']) ->addHeaders(['Content-Type' => 'text/plain'])
->setReturnType(\Microsoft\Graph\Model\Message::class) ->setReturnType(\Microsoft\Graph\Model\Message::class)
->execute(); ->execute();
} catch (\Exception $e) { } catch (\Exception $e) {
} }
} }

View File

@ -166,7 +166,7 @@ class ContactLoginController extends Controller
private function setRedirectPath() private function setRedirectPath()
{ {
if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal_dashboard') === true) { if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal_dashboard') === true) {
$this->redirectTo = '/client/dashboard'; $this->redirectTo = '/client/dashboard';
} elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) { } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) {
$this->redirectTo = '/client/invoices'; $this->redirectTo = '/client/invoices';
} elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) { } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) {

View File

@ -50,7 +50,7 @@ class ContactRegisterController extends Controller
public function register(RegisterRequest $request) public function register(RegisterRequest $request)
{ {
$request->merge(['company' => $request->company()]); $request->merge(['company' => $request->company()]);
$service = new ClientRegisterService( $service = new ClientRegisterService(
company: $request->company(), company: $request->company(),
); );

View File

@ -398,8 +398,8 @@ class LoginController extends BaseController
$truth->setCompany($set_company); $truth->setCompany($set_company);
//21-03-2024 //21-03-2024
$cu->each(function ($cu){ $cu->each(function ($cu) {
if(CompanyToken::where('company_id', $cu->company_id)->where('user_id', $cu->user_id)->where('is_system', true)->doesntExist()){ if(CompanyToken::where('company_id', $cu->company_id)->where('user_id', $cu->user_id)->where('is_system', true)->doesntExist()) {
(new CreateCompanyToken($cu->company, $cu->user, request()->server('HTTP_USER_AGENT')))->handle(); (new CreateCompanyToken($cu->company, $cu->user, request()->server('HTTP_USER_AGENT')))->handle();
} }
}); });

View File

@ -310,7 +310,7 @@ class YodleeController extends BaseController
private function transformSummary($summary): array private function transformSummary($summary): array
{ {
$dto = new \stdClass; $dto = new \stdClass();
$dto->id = $summary['id'] ?? 0; $dto->id = $summary['id'] ?? 0;
$dto->account_type = $summary['CONTAINER'] ?? ''; $dto->account_type = $summary['CONTAINER'] ?? '';

View File

@ -460,7 +460,7 @@ class BaseController extends Controller
} }
}, },
'company.tasks' => function ($query) use ($updated_at, $user) { 'company.tasks' => function ($query) use ($updated_at, $user) {
$query->where('updated_at', '>=', $updated_at)->with('project','documents'); $query->where('updated_at', '>=', $updated_at)->with('project', 'documents');
if (! $user->hasPermission('view_task')) { if (! $user->hasPermission('view_task')) {
$query->whereNested(function ($query) use ($user) { $query->whereNested(function ($query) use ($user) {
@ -798,7 +798,7 @@ class BaseController extends Controller
} }
}, },
'company.tasks' => function ($query) use ($created_at, $user) { 'company.tasks' => function ($query) use ($created_at, $user) {
$query->where('created_at', '>=', $created_at)->with('project.documents','documents'); $query->where('created_at', '>=', $created_at)->with('project.documents', 'documents');
if (! $user->hasPermission('view_task')) { if (! $user->hasPermission('view_task')) {
$query->whereNested(function ($query) use ($user) { $query->whereNested(function ($query) use ($user) {
@ -995,7 +995,7 @@ class BaseController extends Controller
$response_data = Statics::company($user->getCompany()->getLocale()); $response_data = Statics::company($user->getCompany()->getLocale());
if(request()->has('einvoice')){ if(request()->has('einvoice')) {
$ro = new Schema(); $ro = new Schema();
$response_data['einvoice_schema'] = $ro('Peppol'); $response_data['einvoice_schema'] = $ro('Peppol');
@ -1003,7 +1003,7 @@ class BaseController extends Controller
} }
$response['static'] = $response_data; $response['static'] = $response_data;
} }
} }

View File

@ -250,22 +250,22 @@ class ClientController extends BaseController
return response()->json(['message' => $hash_or_response], 200); return response()->json(['message' => $hash_or_response], 200);
} }
if($action == 'assign_group' && $user->can('edit', $clients->first())){ if($action == 'assign_group' && $user->can('edit', $clients->first())) {
$this->client_repo->assignGroup($clients, $request->group_settings_id); $this->client_repo->assignGroup($clients, $request->group_settings_id);
return $this->listResponse(Client::query()->withTrashed()->company()->whereIn('id', $request->ids)); return $this->listResponse(Client::query()->withTrashed()->company()->whereIn('id', $request->ids));
} }
if($action == 'bulk_update' && $user->can('edit', $clients->first())){ if($action == 'bulk_update' && $user->can('edit', $clients->first())) {
$clients = Client::withTrashed() $clients = Client::withTrashed()
->company() ->company()
->whereIn('id', $request->ids); ->whereIn('id', $request->ids);
$this->client_repo->bulkUpdate($clients, $request->column, $request->new_value); $this->client_repo->bulkUpdate($clients, $request->column, $request->new_value);
return $this->listResponse(Client::query()->withTrashed()->company()->whereIn('id', $request->ids)); return $this->listResponse(Client::query()->withTrashed()->company()->whereIn('id', $request->ids));
} }
@ -351,9 +351,10 @@ class ClientController extends BaseController
return response()->json(['message' => "Client not found"], 400); return response()->json(['message' => "Client not found"], 400);
} }
if($m_client->id == $client->id) if($m_client->id == $client->id) {
return response()->json(['message' => "Attempting to merge the same client is not possible."], 400); return response()->json(['message' => "Attempting to merge the same client is not possible."], 400);
}
$merged_client = $client->service()->merge($m_client)->save(); $merged_client = $client->service()->merge($m_client)->save();
return $this->itemResponse($merged_client); return $this->itemResponse($merged_client);

View File

@ -21,7 +21,7 @@ class DashboardController extends Controller
{ {
if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal_dashboard') === false) { if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal_dashboard') === false) {
return redirect()->route('client.invoices.index'); return redirect()->route('client.invoices.index');
} }
$total_invoices = Invoice::withTrashed() $total_invoices = Invoice::withTrashed()
->where('client_id', auth()->guard('contact')->user()->client_id) ->where('client_id', auth()->guard('contact')->user()->client_id)

View File

@ -108,7 +108,7 @@ class PrePaymentController extends Controller
return $invoice; return $invoice;
}); });
$variables = false; $variables = false;
if(($invitation = $invoices->first()->invitations()->first() ?? false) && $invoice->client->getSetting('show_accept_invoice_terms')) { if(($invitation = $invoices->first()->invitations()->first() ?? false) && $invoice->client->getSetting('show_accept_invoice_terms')) {

View File

@ -178,7 +178,7 @@ class QuoteController extends Controller
->where('client_id', auth()->guard('contact')->user()->client->id) ->where('client_id', auth()->guard('contact')->user()->client->id)
->where('company_id', auth()->guard('contact')->user()->client->company_id) ->where('company_id', auth()->guard('contact')->user()->client->company_id)
->whereIn('status_id', [Quote::STATUS_DRAFT, Quote::STATUS_SENT]) ->whereIn('status_id', [Quote::STATUS_DRAFT, Quote::STATUS_SENT])
->where(function ($q){ ->where(function ($q) {
$q->whereNull('due_date')->orWhere('due_date', '>=', now()); $q->whereNull('due_date')->orWhere('due_date', '>=', now());
}) })
->withTrashed() ->withTrashed()

View File

@ -715,18 +715,16 @@ class CompanyController extends BaseController
$logo = strlen($company->settings->company_logo) > 5 ? $company->settings->company_logo : 'https://pdf.invoicing.co/favicon-v2.png'; $logo = strlen($company->settings->company_logo) > 5 ? $company->settings->company_logo : 'https://pdf.invoicing.co/favicon-v2.png';
$headers = ['Content-Disposition' => 'inline']; $headers = ['Content-Disposition' => 'inline'];
try{ try {
$response = \Illuminate\Support\Facades\Http::get($logo); $response = \Illuminate\Support\Facades\Http::get($logo);
if ($response->successful()) { if ($response->successful()) {
$logo = $response->body(); $logo = $response->body();
} } else {
else {
$logo = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII='); $logo = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=');
} }
} } catch(\Exception $e) {
catch(\Exception $e){
$logo = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII='); $logo = base64_decode('iVBORw0KGgoAAAANSUhEUgAAAAEAAAABCAQAAAC1HAwCAAAAC0lEQVR42mNkYAAAAAYAAjCB0C8AAAAASUVORK5CYII=');

View File

@ -232,7 +232,7 @@ class CompanyGatewayController extends BaseController
} elseif($company_gateway->gateway_key == $this->checkout_key) { } elseif($company_gateway->gateway_key == $this->checkout_key) {
CheckoutSetupWebhook::dispatch($company_gateway->company->company_key, $company_gateway->id); CheckoutSetupWebhook::dispatch($company_gateway->company->company_key, $company_gateway->id);
} elseif($company_gateway->gateway_key == $this->forte_key) { } elseif($company_gateway->gateway_key == $this->forte_key) {
dispatch(function () use ($company_gateway) { dispatch(function () use ($company_gateway) {
MultiDB::setDb($company_gateway->company->db); MultiDB::setDb($company_gateway->company->db);
$company_gateway->driver()->updateFees(); $company_gateway->driver()->updateFees();
@ -420,8 +420,8 @@ class CompanyGatewayController extends BaseController
if($company_gateway->gateway_key == $this->checkout_key) { if($company_gateway->gateway_key == $this->checkout_key) {
CheckoutSetupWebhook::dispatch($company_gateway->company->company_key, $company_gateway->fresh()->id); CheckoutSetupWebhook::dispatch($company_gateway->company->company_key, $company_gateway->fresh()->id);
}elseif($company_gateway->gateway_key == $this->forte_key){ } elseif($company_gateway->gateway_key == $this->forte_key) {
dispatch(function () use ($company_gateway) { dispatch(function () use ($company_gateway) {
MultiDB::setDb($company_gateway->company->db); MultiDB::setDb($company_gateway->company->db);
$company_gateway->driver()->updateFees(); $company_gateway->driver()->updateFees();
@ -565,12 +565,13 @@ class CompanyGatewayController extends BaseController
public function importCustomers(TestCompanyGatewayRequest $request, CompanyGateway $company_gateway) public function importCustomers(TestCompanyGatewayRequest $request, CompanyGateway $company_gateway)
{ {
//Throttle here
if (Cache::has("throttle_polling:import_customers:{$company_gateway->company->company_key}:{$company_gateway->hashed_id}"))
return response()->json(['message' => 'Please wait whilst your previous attempts complete.'], 200);
dispatch(function () use($company_gateway) { //Throttle here
if (Cache::has("throttle_polling:import_customers:{$company_gateway->company->company_key}:{$company_gateway->hashed_id}")) {
return response()->json(['message' => 'Please wait whilst your previous attempts complete.'], 200);
}
dispatch(function () use ($company_gateway) {
MultiDB::setDb($company_gateway->company->db); MultiDB::setDb($company_gateway->company->db);
$company_gateway->driver()->importCustomers(); $company_gateway->driver()->importCustomers();
})->afterResponse(); })->afterResponse();

View File

@ -276,7 +276,7 @@ class ImportController extends Controller
return $data; return $data;
} }
/** /**
* Returns the best delimiter * Returns the best delimiter
@ -302,7 +302,7 @@ class ImportController extends Controller
} }
} }
/** @phpstan-ignore-next-line **/ /** @phpstan-ignore-next-line **/
return $bestDelimiter ?? ','; return $bestDelimiter ?? ',';

View File

@ -64,11 +64,11 @@ class LogoutController extends BaseController
->tokens() ->tokens()
->where('is_system', true) ->where('is_system', true)
->cursor() ->cursor()
->each(function ($ct){ ->each(function ($ct) {
$ct->token = \Illuminate\Support\Str::random(64); $ct->token = \Illuminate\Support\Str::random(64);
$ct->save(); $ct->save();
}); });
return response()->json(['message' => 'All tokens deleted'], 200); return response()->json(['message' => 'All tokens deleted'], 200);
} }
} }

View File

@ -146,8 +146,7 @@ class PreviewController extends BaseController
if (request()->has('entity') && if (request()->has('entity') &&
request()->has('entity_id') && request()->has('entity_id') &&
! empty(request()->input('entity')) && ! empty(request()->input('entity')) &&
! empty(request()->input('entity_id'))) ! empty(request()->input('entity_id'))) {
{
$design_object = json_decode(json_encode(request()->input('design'))); $design_object = json_decode(json_encode(request()->input('design')));
@ -172,10 +171,9 @@ class PreviewController extends BaseController
App::setLocale($entity_obj->client->preferredLocale()); App::setLocale($entity_obj->client->preferredLocale());
$t->replace(Ninja::transformTranslations($entity_obj->client->getMergedSettings())); $t->replace(Ninja::transformTranslations($entity_obj->client->getMergedSettings()));
if($entity_obj->client){ if($entity_obj->client) {
$html = new HtmlEngine($entity_obj->invitations()->first()); $html = new HtmlEngine($entity_obj->invitations()->first());
} } else {
else {
$html = new VendorHtmlEngine($entity_obj->invitations()->first()); $html = new VendorHtmlEngine($entity_obj->invitations()->first());
} }

View File

@ -66,8 +66,7 @@ class TaskReportController extends BaseController
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) if ($request->has('send_email') && $request->get('send_email') && $request->missing('output')) {
{
SendToAdmin::dispatch($user->company(), $request->all(), TaskExport::class, $this->filename); SendToAdmin::dispatch($user->company(), $request->all(), TaskExport::class, $this->filename);
return response()->json(['message' => 'working...'], 200); return response()->json(['message' => 'working...'], 200);

View File

@ -62,8 +62,9 @@ class SelfUpdateController extends BaseController
$file_headers = @get_headers($this->getDownloadUrl()); $file_headers = @get_headers($this->getDownloadUrl());
if(!is_array($file_headers)) if(!is_array($file_headers)) {
return response()->json(['message' => 'There was a problem reaching the update server, please try again in a little while.'], 410); return response()->json(['message' => 'There was a problem reaching the update server, please try again in a little while.'], 410);
}
if (stripos($file_headers[0], "404 Not Found") > 0 || (stripos($file_headers[0], "302 Found") > 0 && stripos($file_headers[7], "404 Not Found") > 0)) { if (stripos($file_headers[0], "404 Not Found") > 0 || (stripos($file_headers[0], "302 Found") > 0 && stripos($file_headers[7], "404 Not Found") > 0)) {
return response()->json(['message' => 'Download not yet available. Please try again shortly.'], 410); return response()->json(['message' => 'Download not yet available. Please try again shortly.'], 410);
@ -100,8 +101,9 @@ class SelfUpdateController extends BaseController
} }
} }
if(Storage::disk('base')->directoryExists('resources/lang')) if(Storage::disk('base')->directoryExists('resources/lang')) {
Storage::disk('base')->deleteDirectory('resources/lang'); Storage::disk('base')->deleteDirectory('resources/lang');
}
nlog('Removing cache files'); nlog('Removing cache files');

View File

@ -18,7 +18,6 @@ use Illuminate\Support\Facades\Mail;
class SmtpController extends BaseController class SmtpController extends BaseController
{ {
public function __construct() public function __construct()
{ {
parent::__construct(); parent::__construct();
@ -51,7 +50,7 @@ class SmtpController extends BaseController
'timeout' => 5, 'timeout' => 5,
], ],
]); ]);
(new \Illuminate\Mail\MailServiceProvider(app()))->register(); (new \Illuminate\Mail\MailServiceProvider(app()))->register();
try { try {
@ -60,7 +59,7 @@ class SmtpController extends BaseController
$sending_user = (isset($company->settings->email_from_name) && strlen($company->settings->email_from_name) > 2) ? $company->settings->email_from_name : $user->name(); $sending_user = (isset($company->settings->email_from_name) && strlen($company->settings->email_from_name) > 2) ? $company->settings->email_from_name : $user->name();
$mailable = new TestMailServer('Email Server Works!', $sending_email); $mailable = new TestMailServer('Email Server Works!', $sending_email);
$mailable->from($sending_email,$sending_user); $mailable->from($sending_email, $sending_user);
Mail::mailer('smtp') Mail::mailer('smtp')
->to($user->email, $user->present()->name()) ->to($user->email, $user->present()->name())
@ -68,7 +67,7 @@ class SmtpController extends BaseController
} catch (\Exception $e) { } catch (\Exception $e) {
app('mail.manager')->forgetMailers(); app('mail.manager')->forgetMailers();
return response()->json(['message' => $e->getMessage()], 400); return response()->json(['message' => $e->getMessage()], 400);
} }
app('mail.manager')->forgetMailers(); app('mail.manager')->forgetMailers();
@ -77,4 +76,4 @@ class SmtpController extends BaseController
} }
} }

View File

@ -59,11 +59,11 @@ class StaticController extends BaseController
$response_data = Statics::company($user->getLocale() ?? $user->company()->getLocale()); $response_data = Statics::company($user->getLocale() ?? $user->company()->getLocale());
if(request()->has('einvoice')){ if(request()->has('einvoice')) {
$schema = new Schema(); $schema = new Schema();
$response_data['einvoice_schema'] = $schema('Peppol'); $response_data['einvoice_schema'] = $schema('Peppol');
} }
return response()->json($response_data, 200, ['Content-type' => 'application/json; charset=utf-8'], JSON_PRETTY_PRINT); return response()->json($response_data, 200, ['Content-type' => 'application/json; charset=utf-8'], JSON_PRETTY_PRINT);

View File

@ -64,7 +64,7 @@ class StripeConnectController extends BaseController
if ($request->has('error') && $request->error == 'access_denied') { if ($request->has('error') && $request->error == 'access_denied') {
return view('auth.connect.access_denied'); return view('auth.connect.access_denied');
} }
$response = false; $response = false;
try { try {
@ -91,7 +91,7 @@ class StripeConnectController extends BaseController
} catch (\Exception $e) { } catch (\Exception $e) {
} }
if(!$response) { if(!$response) {
@ -154,7 +154,7 @@ class StripeConnectController extends BaseController
//response here //response here
return view('auth.connect.completed', ['url' => $redirect_uri]); return view('auth.connect.completed', ['url' => $redirect_uri]);
} }
} }

View File

@ -21,10 +21,10 @@ class SubscriptionStepsController extends BaseController
public function index(): JsonResponse public function index(): JsonResponse
{ {
$dependencies = collect(Purchase::$dependencies) $dependencies = collect(Purchase::$dependencies)
->map(fn($dependency) => [ ->map(fn ($dependency) => [
'id' => $dependency['id'], 'id' => $dependency['id'],
'dependencies' => collect($dependency['dependencies']) 'dependencies' => collect($dependency['dependencies'])
->map(fn($dependency) => Purchase::$dependencies[$dependency]['id']) ->map(fn ($dependency) => Purchase::$dependencies[$dependency]['id'])
->toArray(), ->toArray(),
]) ])
->toArray(); ->toArray();

View File

@ -72,7 +72,7 @@ class TwoFactorController extends BaseController
return response()->json(['message' => ctrans('texts.enabled_two_factor')], 200); return response()->json(['message' => ctrans('texts.enabled_two_factor')], 200);
} elseif (! $secret || ! $google2fa->verifyKey($secret, $oneTimePassword)) { } elseif (! $secret || ! $google2fa->verifyKey($secret, $oneTimePassword)) {
return response()->json(['message' => ctrans('texts.invalid_one_time_password')], 400); return response()->json(['message' => ctrans('texts.invalid_one_time_password')], 400);
}elseif (! $user->phone) { } elseif (! $user->phone) {
return response()->json(['message' => ctrans('texts.set_phone_for_two_factor')], 400); return response()->json(['message' => ctrans('texts.set_phone_for_two_factor')], 400);
} elseif (! $user->isVerified()) { } elseif (! $user->isVerified()) {
return response()->json(['message' => 'Please confirm your account first'], 400); return response()->json(['message' => 'Please confirm your account first'], 400);

View File

@ -260,7 +260,7 @@ class UserController extends BaseController
/** @var \App\Models\User $logged_in_user */ /** @var \App\Models\User $logged_in_user */
$logged_in_user = auth()->user(); $logged_in_user = auth()->user();
$company_user = CompanyUser::where('user_id',$user->id) $company_user = CompanyUser::where('user_id', $user->id)
->where('company_id', $logged_in_user->companyId()) ->where('company_id', $logged_in_user->companyId())
->withTrashed() ->withTrashed()
->first(); ->first();

View File

@ -162,7 +162,7 @@ class ContactKeyLogin
private function setRedirectPath() private function setRedirectPath()
{ {
if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal_dashboard') === true) { if (auth()->guard('contact')->user()->client->getSetting('enable_client_portal_dashboard') === true) {
return '/client/dashboard'; return '/client/dashboard';
} elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) { } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_INVOICES) {
return '/client/invoices'; return '/client/invoices';
} elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) { } elseif (auth()->guard('contact')->user()->company->enabled_modules & PortalComposer::MODULE_RECURRING_INVOICES) {

View File

@ -78,13 +78,11 @@ class QueryLogging
if ($request->hasHeader('X-CLIENT-PLATFORM')) { if ($request->hasHeader('X-CLIENT-PLATFORM')) {
$platform = $request->header('X-CLIENT-PLATFORM'); $platform = $request->header('X-CLIENT-PLATFORM');
} } elseif($request->hasHeader('X-React')) {
elseif($request->hasHeader('X-React')){
$platform = 'react'; $platform = 'react';
} }
if ($request->hasHeader('X-CLIENT-VERSION')) if ($request->hasHeader('X-CLIENT-VERSION')) {
{
$client_version = $request->header('X-CLIENT-VERSION'); $client_version = $request->header('X-CLIENT-VERSION');
} }

View File

@ -55,7 +55,7 @@ class StoreBankTransactionRequest extends Request
$input['bank_integration_id'] = $this->decodePrimaryKey($input['bank_integration_id']); $input['bank_integration_id'] = $this->decodePrimaryKey($input['bank_integration_id']);
} }
$this->replace($input); $this->replace($input);
} }
} }

View File

@ -18,7 +18,7 @@ use Illuminate\Validation\Rule;
class BulkClientRequest extends Request class BulkClientRequest extends Request
{ {
use MakesHash; use MakesHash;
/** /**
* Determine if the user is authorized to make this request. * Determine if the user is authorized to make this request.
* *

View File

@ -48,8 +48,7 @@ class StoreClientRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
} } else {
else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }
@ -133,11 +132,9 @@ class StoreClientRequest extends Request
} else { } else {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id; $input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
} }
} } elseif (! array_key_exists('currency_id', $input['settings'])) {
elseif (! array_key_exists('currency_id', $input['settings'])) {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id; $input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
} } elseif (empty($input['settings']['currency_id']) ?? true) {
elseif (empty($input['settings']['currency_id']) ?? true) {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id; $input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
} }

View File

@ -105,8 +105,7 @@ class UpdateClientRequest extends Request
/* If the user removes the currency we must always set the default */ /* If the user removes the currency we must always set the default */
if (array_key_exists('settings', $input) && ! array_key_exists('currency_id', $input['settings'])) { if (array_key_exists('settings', $input) && ! array_key_exists('currency_id', $input['settings'])) {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id; $input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
} } elseif (empty($input['settings']['currency_id']) ?? true) {
elseif (empty($input['settings']['currency_id']) ?? true) {
$input['settings']['currency_id'] = (string) $user->company()->settings->currency_id; $input['settings']['currency_id'] = (string) $user->company()->settings->currency_id;
} }

View File

@ -59,7 +59,7 @@ class StoreCompanyRequest extends Request
$rules['smtp_host'] = 'sometimes|string|nullable'; $rules['smtp_host'] = 'sometimes|string|nullable';
$rules['smtp_port'] = 'sometimes|integer|nullable'; $rules['smtp_port'] = 'sometimes|integer|nullable';
$rules['smtp_encryption'] = 'sometimes|string'; $rules['smtp_encryption'] = 'sometimes|string';
$rules['smtp_local_domain'] = 'sometimes|string|nullable'; $rules['smtp_local_domain'] = 'sometimes|string|nullable';
$rules['smtp_encryption'] = 'sometimes|string|nullable'; $rules['smtp_encryption'] = 'sometimes|string|nullable';
$rules['smtp_local_domain'] = 'sometimes|string|nullable'; $rules['smtp_local_domain'] = 'sometimes|string|nullable';
@ -100,8 +100,9 @@ class StoreCompanyRequest extends Request
$input['smtp_port'] = (int) $input['smtp_port']; $input['smtp_port'] = (int) $input['smtp_port'];
} }
if(isset($input['smtp_verify_peer']) && is_string($input['smtp_verify_peer'])) if(isset($input['smtp_verify_peer']) && is_string($input['smtp_verify_peer'])) {
$input['smtp_verify_peer'] == 'true' ? true : false; $input['smtp_verify_peer'] == 'true' ? true : false;
}
$this->replace($input); $this->replace($input);
} }

View File

@ -64,7 +64,7 @@ class UpdateCompanyRequest extends Request
$rules['smtp_local_domain'] = 'sometimes|string|nullable'; $rules['smtp_local_domain'] = 'sometimes|string|nullable';
// $rules['smtp_verify_peer'] = 'sometimes|string'; // $rules['smtp_verify_peer'] = 'sometimes|string';
if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) { if (isset($input['portal_mode']) && ($input['portal_mode'] == 'domain' || $input['portal_mode'] == 'iframe')) {
$rules['portal_domain'] = 'bail|nullable|sometimes|url'; $rules['portal_domain'] = 'bail|nullable|sometimes|url';
} }
@ -97,14 +97,14 @@ class UpdateCompanyRequest extends Request
unset($input['e_invoice_certificate_passphrase']); unset($input['e_invoice_certificate_passphrase']);
} }
if(isset($input['smtp_username']) && strlen(str_replace("*","", $input['smtp_username'])) < 2) { if(isset($input['smtp_username']) && strlen(str_replace("*", "", $input['smtp_username'])) < 2) {
unset($input['smtp_username']); unset($input['smtp_username']);
} }
if(isset($input['smtp_password']) && strlen(str_replace("*", "", $input['smtp_password'])) < 2) { if(isset($input['smtp_password']) && strlen(str_replace("*", "", $input['smtp_password'])) < 2) {
unset($input['smtp_password']); unset($input['smtp_password']);
} }
if(isset($input['smtp_port'])) { if(isset($input['smtp_port'])) {
$input['smtp_port'] = (int)$input['smtp_port']; $input['smtp_port'] = (int)$input['smtp_port'];
} }
@ -145,8 +145,9 @@ class UpdateCompanyRequest extends Request
$settings['email_style_custom'] = str_replace(['{!!','!!}','{{','}}','@checked','@dd', '@dump', '@if', '@if(','@endif','@isset','@unless','@auth','@empty','@guest','@env','@section','@switch', '@foreach', '@while', '@include', '@each', '@once', '@push', '@use', '@forelse', '@verbatim', '<?php', '@php', '@for','@class','</sc','<sc','html;base64', '@elseif', '@else', '@endunless', '@endisset', '@endempty', '@endauth', '@endguest', '@endproduction', '@endenv', '@hasSection', '@endhasSection', '@sectionMissing', '@endsectionMissing', '@endfor', '@endforeach', '@empty', '@endforelse', '@endwhile', '@continue', '@break', '@includeIf', '@includeWhen', '@includeUnless', '@includeFirst', '@component', '@endcomponent', '@endsection', '@yield', '@show', '@append', '@overwrite', '@stop', '@extends', '@endpush', '@stack', '@prepend', '@endprepend', '@slot', '@endslot', '@endphp', '@method', '@csrf', '@error', '@enderror', '@json', '@endverbatim', '@inject'], '', $settings['email_style_custom']); $settings['email_style_custom'] = str_replace(['{!!','!!}','{{','}}','@checked','@dd', '@dump', '@if', '@if(','@endif','@isset','@unless','@auth','@empty','@guest','@env','@section','@switch', '@foreach', '@while', '@include', '@each', '@once', '@push', '@use', '@forelse', '@verbatim', '<?php', '@php', '@for','@class','</sc','<sc','html;base64', '@elseif', '@else', '@endunless', '@endisset', '@endempty', '@endauth', '@endguest', '@endproduction', '@endenv', '@hasSection', '@endhasSection', '@sectionMissing', '@endsectionMissing', '@endfor', '@endforeach', '@empty', '@endforelse', '@endwhile', '@continue', '@break', '@includeIf', '@includeWhen', '@includeUnless', '@includeFirst', '@component', '@endcomponent', '@endsection', '@yield', '@show', '@append', '@overwrite', '@stop', '@extends', '@endpush', '@stack', '@prepend', '@endprepend', '@slot', '@endslot', '@endphp', '@method', '@csrf', '@error', '@enderror', '@json', '@endverbatim', '@inject'], '', $settings['email_style_custom']);
} }
if(isset($settings['company_logo']) && strlen($settings['company_logo']) > 2) if(isset($settings['company_logo']) && strlen($settings['company_logo']) > 2) {
$settings['company_logo'] = $this->forceScheme($settings['company_logo']); $settings['company_logo'] = $this->forceScheme($settings['company_logo']);
}
if (! $account->isFreeHostedClient()) { if (! $account->isFreeHostedClient()) {
return $settings; return $settings;
@ -173,7 +174,8 @@ class UpdateCompanyRequest extends Request
return rtrim($url, '/'); return rtrim($url, '/');
} }
private function forceScheme($url){ private function forceScheme($url)
{
return stripos($url, 'http') !== false ? $url : "https://{$url}"; return stripos($url, 'http') !== false ? $url : "https://{$url}";
} }

View File

@ -40,8 +40,9 @@ class UpdateCompanyUserRequest extends Request
{ {
$input = $this->all(); $input = $this->all();
if(isset($input['company_user']['user'])) if(isset($input['company_user']['user'])) {
unset($input['company_user']['user']); unset($input['company_user']['user']);
}
$this->replace($input); $this->replace($input);
} }

View File

@ -50,7 +50,7 @@ class StoreCreditRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }
@ -78,7 +78,7 @@ class StoreCreditRequest extends Request
$rules['exchange_rate'] = 'bail|sometimes|numeric'; $rules['exchange_rate'] = 'bail|sometimes|numeric';
$rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999']; $rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
$rules['date'] = 'bail|sometimes|date:Y-m-d'; $rules['date'] = 'bail|sometimes|date:Y-m-d';
if ($this->invoice_id) { if ($this->invoice_id) {
$rules['invoice_id'] = new ValidInvoiceCreditRule(); $rules['invoice_id'] = new ValidInvoiceCreditRule();

View File

@ -52,7 +52,7 @@ class UpdateCreditRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

View File

@ -62,7 +62,7 @@ class UpdateExpenseRequest extends Request
public function prepareForValidation() public function prepareForValidation()
{ {
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();

View File

@ -47,7 +47,7 @@ class StoreInvoiceRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }
@ -80,7 +80,7 @@ class StoreInvoiceRequest extends Request
$rules['partial'] = 'bail|sometimes|nullable|numeric|gte:0'; $rules['partial'] = 'bail|sometimes|nullable|numeric|gte:0';
$rules['partial_due_date'] = ['bail', 'sometimes', 'exclude_if:partial,0', Rule::requiredIf(fn () => $this->partial > 0), 'date']; $rules['partial_due_date'] = ['bail', 'sometimes', 'exclude_if:partial,0', Rule::requiredIf(fn () => $this->partial > 0), 'date'];
$rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999']; $rules['amount'] = ['sometimes', 'bail', 'numeric', 'max:99999999999999'];
// $rules['amount'] = ['sometimes', 'bail', 'max:99999999999999']; // $rules['amount'] = ['sometimes', 'bail', 'max:99999999999999'];
// $rules['due_date'] = ['bail', 'sometimes', 'nullable', 'after:partial_due_date', Rule::requiredIf(fn () => strlen($this->partial_due_date) > 1), 'date']; // $rules['due_date'] = ['bail', 'sometimes', 'nullable', 'after:partial_due_date', Rule::requiredIf(fn () => strlen($this->partial_due_date) > 1), 'date'];
@ -122,8 +122,9 @@ class StoreInvoiceRequest extends Request
if((isset($input['partial_due_date']) && strlen($input['partial_due_date']) > 1) && (!array_key_exists('due_date', $input) || (empty($input['due_date']) && empty($this->invoice->due_date)))) { if((isset($input['partial_due_date']) && strlen($input['partial_due_date']) > 1) && (!array_key_exists('due_date', $input) || (empty($input['due_date']) && empty($this->invoice->due_date)))) {
$client = \App\Models\Client::withTrashed()->find($input['client_id']); $client = \App\Models\Client::withTrashed()->find($input['client_id']);
if($client) if($client) {
$input['due_date'] = \Illuminate\Support\Carbon::parse($input['date'])->addDays($client->getSetting('payment_terms'))->format('Y-m-d'); $input['due_date'] = \Illuminate\Support\Carbon::parse($input['date'])->addDays($client->getSetting('payment_terms'))->format('Y-m-d');
}
} }
$this->replace($input); $this->replace($input);

View File

@ -49,7 +49,7 @@ class UpdateInvoiceRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

View File

@ -45,8 +45,9 @@ class ConnectNordigenBankIntegrationRequest extends Request
$context = $this->getTokenContent(); $context = $this->getTokenContent();
if(isset($context['institution_id'])) if(isset($context['institution_id'])) {
$input['institution_id'] = $context['institution_id']; $input['institution_id'] = $context['institution_id'];
}
$input["redirect"] = isset($context["is_react"]) && $context['is_react'] ? config('ninja.react_url') . "/#/settings/bank_accounts" : config('ninja.app_url'); $input["redirect"] = isset($context["is_react"]) && $context['is_react'] ? config('ninja.react_url') . "/#/settings/bank_accounts" : config('ninja.app_url');

View File

@ -44,11 +44,11 @@ class StorePaymentRequest extends Request
$user = auth()->user(); $user = auth()->user();
$rules = [ $rules = [
'client_id' => ['bail','required',Rule::exists('clients','id')->where('company_id',$user->company()->id)->where('is_deleted', 0)], 'client_id' => ['bail','required',Rule::exists('clients', 'id')->where('company_id', $user->company()->id)->where('is_deleted', 0)],
'invoices' => ['bail','sometimes', 'nullable', 'array', new ValidPayableInvoicesRule()], 'invoices' => ['bail','sometimes', 'nullable', 'array', new ValidPayableInvoicesRule()],
'invoices.*.amount' => ['bail','required'], 'invoices.*.amount' => ['bail','required'],
'invoices.*.invoice_id' => ['bail','required','distinct', new ValidInvoicesRules($this->all()),Rule::exists('invoices','id')->where('company_id', $user->company()->id)->where('client_id', $this->client_id)], 'invoices.*.invoice_id' => ['bail','required','distinct', new ValidInvoicesRules($this->all()),Rule::exists('invoices', 'id')->where('company_id', $user->company()->id)->where('client_id', $this->client_id)],
'credits.*.credit_id' => ['bail','required','distinct', new ValidCreditsRules($this->all()),Rule::exists('credits','id')->where('company_id', $user->company()->id)->where('client_id', $this->client_id)], 'credits.*.credit_id' => ['bail','required','distinct', new ValidCreditsRules($this->all()),Rule::exists('credits', 'id')->where('company_id', $user->company()->id)->where('client_id', $this->client_id)],
'credits.*.amount' => ['bail','required', new CreditsSumRule($this->all())], 'credits.*.amount' => ['bail','required', new CreditsSumRule($this->all())],
'amount' => ['bail', 'numeric', new PaymentAmountsBalanceRule(), 'max:99999999999999'], 'amount' => ['bail', 'numeric', new PaymentAmountsBalanceRule(), 'max:99999999999999'],
'number' => ['bail', 'nullable', Rule::unique('payments')->where('company_id', $user->company()->id)], 'number' => ['bail', 'nullable', Rule::unique('payments')->where('company_id', $user->company()->id)],
@ -59,7 +59,7 @@ class StorePaymentRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

View File

@ -40,14 +40,14 @@ class UpdatePaymentRequest extends Request
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
$rules = [ $rules = [
'client_id' => ['sometimes', 'bail', Rule::in([$this->payment->client_id])], 'client_id' => ['sometimes', 'bail', Rule::in([$this->payment->client_id])],
'number' => ['sometimes', 'bail', Rule::unique('payments')->where('company_id', $user->company()->id)->ignore($this->payment->id)], 'number' => ['sometimes', 'bail', Rule::unique('payments')->where('company_id', $user->company()->id)->ignore($this->payment->id)],
'invoices' => ['sometimes', 'bail', 'nullable', 'array', new PaymentAppliedValidAmount($this->all())], 'invoices' => ['sometimes', 'bail', 'nullable', 'array', new PaymentAppliedValidAmount($this->all())],
'invoices.*.invoice_id' => ['sometimes','distinct',Rule::exists('invoices','id')->where('company_id', $user->company()->id)->where('client_id', $this->payment->client_id)], 'invoices.*.invoice_id' => ['sometimes','distinct',Rule::exists('invoices', 'id')->where('company_id', $user->company()->id)->where('client_id', $this->payment->client_id)],
'invoices.*.amount' => ['sometimes','numeric','min:0'], 'invoices.*.amount' => ['sometimes','numeric','min:0'],
'credits.*.credit_id' => ['sometimes','bail','distinct',Rule::exists('credits','id')->where('company_id', $user->company()->id)->where('client_id', $this->payment->client_id)], 'credits.*.credit_id' => ['sometimes','bail','distinct',Rule::exists('credits', 'id')->where('company_id', $user->company()->id)->where('client_id', $this->payment->client_id)],
'credits.*.amount' => ['required', 'bail'], 'credits.*.amount' => ['required', 'bail'],
]; ];
@ -55,7 +55,7 @@ class UpdatePaymentRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

View File

@ -35,7 +35,7 @@ class StoreProductRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

View File

@ -25,7 +25,7 @@ class UpdateProductRequest extends Request
*/ */
public function authorize(): bool public function authorize(): bool
{ {
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
@ -38,7 +38,7 @@ class UpdateProductRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

View File

@ -54,7 +54,7 @@ class StoreProjectRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }
@ -75,8 +75,9 @@ class StoreProjectRequest extends Request
$input['color'] = ''; $input['color'] = '';
} }
if(array_key_exists('budgeted_hours', $input) && empty($input['budgeted_hours'])) if(array_key_exists('budgeted_hours', $input) && empty($input['budgeted_hours'])) {
$input['budgeted_hours'] = 0; $input['budgeted_hours'] = 0;
}
$this->replace($input); $this->replace($input);
} }

View File

@ -51,7 +51,7 @@ class UpdateProjectRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }
@ -75,7 +75,7 @@ class UpdateProjectRequest extends Request
if (array_key_exists('color', $input) && is_null($input['color'])) { if (array_key_exists('color', $input) && is_null($input['color'])) {
$input['color'] = ''; $input['color'] = '';
} }
if(array_key_exists('budgeted_hours', $input) && empty($input['budgeted_hours'])) { if(array_key_exists('budgeted_hours', $input) && empty($input['budgeted_hours'])) {
$input['budgeted_hours'] = 0; $input['budgeted_hours'] = 0;
} }

View File

@ -50,7 +50,7 @@ class StorePurchaseOrderRequest extends Request
$rules['number'] = ['nullable', Rule::unique('purchase_orders')->where('company_id', $user->company()->id)]; $rules['number'] = ['nullable', Rule::unique('purchase_orders')->where('company_id', $user->company()->id)];
$rules['discount'] = 'sometimes|numeric|max:99999999999999'; $rules['discount'] = 'sometimes|numeric|max:99999999999999';
$rules['is_amount_discount'] = ['boolean']; $rules['is_amount_discount'] = ['boolean'];
$rules['line_items'] = 'array'; $rules['line_items'] = 'array';

View File

@ -53,14 +53,14 @@ class UpdatePurchaseOrderRequest extends Request
$rules['line_items'] = 'array'; $rules['line_items'] = 'array';
$rules['discount'] = 'sometimes|numeric|max:99999999999999'; $rules['discount'] = 'sometimes|numeric|max:99999999999999';
$rules['is_amount_discount'] = ['boolean']; $rules['is_amount_discount'] = ['boolean'];
if ($this->file('documents') && is_array($this->file('documents'))) { if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

View File

@ -43,13 +43,13 @@ class StoreQuoteRequest extends Request
$rules = []; $rules = [];
$rules['client_id'] = ['required', 'bail', Rule::exists('clients','id')->where('company_id', $user->company()->id)]; $rules['client_id'] = ['required', 'bail', Rule::exists('clients', 'id')->where('company_id', $user->company()->id)];
if ($this->file('documents') && is_array($this->file('documents'))) { if ($this->file('documents') && is_array($this->file('documents'))) {
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }
@ -77,7 +77,7 @@ class StoreQuoteRequest extends Request
{ {
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
$input = $this->all(); $input = $this->all();
$input = $this->decodePrimaryKeys($input); $input = $this->decodePrimaryKeys($input);
@ -98,12 +98,13 @@ class StoreQuoteRequest extends Request
$input['partial_due_date'] = null; $input['partial_due_date'] = null;
} }
if(!isset($input['date'])) if(!isset($input['date'])) {
$input['date'] = now()->addSeconds($user->company()->utc_offset())->format('Y-m-d'); $input['date'] = now()->addSeconds($user->company()->utc_offset())->format('Y-m-d');
}
if(isset($input['partial_due_date']) && (!isset($input['due_date']) || strlen($input['due_date']) <=1 )) { if(isset($input['partial_due_date']) && (!isset($input['due_date']) || strlen($input['due_date']) <= 1)) {
$client = \App\Models\Client::withTrashed()->find($input['client_id']); $client = \App\Models\Client::withTrashed()->find($input['client_id']);
$valid_days = ($client && strlen($client->getSetting('valid_until')) >= 1) ? $client->getSetting('valid_until') : 7; $valid_days = ($client && strlen($client->getSetting('valid_until')) >= 1) ? $client->getSetting('valid_until') : 7;
$input['due_date'] = \Carbon\Carbon::parse($input['date'])->addDays($valid_days)->format('Y-m-d'); $input['due_date'] = \Carbon\Carbon::parse($input['date'])->addDays($valid_days)->format('Y-m-d');
} }

View File

@ -46,7 +46,7 @@ class UpdateQuoteRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

View File

@ -49,7 +49,7 @@ class StoreRecurringInvoiceRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

View File

@ -48,7 +48,7 @@ class UpdateRecurringInvoiceRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

View File

@ -68,8 +68,8 @@ class GenericReportRequest extends Request
$input['user_id'] = auth()->user()->id; $input['user_id'] = auth()->user()->id;
if(!$this->checkAuthority()){ if(!$this->checkAuthority()) {
$input['date_range'] = ''; $input['date_range'] = '';
$input['start_date'] = ''; $input['start_date'] = '';
$input['end_date'] = ''; $input['end_date'] = '';
$input['send_email'] = true; $input['send_email'] = true;
@ -85,7 +85,7 @@ class GenericReportRequest extends Request
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
return $user->isAdmin() || $user->hasPermission('view_reports'); return $user->isAdmin() || $user->hasPermission('view_reports');
} }

View File

@ -34,7 +34,7 @@ class ProductSalesReportRequest extends Request
public function rules() public function rules()
{ {
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
@ -82,8 +82,8 @@ class ProductSalesReportRequest extends Request
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
if(Ninja::isHosted() && $user->account->isFreeHostedClient()){ if(Ninja::isHosted() && $user->account->isFreeHostedClient()) {
$this->error_message = ctrans('texts.upgrade_to_view_reports'); $this->error_message = ctrans('texts.upgrade_to_view_reports');
return false; return false;
} }

View File

@ -17,7 +17,6 @@ use Illuminate\Auth\Access\AuthorizationException;
class ProfitLossRequest extends Request class ProfitLossRequest extends Request
{ {
private string $error_message = ''; private string $error_message = '';
/** /**
@ -54,14 +53,14 @@ class ProfitLossRequest extends Request
$this->replace($input); $this->replace($input);
} }
private function checkAuthority() private function checkAuthority()
{ {
$this->error_message = ctrans('texts.authorization_failure'); $this->error_message = ctrans('texts.authorization_failure');
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
if(Ninja::isHosted() && $user->account->isFreeHostedClient()){ if(Ninja::isHosted() && $user->account->isFreeHostedClient()) {
$this->error_message = ctrans('texts.upgrade_to_view_reports'); $this->error_message = ctrans('texts.upgrade_to_view_reports');
return false; return false;
} }

View File

@ -45,8 +45,8 @@ class ReportPreviewRequest extends Request
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
if(Ninja::isHosted() && $user->account->isFreeHostedClient()){ if(Ninja::isHosted() && $user->account->isFreeHostedClient()) {
$this->error_message = ctrans('texts.upgrade_to_view_reports'); $this->error_message = ctrans('texts.upgrade_to_view_reports');
return false; return false;
} }

View File

@ -33,11 +33,12 @@ class Request extends FormRequest
public function fileValidation() public function fileValidation()
{ {
if(config('ninja.upload_extensions')) if(config('ninja.upload_extensions')) {
return $this->file_validation. ",".config('ninja.upload_extensions'); return $this->file_validation. ",".config('ninja.upload_extensions');
}
return $this->file_validation; return $this->file_validation;
} }
public function globalRules($rules) public function globalRules($rules)
@ -46,9 +47,10 @@ class Request extends FormRequest
foreach ($this->all() as $key => $value) { foreach ($this->all() as $key => $value) {
if($key == 'user') if($key == 'user') {
continue; continue;
}
if (method_exists($this, $key)) { if (method_exists($this, $key)) {
$merge_rules = $this->{$key}($rules); $merge_rules = $this->{$key}($rules);
} }

View File

@ -24,7 +24,7 @@ class CheckSmtpRequest extends Request
{ {
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
return $user->isAdmin(); return $user->isAdmin();
} }
@ -44,28 +44,27 @@ class CheckSmtpRequest extends Request
} }
public function prepareForValidation() public function prepareForValidation()
{ {
/** @var \App\Models\User $user */ /** @var \App\Models\User $user */
$user = auth()->user(); $user = auth()->user();
$company = $user->company(); $company = $user->company();
$input = $this->input(); $input = $this->input();
if(isset($input['smtp_username']) && $input['smtp_username'] == '********'){ if(isset($input['smtp_username']) && $input['smtp_username'] == '********') {
// unset($input['smtp_username']); // unset($input['smtp_username']);
$input['smtp_username'] = $company->smtp_username; $input['smtp_username'] = $company->smtp_username;
} }
if(isset($input['smtp_password'])&& $input['smtp_password'] == '********'){ if(isset($input['smtp_password']) && $input['smtp_password'] == '********') {
// unset($input['smtp_password']); // unset($input['smtp_password']);
$input['smtp_password'] = $company->smtp_password; $input['smtp_password'] = $company->smtp_password;
} }
if(isset($input['smtp_host']) && strlen($input['smtp_host']) >=3){ if(isset($input['smtp_host']) && strlen($input['smtp_host']) >= 3) {
} } else {
else {
$input['smtp_host'] = $company->smtp_host; $input['smtp_host'] = $company->smtp_host;
} }

View File

@ -82,7 +82,7 @@ class StoreTaskRequest extends Request
$rules['documents.*'] = $this->fileValidation(); $rules['documents.*'] = $this->fileValidation();
} elseif ($this->file('documents')) { } elseif ($this->file('documents')) {
$rules['documents'] = $this->fileValidation(); $rules['documents'] = $this->fileValidation();
}else { } else {
$rules['documents'] = 'bail|sometimes|array'; $rules['documents'] = 'bail|sometimes|array';
} }

Some files were not shown because too many files have changed in this diff Show More