Sultan
/
invoiceninja
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Updates for elastic search

This commit is contained in:
David Bomba 2025-03-11 15:42:45 +11:00
parent 66491dadc9
commit c8407c417b
11 changed files with 61 additions and 80 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

11
app/Models/Client.php
View File

@ -249,10 +249,10 @@ class Client extends BaseModel implements HasLocalePreference
}
return [
'id' => $this->id,
'id' => $this->company->db.":".$this->id,
'name' => $name,
'is_deleted' => $this->is_deleted,
'hashed_id' => $this->company->db.":".$this->hashed_id,
'hashed_id' => $this->hashed_id,
'number' => $this->number,
'id_number' => $this->id_number,
'vat_number' => $this->vat_number,
@ -282,12 +282,7 @@ class Client extends BaseModel implements HasLocalePreference
public function getScoutKey()
{
return $this->company->db.":".$this->hashed_id;
}
public function getScoutKeyName()
{
return 'hashed_id';
return $this->company->db.":".$this->id;
}
public function getEntityType()

11
app/Models/ClientContact.php
View File

@ -171,9 +171,9 @@ class ClientContact extends Authenticatable implements HasLocalePreference
public function toSearchableArray()
{
return [
'id' => $this->id,
'id' => $this->company->db.":".$this->id,
'name' => $this->present()->search_display(),
'hashed_id' => $this->company->db.":".$this->hashed_id,
'hashed_id' => $this->hashed_id,
'email' => $this->email,
'first_name' => $this->first_name,
'last_name' => $this->last_name,
@ -189,12 +189,7 @@ class ClientContact extends Authenticatable implements HasLocalePreference
public function getScoutKey()
{
return $this->company->db.":".$this->hashed_id;
}
public function getScoutKeyName(): mixed
{
return 'hashed_id';
return $this->company->db.":".$this->id;
}
/*

11
app/Models/Credit.php
View File

@ -205,9 +205,9 @@ class Credit extends BaseModel
App::setLocale($locale);
return [
'id' => $this->id,
'id' => $this->company->db.":".$this->id,
'name' => ctrans('texts.credit') . " " . $this->number . " | " . $this->client->present()->name() . ' | ' . Number::formatMoney($this->amount, $this->company) . ' | ' . $this->translateDate($this->date, $this->company->date_format(), $locale),
'hashed_id' => $this->company->db.":".$this->hashed_id,
'hashed_id' => $this->hashed_id,
'number' => $this->number,
'is_deleted' => $this->is_deleted,
'amount' => (float) $this->amount,
@ -225,12 +225,7 @@ class Credit extends BaseModel
public function getScoutKey()
{
return $this->company->db.":".$this->hashed_id;
}
public function getScoutKeyName(): mixed
{
return 'hashed_id';
return $this->company->db.":".$this->id;
}
public function getEntityType()

12
app/Models/Expense.php
View File

@ -172,9 +172,9 @@ class Expense extends BaseModel
App::setLocale($locale);
return [
'id' => $this->id,
'id' => $this->company->db.":".$this->id,
'name' => ctrans('texts.expense') . " " . ($this->number ?? '') . ' | ' . Number::formatMoney($this->amount, $this->company) . ' | ' . $this->translateDate($this->date, $this->company->date_format(), $locale),
'hashed_id' => $this->company->db.":".$this->hashed_id,
'hashed_id' => $this->hashed_id,
'number' => $this->number,
'is_deleted' => $this->is_deleted,
'amount' => (float) $this->amount,
@ -189,14 +189,10 @@ class Expense extends BaseModel
public function getScoutKey()
{
return $this->company->db.":".$this->hashed_id;
}
public function getScoutKeyName(): mixed
{
return 'hashed_id';
return $this->company->db.":".$this->id;
}
public function getEntityType()
{
return self::class;

11
app/Models/Invoice.php
View File

@ -249,9 +249,9 @@ class Invoice extends BaseModel
App::setLocale($locale);
return [
'id' => $this->id,
'id' => $this->company->db.":".$this->id,
'name' => ctrans('texts.invoice') . " " . $this->number . " | " . $this->client->present()->name() . ' | ' . Number::formatMoney($this->amount, $this->company) . ' | ' . $this->translateDate($this->date, $this->company->date_format(), $locale),
'hashed_id' => $this->company->db.":".$this->hashed_id,
'hashed_id' => $this->hashed_id,
'number' => $this->number,
'is_deleted' => $this->is_deleted,
'amount' => (float) $this->amount,
@ -269,12 +269,7 @@ class Invoice extends BaseModel
public function getScoutKey()
{
return $this->company->db.":".$this->hashed_id;
}
public function getScoutKeyName(): mixed
{
return 'hashed_id';
return $this->company->db.":".$this->id;
}
public function getEntityType()

12
app/Models/PurchaseOrder.php
View File

@ -209,9 +209,9 @@ class PurchaseOrder extends BaseModel
App::setLocale($locale);
return [
'id' => $this->id,
'id' => $this->company->db.":".$this->id,
'name' => ctrans('texts.purchase_order') . " " . $this->number . " | " . $this->vendor->present()->name() . ' | ' . Number::formatMoney($this->amount, $this->company) . ' | ' . $this->translateDate($this->date, $this->company->date_format(), $locale),
'hashed_id' => $this->company->db.":".$this->hashed_id,
'hashed_id' => $this->hashed_id,
'number' => $this->number,
'is_deleted' => $this->is_deleted,
'amount' => (float) $this->amount,
@ -229,14 +229,10 @@ class PurchaseOrder extends BaseModel
public function getScoutKey()
{
return $this->company->db.":".$this->hashed_id;
}
public function getScoutKeyName(): mixed
{
return 'hashed_id';
return $this->company->db.":".$this->id;
}
public static function stringStatus(int $status)
{
switch ($status) {

11
app/Models/Quote.php
View File

@ -199,9 +199,9 @@ class Quote extends BaseModel
App::setLocale($locale);
return [
'id' => $this->id,
'id' => $this->company->db.":".$this->id,
'name' => ctrans('texts.quote') . " " . ($this->number ?? '') . " | " . $this->client->present()->name() . ' | ' . Number::formatMoney($this->amount, $this->company) . ' | ' . $this->translateDate($this->date, $this->company->date_format(), $locale),
'hashed_id' => $this->company->db.":".$this->hashed_id,
'hashed_id' => $this->hashed_id,
'number' => $this->number,
'is_deleted' => $this->is_deleted,
'amount' => (float) $this->amount,
@ -219,12 +219,7 @@ class Quote extends BaseModel
public function getScoutKey()
{
return $this->company->db.":".$this->hashed_id;
}
public function getScoutKeyName(): mixed
{
return 'hashed_id';
return $this->company->db.":".$this->id;
}
public function getEntityType()

12
app/Models/RecurringInvoice.php
View File

@ -273,9 +273,9 @@ class RecurringInvoice extends BaseModel
App::setLocale($locale);
return [
'id' => $this->id,
'id' => $this->company->db.":".$this->id,
'name' => ctrans('texts.recurring_invoice') . " " . $this->number . " | " . $this->client->present()->name() . ' | ' . Number::formatMoney($this->amount, $this->company) . ' | ' . $this->translateDate($this->date, $this->company->date_format(), $locale),
'hashed_id' => $this->company->db.":".$this->hashed_id,
'hashed_id' => $this->hashed_id,
'number' => $this->number,
'is_deleted' => $this->is_deleted,
'amount' => (float) $this->amount,
@ -293,14 +293,10 @@ class RecurringInvoice extends BaseModel
public function getScoutKey()
{
return $this->company->db.":".$this->hashed_id;
}
public function getScoutKeyName(): mixed
{
return 'hashed_id';
return $this->company->db.":".$this->id;
}
public function getEntityType()
{
return self::class;

11
app/Models/Vendor.php
View File

@ -154,10 +154,10 @@ class Vendor extends BaseModel
}
return [
'id' => $this->id,
'id' => $this->company->db.":".$this->id,
'name' => $name,
'is_deleted' => $this->is_deleted,
'hashed_id' => $this->company->db.":".$this->hashed_id,
'hashed_id' => $this->hashed_id,
'number' => $this->number,
'id_number' => $this->id_number,
'vat_number' => $this->vat_number,
@ -180,12 +180,7 @@ class Vendor extends BaseModel
public function getScoutKey()
{
return $this->company->db.":".$this->hashed_id;
}
public function getScoutKeyName(): mixed
{
return 'hashed_id';
return $this->company->db.":".$this->id;
}
protected $presenter = VendorPresenter::class;

11
app/Models/VendorContact.php
View File

@ -128,9 +128,9 @@ class VendorContact extends Authenticatable implements HasLocalePreference
public function toSearchableArray()
{
return [
'id' => $this->id,
'id' => $this->company->db.":".$this->id,
'name' => $this->present()->search_display(),
'hashed_id' => $this->company->db.":".$this->hashed_id,
'hashed_id' => $this->hashed_id,
'email' => $this->email,
'first_name' => $this->first_name,
'last_name' => $this->last_name,
@ -146,12 +146,7 @@ class VendorContact extends Authenticatable implements HasLocalePreference
public function getScoutKey()
{
return $this->company->db.":".$this->hashed_id;
}
public function getScoutKeyName(): mixed
{
return 'hashed_id';
return $this->company->db.":".$this->id;
}
public function avatar()

28
database/migrations/2025_03_11_044138_update_blockonomics_help_url.php Normal file
View File

@ -0,0 +1,28 @@
<?php
use Illuminate\Database\Migrations\Migration;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Support\Facades\Schema;
return new class extends Migration
{
/**
* Run the migrations.
*/
public function up(): void
{
if($g = \App\Models\Gateway::find(65))
{
$g->site_url = 'https://help.blockonomics.co/a/solutions/articles/33000291849';
$g->save();
}
}
/**
* Reverse the migrations.
*/
public function down(): void
{
//
}
};