Merge branch 'dev'

app/Http/Controllers/JadwalSalurdanaController.php

@@ -134,7 +134,7 @@ class JadwalSalurdanaController extends Controller
     protected function exportJadwalSalur($request)
     {
         $sqlstr = $this->filterJadwalSalur($request);
-        $sqlstr .= " ORDER BY kode_rekening";
+        $sqlstr .= " ORDER BY x.kode_rekening";
 
         $data = DB::select(DB::raw($sqlstr));
         $data = json_decode(json_encode($data), true);
@@ -321,7 +321,7 @@ class JadwalSalurdanaController extends Controller
         $spreadsheet->setActiveSheetIndex(0);
 
         $writer = new Xlsx($spreadsheet);
-        $writer->save("downloadFiles/" . $fileName);
+        $writer->save(public_path("downloadFiles/" . $fileName));
         $headers = [
             'Content-Type' => 'application/vnd.ms-excel',
             'Content-Disposition' => 'attachment;filename=' . $fileName