Cutlery/invoiceninja
1
0
Fork 0
mirror of https://github.com/invoiceninja/invoiceninja.git synced 2025-07-07 15:24:29 -04:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #8032 from turbo124/v5-develop

Browse Source 
Add status to client export
This commit is contained in:
David Bomba 2022-12-05 09:28:29 +11:00 committed by GitHub
commit ec74e473e5
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
5 changed files with 27 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
app/Export/CSV/ClientExport.php
View File

@ -76,6 +76,7 @@ class ClientExport extends BaseExport
'contact_custom_value3' => 'contact.custom_value3', 'contact_custom_value3' => 'contact.custom_value3',
'contact_custom_value4' => 'contact.custom_value4', 'contact_custom_value4' => 'contact.custom_value4',
'email' => 'contact.email', 'email' => 'contact.email',
'status' => 'status'
]; ];
private array $decorate_keys = [ private array $decorate_keys = [
@ -173,6 +174,19 @@ class ClientExport extends BaseExport
$entity['industry_id'] = $client->industry ? ctrans("texts.industry_{$client->industry->name}") : ''; $entity['industry_id'] = $client->industry ? ctrans("texts.industry_{$client->industry->name}") : '';
} }
$entity['status'] = $this->calculateStatus($client);
return $entity; return $entity;
} }
private function calculateStatus($client)
{
if($client->is_deleted)
return ctrans('texts.deleted');
if($client->deleted_at)
return ctrans('texts.arcvived');
return ctrans('texts.active');
}
} }

2
app/Filters/InvoiceFilters.php
View File

@ -56,8 +56,6 @@ class InvoiceFilters extends QueryFilters
if (in_array('unpaid', $status_parameters)) { if (in_array('unpaid', $status_parameters)) {
$this->builder->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL]); $this->builder->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL]);
} }
//->where('due_date', '>', Carbon::now())
//->orWhere('partial_due_date', '>', Carbon::now());
if (in_array('overdue', $status_parameters)) { if (in_array('overdue', $status_parameters)) {
$this->builder->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL]) $this->builder->whereIn('status_id', [Invoice::STATUS_SENT, Invoice::STATUS_PARTIAL])

6
app/Mail/VendorTemplateEmail.php
View File

@ -141,7 +141,13 @@ class VendorTemplateEmail extends Mailable
// $this->attach($file['path'], ['as' => $file['name'], 'mime' => null]); // $this->attach($file['path'], ['as' => $file['name'], 'mime' => null]);
// } // }
// $this->attachData(base64_decode($file['file']), $file['name']);
if(array_key_exists('file', $file))
$this->attachData(base64_decode($file['file']), $file['name']); $this->attachData(base64_decode($file['file']), $file['name']);
else
$this->attach($file['path'], ['as' => $file['name'], 'mime' => null]);
} }

3
app/PaymentDrivers/CheckoutComPaymentDriver.php
View File

@ -302,7 +302,8 @@ class CheckoutComPaymentDriver extends BaseDriver
} }
$phone = new Phone(); $phone = new Phone();
$phone->number = $this->client->present()->phone(); // $phone->number = $this->client->present()->phone();
$phone->number = substr(str_pad($this->client->present()->phone(),6, "0", STR_PAD_RIGHT), 0 , 24);
$request->email = $this->client->present()->email(); $request->email = $this->client->present()->email();
$request->name = $this->client->present()->name(); $request->name = $this->client->present()->name();

6
app/Services/Bank/BankMatchingService.php
View File

@ -33,7 +33,7 @@ class BankMatchingService implements ShouldQueue
{ {
use Dispatchable, InteractsWithQueue, Queueable, SerializesModels; use Dispatchable, InteractsWithQueue, Queueable, SerializesModels;
public function __construct(protected int $company_id, private string $db){} public function __construct(public int $company_id, private string $db){}
public function handle() :void public function handle() :void
{ {
@ -53,6 +53,8 @@ class BankMatchingService implements ShouldQueue
public function middleware() public function middleware()
{ {
return [new WithoutOverlapping("bank_match_rate:{$this->company_id}")]; $middleware_key = "bank_match_rate:{$this->company_id}";
return [new WithoutOverlapping($middleware_key)];
} }
} }