Merge remote-tracking branch 'origin/staging' into origin/production

Modules/Linksehat/Http/Controllers/Api/AutocompleteController.php

@@ -115,12 +115,20 @@ class AutocompleteController extends Controller {
 
    
     public function drugList(Request $request){
-        
+        $search = $request->search;
         $drugs = Drug::query()
                     ->where([
                         'atc_code' => $request->provider, // ini untuk menggunakan list obat yang baru
+<<<<<<< HEAD
                         'active' => 1, // ini untuk menggunakan list obat yang baru
+=======
+                        'active' => 1
+>>>>>>> origin/staging
                     ])
+                    ->where(function ($query) use ($search) {
+                        $query->where('name', 'like', "%$search%")
+                            ->orWhere('code', 'like', "%$search%");
+                    })
                     ->get();
 
         $manipulatedDrugs = $drugs->map(function ($drug) {