MuhammadIqbalAfandi
/
bambslaundry-new
ウォッチ 1
お気に入りに登録 0
フォーク 0
コード 課題 0 プルリクエスト 0 リリース 0 Wiki アクティビティ
ソースを参照

fix: search master

Muhammad Iqbal Afandi 3 年 前
親
7fa843f63e
コミット
f03259d73d
共有4 個のファイルを変更した、7 個の追加 と 7 個の削除を含む
統一表示 差分情報を表示
  1. 2
    2
      app/Models/Customer.php
  2. 2
    2
      app/Models/Laundry.php
  3. 2
    2
      app/Models/Product.php
  4. 1
    1
      app/Models/User.php

+ 2
- 2
app/Models/Customer.php ファイルの表示

30 
         return $this->hasMany(Transaction::class, 'customer_number', 'customer_number');
 30 
         return $this->hasMany(Transaction::class, 'customer_number', 'customer_number');
31 
     }
 31 
     }
32
32
33 
-    public function scopeFilter($query, $search)
33 
+    public function scopeFilter($query, array $filters)
34 
     {
 34 
     {
35 
-        $query->when($search ?? null, function ($query, $search) {
35 
+        $query->when($filters['search'] ?? null, function ($query, $search) {
36 
             $query->where(function ($query) use ($search) {
 36 
             $query->where(function ($query) use ($search) {
37 
                 $query->where('customer_number', 'like', '%' . $search . '%')
 37 
                 $query->where('customer_number', 'like', '%' . $search . '%')
38 
                     ->orWhere('name', 'like', '%' . $search . '%')
 38 
                     ->orWhere('name', 'like', '%' . $search . '%')

+ 2
- 2
app/Models/Laundry.php ファイルの表示

43 
         return $this->hasMany(TransactionDetail::class);
 43 
         return $this->hasMany(TransactionDetail::class);
44 
     }
 44 
     }
45
45
46 
-    public function scopeFilter($query, $search)
46 
+    public function scopeFilter($query, array $filters)
47 
     {
 47 
     {
48 
-        $query->when($search ?? null, function ($query, $search) {
48 
+        $query->when($filters['search'] ?? null, function ($query, $search) {
49 
             $query->where(function ($query) use ($search) {
 49 
             $query->where(function ($query) use ($search) {
50 
                 $query->where('name', 'like', '%' . $search . '%')
 50 
                 $query->where('name', 'like', '%' . $search . '%')
51 
                     ->orWhere('price', 'like', '%' . $search . '%')
 51 
                     ->orWhere('price', 'like', '%' . $search . '%')

+ 2
- 2
app/Models/Product.php ファイルの表示

43 
         return $this->hasMany(TransactionDetail::class);
 43 
         return $this->hasMany(TransactionDetail::class);
44 
     }
 44 
     }
45
45
46 
-    public function scopeFilter($query, $search)
46 
+    public function scopeFilter($query, array $filters)
47 
     {
 47 
     {
48 
-        $query->when($search ?? null, function ($query, $search) {
48 
+        $query->when($filters['search'] ?? null, function ($query, $search) {
49 
             $query->where(function ($query) use ($search) {
 49 
             $query->where(function ($query) use ($search) {
50 
                 $query->where('name', 'like', '%' . $search . '%')
 50 
                 $query->where('name', 'like', '%' . $search . '%')
51 
                     ->orWhere('price', 'like', '%' . $search . '%')
 51 
                     ->orWhere('price', 'like', '%' . $search . '%')

+ 1
- 1
app/Models/User.php ファイルの表示

82 
         return $this->hasMany(Transaction::class);
 82 
         return $this->hasMany(Transaction::class);
83 
     }
 83 
     }
84
84
85 
-    public function scopeFilter($query, $filters)
85 
+    public function scopeFilter($query, array $filters)
86 
     {
 86 
     {
87 
         $query->when($filters['search'] ?? null, function ($query, $search) {
 87 
         $query->when($filters['search'] ?? null, function ($query, $search) {
88 
             $query->where(function ($query) use ($search) {
 88 
             $query->where(function ($query) use ($search) {