deon/osb
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Service display pricing, as a result of moving to psql. Service information updates

Browse Source
This commit is contained in:
Deon George
2024-07-24 20:17:23 +10:00
parent 79237868cb
commit ddd44b643f
3 changed files with 15 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

7
app/Models/Product.php
View File

@@ -13,9 +13,10 @@ use Illuminate\Support\Facades\File;
use Illuminate\Support\Str;
use Leenooks\Traits\ScopeActive;
use App\Casts\CollectionOrNull;
use App\Http\Controllers\AccountingController;
use App\Interfaces\{IDs,ProductItem};
use App\Traits\{ProductDetails,ProviderRef,SiteID};
use App\Traits\{ProductDetails,ProviderRef};
/**
* Class Product
@@ -65,10 +66,10 @@ use App\Traits\{ProductDetails,ProviderRef,SiteID};
*/
class Product extends Model implements IDs
{
use HasFactory,SiteID,ProductDetails,ScopeActive,ProviderRef;
use HasFactory,ProductDetails,ScopeActive,ProviderRef;
protected $casts = [
'pricing'=>'collection',
'pricing' => CollectionOrNull::class,
];
/* STATIC */

4
app/Models/Service.php
View File

@@ -901,7 +901,9 @@ class Service extends Model implements IDs
*/
public function getStatusAttribute(): string
{
return $this->active ? $this->order_status : 'INACTIVE';
return $this->active
? strtolower($this->order_status)
: ((strtolower($this->order_status) === 'cancelled') ? 'cancelled' : 'inactive');
}
/**