From a6f01d086419eb49f10405d53af4774b57dd4c93 Mon Sep 17 00:00:00 2001
From: Deon George <deon@dege.au>
Date: Wed, 15 Mar 2023 15:34:28 +1100
Subject: [PATCH] Fix display of supplier products and offerings - wasnt
 including all services

---
 app/Http/Controllers/SupplierController.php        |  1 -
 app/Interfaces/ProductItem.php                     |  2 +-
 app/Models/Product/Type.php                        |  6 +++---
 .../adminlte/supplier/widget/offerings.blade.php   | 14 +++++++-------
 .../adminlte/supplier/widget/products.blade.php    |  7 +++----
 5 files changed, 14 insertions(+), 16 deletions(-)

diff --git a/app/Http/Controllers/SupplierController.php b/app/Http/Controllers/SupplierController.php
index 67b549d..4a94b15 100644
--- a/app/Http/Controllers/SupplierController.php
+++ b/app/Http/Controllers/SupplierController.php
@@ -4,7 +4,6 @@ namespace App\Http\Controllers;
 
 use Carbon\Carbon;
 use Illuminate\Http\Request;
-use Illuminate\Support\Facades\Storage;
 
 use App\Http\Requests\{SupplierAddEdit,SupplierProductAddEdit};
 use App\Models\{Cost,Supplier,SupplierDetail};
diff --git a/app/Interfaces/ProductItem.php b/app/Interfaces/ProductItem.php
index 9e6a71c..56ec556 100644
--- a/app/Interfaces/ProductItem.php
+++ b/app/Interfaces/ProductItem.php
@@ -6,7 +6,7 @@ use Illuminate\Support\Collection;
 
 interface ProductItem
 {
-	public function product();
+	public function products();
 
 	public function supplied();
 
diff --git a/app/Models/Product/Type.php b/app/Models/Product/Type.php
index b583aa1..9ec6d43 100644
--- a/app/Models/Product/Type.php
+++ b/app/Models/Product/Type.php
@@ -20,11 +20,11 @@ abstract class Type extends Model
 	/**
 	 * The product that sells this type
 	 *
-	 * @return \Illuminate\Database\Eloquent\Relations\MorphOne
+	 * @return \Illuminate\Database\Eloquent\Relations\MorphMany
 	 */
-	public function product()
+	public function products()
 	{
-		return $this->morphOne(Product::class, null,'model','model_id');
+		return $this->morphMany(Product::class, null,'model','model_id');
 	}
 
 	/**
diff --git a/resources/views/theme/backend/adminlte/supplier/widget/offerings.blade.php b/resources/views/theme/backend/adminlte/supplier/widget/offerings.blade.php
index 0ef86f9..e093ad7 100644
--- a/resources/views/theme/backend/adminlte/supplier/widget/offerings.blade.php
+++ b/resources/views/theme/backend/adminlte/supplier/widget/offerings.blade.php
@@ -33,17 +33,17 @@
 						</thead>
 
 						<tbody>
-						@foreach($xx=$offering->items->with(['products.product.services'])->get() as $oo)
+						@foreach($xx=$offering->items->with(['products.products.services'])->get() as $oo)
 							<tr>
 								<td>{{ $oo->id }}</td>
-								<td>{{ $oo->name_short }}</td>
-								<td>{{ $oo->name_detail }}</td>
+								<td>{{ $oo->name }}</td>
+								<td>{{ $oo->name_long }}</td>
 								<td class="text-right">{{ $oo->active ? 'YES' : 'NO' }}</td>
 								<td class="text-right">{{ number_format($oo->setup_cost_taxable,2) }}</td>
 								<td class="text-right">{{ number_format($oo->base_cost_taxable,2) }}</td>
 								<td class="text-right">{{ number_format($oo->products->count()) }}</td>
-								<td class="text-right">{{ number_format($oo->products->pluck('product')->filter()->count()) }}</td>
-								<td class="text-right">{{ number_format(($x=$oo->products->pluck('product.services')->flatten()->filter())->count()) }}</td>
+								<td class="text-right">{{ number_format($oo->products->pluck('products')->filter()->count()) }}</td>
+								<td class="text-right">{{ number_format(($x=$oo->products->pluck('products')->flatten()->pluck('services')->flatten()->filter())->count()) }}</td>
 								<td class="text-right">{{ number_format($x->where('active')->count()) }}</td>
 							</tr>
 						@endforeach
@@ -54,8 +54,8 @@
 							<th colspan="3">TOTALS</th>
 							<td class="text-right" colspan="3">{{ $xx->where('active',TRUE)->count() }}</td>
 							<td class="text-right">{{ number_format(($x=$xx->pluck('products')->flatten()->filter())->count()) }}</td>
-							<td class="text-right">{{ number_format($x->pluck('product')->filter()->count()) }}</td>
-							<td class="text-right">{{ number_format(($xxx=$x->pluck('product.services')->flatten()->filter())->count()) }}</td>
+							<td class="text-right">{{ number_format($x->pluck('products')->filter()->count()) }}</td>
+							<td class="text-right">{{ number_format(($xxx=$x->pluck('products')->flatten()->pluck('services')->flatten()->filter())->count()) }}</td>
 							<td class="text-right">{{ number_format($xxx->where('active')->count()) }}</td>
 						</tr>
 						</tfoot>
diff --git a/resources/views/theme/backend/adminlte/supplier/widget/products.blade.php b/resources/views/theme/backend/adminlte/supplier/widget/products.blade.php
index 25f327d..6458923 100644
--- a/resources/views/theme/backend/adminlte/supplier/widget/products.blade.php
+++ b/resources/views/theme/backend/adminlte/supplier/widget/products.blade.php
@@ -34,9 +34,8 @@
 						</thead>
 
 						<tbody>
-						@foreach($xx=$offering->items->with(['products.product.services','products.product.type.supplied','products.product.description'])->get() as $oo)
-							@foreach($oo->products->pluck('product')->filter() as $po)
-
+						@foreach($xx=$offering->items->with(['products.products.services','products.products.type.supplied','products.products.translate'])->get() as $oo)
+							@foreach($oo->products->pluck('products')->flatten()->filter() as $po)
 								<tr>
 									<td><a href="{{ url('a/supplier/product/addedit',[$po->supplier->id,$po->supplied->id,$po->supplied->category]) }}">{{ $po->lid }}</a></td>
 									<td>{{ $po->name_short }}</td>
@@ -59,7 +58,7 @@
 							<th colspan="3">TOTALS</th>
 							<td class="text-right">{{ $xx->where('active',TRUE)->count() }}</td>
 							<th colspan="5">&nbsp;</th>
-							<td class="text-right">{{ number_format(($xxx=$xx->pluck('products')->flatten()->pluck('product.services')->flatten()->filter())->count()) }}</td>
+							<td class="text-right">{{ number_format(($xxx=$xx->pluck('products')->flatten()->pluck('products')->flatten()->pluck('services')->flatten()->filter())->count()) }}</td>
 							<td class="text-right">{{ number_format($xxx->where('active')->count()) }}</td>
 						</tr>
 						</tfoot>