diff --git a/app/Http/Controllers/ReportGadaiController.php b/app/Http/Controllers/ReportGadaiController.php
index 6c2b470..55bd66c 100644
--- a/app/Http/Controllers/ReportGadaiController.php
+++ b/app/Http/Controllers/ReportGadaiController.php
@@ -3,96 +3,56 @@
 namespace App\Http\Controllers;
 
 use App\Cawangan;
+use App\CawanganDetail;
 use App\Customer;
 use App\Gadai;
+use App\Marhun;
+use DateTime;
+use Illuminate\Http\Request;
+use Illuminate\Support\Facades\DB;
+use App\Services\Reports\GadaianService as ReportGadaianService;
 
 class ReportGadaiController extends Controller
 {
-    public function getLaporanGadai($kodcaw, $tarikh)
+
+    public function getLaporanCawangan(string $kod_cawangan, Request $request)
     {
-        $cawangan = Cawangan::on('mysql7')->where('kodcaw', '=', $kodcaw)->first();
-
-        $gadai_data = Gadai::on($cawangan['mysql'])->select('t_gadai', 'norujukan', 'nokp', 'semakbarcode', 'masa', 'berat', 'nilaimarhun', 'pinjaman', 'upah12', 'percentpinj', 'teller', 'nokp')
-            ->where('t_gadai', '=', $tarikh)
-            ->orderBy('teller')
-            ->orderBy('sirig')
-            ->get();
-
-        $gadai = [];
-
-        if ($gadai_data) {
-            foreach ($gadai_data as $index => $gadaiData) {
-                $customer_info = Customer::on('mysql7')->where('kplama', '=', $gadaiData['nokp'])->orWhere('kpbaru', '=', $gadaiData['nokp'])->first();
-                array_push($gadai, [
-                    "t_gadai" => $gadaiData['t_gadai'],
-                    "norujukan" => $gadaiData['norujukan'],
-                    "nama" => $customer_info['nama'],
-                    "nokp" => $gadaiData['nokp'],
-                    "semakbarcode" => $gadaiData['semakbarcode'],
-                    "masa" => $gadaiData['masa'],
-                    "berat" => $gadaiData['berat'],
-                    "nilaimarhun" => $gadaiData['nilaimarhun'],
-                    "pinjaman" => $gadaiData['pinjaman'],
-                    "upah12" => $gadaiData['upah12'],
-                    "percentpinj" => $gadaiData['percentpinj'],
-                    "alamat1" => $customer_info['alamat1'],
-                    "teller" => $gadaiData['teller'],
-                ]);
-            }
-        }
-
-        return response()->json($gadai);
+        $reportGadaianService = new ReportGadaianService($kod_cawangan, $request);
+        return $reportGadaianService->getCawanganReport();
     }
-    public function getLaporanGadaiAll()
-    {
 
-        $tarikh = '2023-11-01';
+    public function getSummaryLaporanGadai(Request $request)
+    {
+        $onDate = $request->onDate;
+        $startDate = $request->startDate;
+        $endDate = $request->endDate;
 
         $active_cawangan_db_connection = getActiveCawanganDbConnection();
 
-        $active_cawangan_db = array_map(function ($connection) {
-            return config('database.connections.' . $connection)['database'];
+        $active_cawangan_db_name = array_map(function ($db_connection) {
+            return config('database.connections' . '.' . $db_connection . '.' . 'database');
         }, $active_cawangan_db_connection);
 
-        $active_cawangan_name = Cawangan::whereIn('db_name', $active_cawangan_db)->pluck('details_caw')->toArray();
+        $active_cawangan_detail = Cawangan::select('kodcaw', 'details_caw')->whereIn('db_name', $active_cawangan_db_name)->get()->toArray();
 
-        $gadai_data = array_map(function ($db_connection) use ($tarikh) {
-            $gadai = Gadai::on($db_connection)->select('t_gadai', 'norujukan', 'nokp', 'semakbarcode', 'masa', 'berat', 'nilaimarhun', 'pinjaman', 'upah12', 'percentpinj', 'teller', 'nokp')
-                ->where('t_gadai', '=', $tarikh)
-                ->orderBy('teller')
-                ->orderBy('sirig')
-                ->get();
+        $summary_gadaian_data = array_map(function ($db_connection) use ($request) {
+            $query = Gadai::on($db_connection);
+
+            $query->select(DB::raw('count(norujukan) as total_gadaian, sum(berat) as sum_berat, sum(nilaimarhun) as sum_nilai_marhun, sum(pinjaman) as sum_pinjaman'));
+
+            $query->when($request->filled('startDate') and $request->filled('endDate'), function ($q) use ($request) {
+                return $q->where('t_gadai', '>=', $request->startDate)
+                    ->where('t_gadai', '<=', $request->endDate);
+            });
+
+            return $query->get()->toArray();
 
-            return $gadai->toArray();
         }, $active_cawangan_db_connection);
 
-        $gadai_data_with_key = array_combine($active_cawangan_name, $gadai_data);
+        $response = array_map(function ($cawangan_detail, $summary_gadaian_data) {
+            return array_merge($cawangan_detail, $summary_gadaian_data[0]);
+        }, $active_cawangan_detail, $summary_gadaian_data);
 
-        $overall_data_gadai = array_map(function ($gadaian_cawangan) {
-            return array_map(function ($gadai) {
-
-                $customer_info = Customer::on('mysql7')->where('kplama', '=', $gadai['nokp'])->orWhere('kpbaru', '=', $gadai['nokp'])->first()->toArray();
-
-                return [
-                    "t_gadai" => $gadai['t_gadai'],
-                    "norujukan" => $gadai['norujukan'],
-                    "nama" => $customer_info['nama'],
-                    "nokp" => $gadai['nokp'],
-                    "semakbarcode" => $gadai['semakbarcode'],
-                    "masa" => $gadai['masa'],
-                    "berat" => $gadai['berat'],
-                    "nilaimarhun" => $gadai['nilaimarhun'],
-                    "pinjaman" => $gadai['pinjaman'],
-                    "upah12" => $gadai['upah12'],
-                    "percentpinj" => $gadai['percentpinj'],
-                    "alamat1" => $customer_info['alamat1'],
-                    "teller" => $gadai['teller'],
-                ];
-
-            }, $gadaian_cawangan);
-
-        }, $gadai_data_with_key);
-
-        return response()->json($overall_data_gadai);
+        return json_encode($response);
     }
 }
diff --git a/app/Services/Reports/GadaianService.php b/app/Services/Reports/GadaianService.php
new file mode 100644
index 0000000..7eb65af
--- /dev/null
+++ b/app/Services/Reports/GadaianService.php
@@ -0,0 +1,193 @@
+<?php
+
+namespace App\Services\Reports;
+
+use App\Cawangan;
+use App\CawanganDetail;
+use App\Customer;
+use App\Gadai;
+use App\Marhun;
+use Illuminate\Database\Eloquent\Builder;
+use Illuminate\Http\Request;
+
+class GadaianService
+{
+
+    public $kod_cawangan;
+    public $startDate;
+    public $endDate;
+
+    public function __construct($kod_cawangan, Request $request)
+    {
+        $this->kod_cawangan = $kod_cawangan;
+        $this->startDate = $request->startDate;
+        $this->endDate = $request->endDate;
+    }
+
+    public function getCawanganReport()
+    {
+        $cawangan_connection = Cawangan::where('kodcaw', $this->kod_cawangan)->first()->mysql;
+
+        $query_total_gadaian = Gadai::on($cawangan_connection);
+
+        $query_total_gadaian->when(!empty($this->startDate) and !empty($this->endDate), function ($q) {
+            return $q->where('t_gadai', '>=', $this->startDate)
+                ->where('t_gadai', '<=', $this->endDate);
+        });
+
+        $total_gadaian = $this->getTotalGadaian($query_total_gadaian);
+        $total_summary_gadaian_teller = $this->getTotalSummaryGadaianGroupByTeller($query_total_gadaian);
+        $total_summary_gadaian = $this->getTotalSummaryGadaian($query_total_gadaian);
+        $customer_info = $this->getCustomerInfo($total_gadaian);
+        $marhun_gadaian = $this->getMarhunGadaian($total_gadaian, $cawangan_connection);
+        $cawangan_detail = $this->getCawanganDetail($cawangan_connection);
+
+        $total_gadaian = $total_gadaian->zip($customer_info, $marhun_gadaian)->map(function ($data) {
+
+            [$gadai, $customer_info, $marhun_gadaian] = $data;
+
+            return [
+                'no_rujukan' => $gadai['norujukan'],
+                'nama' => $customer_info['nama'],
+                'alamat' => $customer_info['alamat1'],
+                'no_kp' => $gadai['nokp'],
+                'masa' => $gadai['masa'],
+                'marhun' => $marhun_gadaian,
+                'berat' => $gadai['berat'],
+                'nilai_marhun' => $gadai['nilaimarhun'],
+                'pembiayaan' => $gadai['pinjaman'],
+                'peratusan_margin_pinjaman' => $gadai['percentpinj'],
+                'teller' => $gadai['teller'],
+            ];
+
+        });
+
+        $total_gadaian = $total_gadaian->groupBy('teller');
+
+        $gadaian_tellers = $total_gadaian->keys();
+
+        $total_gadaian = $total_gadaian
+            ->zip($total_summary_gadaian_teller)
+            ->map(function ($data) {
+
+                [$gadaian, $summary] = $data;
+
+                return [
+                    'gadaian' => $gadaian,
+                    'summary_gadaian_teller' => $summary,
+                ];
+            });
+
+        $total_gadaian = $gadaian_tellers->combine($total_gadaian);
+
+        $data = [
+            'query' => [
+                'startDate' => formatDate($this->startDate),
+                'endDate' => formatDate($this->endDate),
+            ],
+            'cawangan_detail' => $cawangan_detail,
+            'gadaian' => $total_gadaian,
+            'summary_gadaian' => $total_summary_gadaian,
+        ];
+
+        return json_encode($data);
+
+    }
+
+    private function getCawanganDetail($cawangan_connection)
+    {
+        $cawangan_detail = CawanganDetail::on($cawangan_connection)->get()
+            ->map(function ($detail) {
+                return [
+                    'nama' => $detail['namacaw'],
+                    'code' => $detail['kodcaw'] . ' Ar-Rahn ' . $detail['cawangan'],
+                    'alamat' => $detail['alamat1'],
+                    'waktu_operasi' => $detail['alamat4'],
+                ];
+            });
+
+        return $cawangan_detail[0];
+
+    }
+
+    private function getTotalSummaryGadaian(Builder $query_total_gadaian)
+    {
+
+        $total_summary_gadaian = (clone $query_total_gadaian)
+            ->selectRaw('sum(berat) as total_berat, sum(nilaimarhun) as total_nilai_marhun, sum(pinjaman) as total_pembiayaan')
+            ->get()
+            ->map(function ($x) {
+                return [
+                    'total_berat' => $x['total_berat'],
+                    'total_nilai_marhun' => $x['total_nilai_marhun'],
+                    'total_pembiayaan' => $x['total_pembiayaan'],
+                ];
+            });
+
+        return $total_summary_gadaian[0];
+    }
+    private function getTotalSummaryGadaianGroupByTeller(Builder $query_total_gadaian)
+    {
+
+        $total_summary_gadaian_groupByTeller = (clone $query_total_gadaian)
+            ->selectRaw('sum(berat) as total_berat, sum(nilaimarhun) as total_nilai_marhun, sum(pinjaman) as total_pembiayaan')
+            ->groupBy('teller')
+            ->get();
+        return $total_summary_gadaian_groupByTeller;
+    }
+
+    private function getTotalGadaian(Builder $query_total_gadaian)
+    {
+        $total_gadaian = (clone $query_total_gadaian)
+            ->select('t_gadai', 'norujukan', 'nokp', 'semakbarcode', 'masa', 'berat', 'nilaimarhun', 'pinjaman', 'upah12', 'percentpinj', 'teller', 'nokp')
+            ->orderBy('teller')
+            ->orderBy('sirig')
+            ->get();
+        return $total_gadaian;
+    }
+
+    private function getCustomerInfo($total_gadaian)
+    {
+
+        $extract_nokp = $total_gadaian->pluck('nokp');
+
+        $customer_info = Customer::on('mysql7')
+            ->select(['nama', 'alamat1', 'kpbaru', 'kplama'])
+            ->where(function ($query) use ($extract_nokp) {
+                $query->whereIn('kpbaru', $extract_nokp)
+                    ->orWhereIn('kplama', $extract_nokp);
+            })
+            ->get();
+
+        $customer_info = collect($extract_nokp)->map(function ($nokp) use ($customer_info) {
+            return $customer_info->where('kpbaru', $nokp)->first() ?? $customer_info->where('kplama', $nokp)->first();
+        })->toArray();
+
+        return $customer_info;
+    }
+
+    private function getMarhunGadaian($total_gadaian, $cawangan_connection)
+    {
+
+        $extract_norujukan = $total_gadaian->pluck('norujukan');
+
+        $marhun_gadaian = Marhun::on($cawangan_connection)
+            ->select('norujukan', 'bil', 'marhun')
+            ->whereIn('norujukan', $extract_norujukan)
+            ->get()
+            ->groupBy('norujukan')
+            ->toArray();
+
+        $marhun_gadaian = array_map(function ($gadaian) {
+            return array_map(function ($norujukan) {
+                return $norujukan['bil'] . ' ' . $norujukan['marhun'];
+            }, $gadaian);
+        }, $marhun_gadaian);
+
+        $marhun_gadaian = array_map(function ($gadaian) {
+            return implode(',', $gadaian);
+        }, $marhun_gadaian);
+
+        return $marhun_gadaian;
+    }
+}
diff --git a/app/helpers.php b/app/helpers.php
index 322074b..3abf80f 100644
--- a/app/helpers.php
+++ b/app/helpers.php
@@ -3,6 +3,21 @@
 
 use Illuminate\Support\Facades\DB;
 
+if (!function_exists('formatNumber')) {
+    function formatNumber ($amount) {
+        $formattedAmount = number_format($amount, 2, '.', ',');
+
+        return $formattedAmount;
+    };
+}
+
+
+if (!function_exists('formatDate')) {
+    function formatDate ($date_string) {
+       return  (new DateTime($date_string))->format("d-m-Y");
+    };
+}
+
 if (!function_exists('getActiveCawanganDbConnection')) {
 
     function getActiveCawanganDbConnection()
diff --git a/routes/report.php b/routes/report.php
new file mode 100644
index 0000000..25cc03b
--- /dev/null
+++ b/routes/report.php
@@ -0,0 +1,6 @@
+<?php
+
+$router->group(['prefix'=>'api'], function () use ($router){
+    $router->get('gadailaporanOverallSummary', ['uses' => 'ReportGadaiController@getSummaryLaporanGadai']);
+    $router->get('gadailaporan/{kod_cawangan}', ['uses' => 'ReportGadaiController@getLaporanCawangan']);
+});