diff --git a/app/Http/Controllers/User/UserRefundController.php b/app/Http/Controllers/User/UserRefundController.php index 31175a8..fc99a73 100644 --- a/app/Http/Controllers/User/UserRefundController.php +++ b/app/Http/Controllers/User/UserRefundController.php @@ -111,17 +111,17 @@ class UserRefundController extends Controller public function listRefund(Request $request) { - $subQuery = Refund::with('transaction') - ->select('*'); + $subQuery = Refund::join('transactions', 'refunds.transaction_id', '=', 'transactions.id') + ->select('refunds.id as id', 'refunds.total as total', 'refunds.due_date as tanggal_pengajuan', 'refunds.status as status','transactions.nama_barang as nama_barang', 'transactions.penjual as penjual', 'transactions.batas_konfirmasi_transaksi as batas_konfirmasi'); - if ($request->has('search') && !empty($request->search['value'])) { + if($request->has('search') && !empty($request->search['value'])){ $searchRefund = $request->search['value']; - $subQuery->where(function ($a) use ($searchRefund) { - $a->whereRaw('pembeli LIKE ?', ['%' . $searchRefund . '%']) - ->orWhereRaw('nama_barang LIKE ?', ['%' . $searchRefund . '%']) - ->orWhereRaw('penjual LIKE ?', ['%' . $searchRefund . '%']); + $subQuery->where(function($a) use ($searchRefund){ + $a->whereRaw('LOWER(transactions.nama_barang) LIKE ?',['%'.strtolower($searchRefund).'%']) + ->orWhereRaw('LOWER(transactions.penjual) LIKE ?',['%'.strtolower($searchRefund).'%']); }); } + $queryRefund = Refund::from(DB::raw("({$subQuery->toSql()}) as tmp")) ->mergeBindings($subQuery->getQuery()) // Menggabungkan binding parameters ->select('*') diff --git a/resources/views/User/contact/index.blade.php b/resources/views/User/contact/index.blade.php index f9f410b..8261df7 100644 --- a/resources/views/User/contact/index.blade.php +++ b/resources/views/User/contact/index.blade.php @@ -45,37 +45,6 @@ @include('user.contact.modal-add-contact')