diff --git a/app/Http/Controllers/GadaiController.php b/app/Http/Controllers/GadaiController.php
index cc84c98..acf2d6e 100644
--- a/app/Http/Controllers/GadaiController.php
+++ b/app/Http/Controllers/GadaiController.php
@@ -20,6 +20,7 @@ use App\Tunai;
 use App\Komuditi;
 use App\KawalanStokLama;
 use App\KawalanStok;
+use App\Moratorium;
 
 use Illuminate\Http\Request;
 
diff --git a/app/Http/Controllers/LelongController.php b/app/Http/Controllers/LelongController.php
index 260589f..9536bc7 100644
--- a/app/Http/Controllers/LelongController.php
+++ b/app/Http/Controllers/LelongController.php
@@ -11,6 +11,8 @@ use App\GlCode;
 use App\imbangdugalama;
 use App\AnsRugi;
 use App\SerahBaki;
+use App\Tebus;
+use App\Advansur;
 use Illuminate\Http\Request;
 
 
@@ -542,4 +544,19 @@ class LelongController extends Controller
         }
     }
 
+    public function keluarLelong(){
+        $current = Carbon::now();
+        $current = new Carbon();
+        $cawangan_all = Cawangan::on('mysql7')->get();
+
+        foreach($cawangan_all as $index=>$cawangan){
+            $list_tebus_today = Tebus::on($cawangan['mysql'])->where('t_tebus',$current->toDateString())->pluck('norujukan')->toArray();
+            $list_advansur_today = Advansur::on($cawangan['mysql'])->where('tarikh',$current->toDateString())->pluck('norujukan')->toArray();
+            $lelong_tebus = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_tebus_today)->delete();
+            $lelong_advansur = Lelong::on($cawangan['mysql'])->whereIn('norujukan',$list_advansur_today)->delete();
+        }
+
+        return response()->json('successful');
+    }
+
 }
diff --git a/app/Http/Controllers/TebusController.php b/app/Http/Controllers/TebusController.php
index 8d0c166..c8cc23b 100644
--- a/app/Http/Controllers/TebusController.php
+++ b/app/Http/Controllers/TebusController.php
@@ -18,6 +18,7 @@ use App\HapusKira;
 use App\Parameter;
 use App\Panjar;
 use App\HargaEmas;
+use App\Moratorium;
 
 use Illuminate\Http\Request;
 
@@ -161,6 +162,14 @@ class TebusController extends Controller
         return response()->json($harga_tebus);
     }
 
+    public function getMoratorium(){
+        $bln_mora = Moratorium::first();
+    }
+
+    public function updateMoratorium(Request $request){
+
+    }
+
     public function kiraUpahNotTawarruq($kodcaw,$norujukan){
         $cawangan = Cawangan::on('mysql7')
                     ->where('kodcaw','=',$kodcaw)
@@ -179,8 +188,14 @@ class TebusController extends Controller
         $margin_kadarupah = 80;
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
         
+        $bln_mora = Moratorium::first();
+
         $upah_sebenar = $upah_asal - $rebet;
-        $upahsemasa = $upah_sebenar * $gadai_data['tempoh'];
+        $bln_upah = $gadai_data['tempoh'];
+        if($bln_upah > $bln_mora['bln_mora']){
+            $bln_upah = $bln_mora['bln_mora'];
+        }
+        $upahsemasa = $upah_sebenar * $bln_upah;
         $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
         $upah_semasa = number_format($upah_semasa,2);
         if(strpos($upah_semasa,',')){
@@ -209,8 +224,14 @@ class TebusController extends Controller
         $margin_kadarupah = 80;
         $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
         
+        $bln_mora = Moratorium::first();
+
         $upah_sebenar = $upah_asal - $rebet;
-        $upahsemasa = $upah_sebenar * $gadai_data['tempoh'];
+        $bln_upah = $gadai_data['tempoh'];
+        if($bln_upah > $bln_mora['bln_mora']){
+            $bln_upah = $bln_mora['bln_mora'];
+        }
+        $upahsemasa = $upah_sebenar * $bln_upah;
         $upah_semasa = bcdiv(round($upahsemasa,2),1,1);
         $upah_semasa = number_format($upah_semasa,2);
         if(strpos($upah_semasa,',')){
diff --git a/app/Moratorium.php b/app/Moratorium.php
new file mode 100644
index 0000000..2ea45fd
--- /dev/null
+++ b/app/Moratorium.php
@@ -0,0 +1,27 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Moratorium extends Model
+{
+    protected $table = 'moratorium';
+    protected $connection = 'mysql7';
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    // protected $fillable = [
+        
+    // ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 90878d1..d05aa81 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -132,6 +132,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('lelong/laporan/{kodcaw}/{tarikh}',['uses'=>'LelongController@getLaporanLelong']); //laporan lelong
     $router->get('lelong/harini/{kodcaw}',['uses'=>'LelongController@LelonganHarini']); //laporan lelong
 
+    $router->get('keluar/lelong',['uses'=>'LelongController@keluarLelong']);
+
 
 
     //Marhun API