fix: realtime bug

phojie · Jan 12, 2023 · 34c3bcf · 34c3bcf
1 parent d3b778c
commit 34c3bcf
Show file tree

Hide file tree

Showing 2 changed files with 10 additions and 15 deletions.
diff --git a/app/Models/Order.php b/app/Models/Order.php
@@ -61,14 +61,14 @@ public function scopeSearch($query, $search): object
   	return $query->when(
   		$search,
   		fn ($q) => $q->where('order_number', 'ilike', "%{$search}%")
-          ->orWhere('name', 'ilike', "%{$search}%")
-          ->orWhere('email', 'ilike', "%{$search}%")
-          ->orWhere('phone', 'ilike', "%{$search}%")
-          ->orWhere('address', 'ilike', "%{$search}%")
-          ->orWhere('city', 'ilike', "%{$search}%")
-          ->orWhere('province', 'ilike', "%{$search}%")
-          ->orWhere('postal_code', 'ilike', "%{$search}%")
-          ->orWhere('status', 'ilike', "%{$search}%")
+  		  ->orWhere('name', 'ilike', "%{$search}%")
+  		  ->orWhere('email', 'ilike', "%{$search}%")
+  		  ->orWhere('phone', 'ilike', "%{$search}%")
+  		  ->orWhere('address', 'ilike', "%{$search}%")
+  		  ->orWhere('city', 'ilike', "%{$search}%")
+  		  ->orWhere('province', 'ilike', "%{$search}%")
+  		  ->orWhere('postal_code', 'ilike', "%{$search}%")
+  		  ->orWhere('status', 'ilike', "%{$search}%")
   	);
   }
 

diff --git a/app/Services/OrderService.php b/app/Services/OrderService.php
@@ -61,12 +61,6 @@ public function update(OrderRequest $request, Order $order): void
   				});
   			}
 
-  			// if status is changed
-  			if ($order->getOriginal('status') !== $request->status) {
-  				// broadcast order status updated
-  				broadcast(new OrderStatusUpdated($order));
-  			}
-
   			$order->update([
   				'name' => $request->name,
   				'email' => $request->email,
@@ -93,7 +87,8 @@ public function update(OrderRequest $request, Order $order): void
   				});
   			}
 
-  				broadcast(new PendingOrdersNumber());
+  			broadcast(new OrderStatusUpdated($order));
+  			broadcast(new PendingOrdersNumber());
   		});
   	} catch (\Exception $e) {
   		throw $e;