advansur

app/Advansur.php

@@ -13,9 +13,27 @@ class Advansur extends Model
      *
      * @var array
      */
-    // protected $fillable = [
+    protected $fillable = [
+        'tarikh',
+        'noresit',
+        'norujukan',
+        'nopelanggan',
+        'nilaimarhun',
+        'pinjaman',
+        'kadarupah',
+        'glcode',
+        'upahsebenar',
+        'upahdibayar',
+        'teller',
+        'prkod',
+        'jbg',
+        'nowakil',
+        'hubungan',
+        'status',
+        'historygadaian'
+    ];
 
-    // ];
+    public $timestamps = false;
 
     /**
      * The attributes excluded from the model's JSON form.

app/Gadai.php

@@ -63,6 +63,7 @@ class Gadai extends Model
         'jumtebus',
         'upahnotis',
         'tagpalsu',
+        'historygadaian',
         'tagcetak',
         'lel1stop',
         'tebus',

app/Http/Controllers/GadaiController.php

@@ -311,6 +311,62 @@ class GadaiController extends Controller
         return response()->json($update_gadai, 200);
     }
 
+    public function updateGadaiMarhunKaunter($kodcaw,$norujukan,Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+        $gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->first();
+
+        $upahsemasa = $gadai['jbg'] * (($gadai['kadarupah']/100 )* $gadai['bakipjm']);
+        
+        if($request->bayaran < $upahsemasa){
+            $upahsemasa = $request->bayaran;
+        }
+
+        $baki_upah = $gadai['bakiupah'] - $request->bayaran;
+        $baki_hargajualan = $gadai['bakihargajualan'] - $request->bayaran;
+        if($gadai['bakipjm'] == null){
+            $baki_pinjaman = $gadai['pinjaman'];
+        }else{
+            $baki_pinjaman = $gadai['bakipjm'];
+        }
+        
+        if($baki_upah < 0){
+            $baki_pinjaman = $baki_pinjaman + $baki_upah;
+            $baki_upah = 0;
+        }
+
+        $transaction = Transaction::on('mysql7')->create([
+            'trans_type' => 'A',
+            'norujukan' => $norujukan,
+            'nokp' => $gadai['nokp'],
+            'teller' => $request->teller,
+            'kodcaw' => $kodcaw,
+            'duit_masuk' => $request->bayaran,
+            'created_at' => $current,
+            'bakiharga' => $baki_hargajualan,
+        ]);
+
+        $transaction_upah = TransaksiKeuntungan::on('mysql7')->create([
+            'norujukan' => $norujukan,
+            'bayaran_keuntungan' => $upahsemasa,
+            'tarikh_bayaran'=> $current,
+            'kodcaw'=> $kodcaw
+        ]);
+
+        $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
+            'bakipjm' => $baki_pinjaman,
+            'bakiupah' => $baki_upah,
+            'jbg' => 0,
+            't_update' => $current->toDateString(),
+            'bakihargajualan' => $baki_hargajualan
+        ));
+        return response()->json($update_gadai, 200);
+    }
+
+
     public function getGadaianSemasa($kodcaw){
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
 

app/Http/Controllers/TebusController.php

@@ -421,4 +421,47 @@ class TebusController extends Controller
       
               return response()->json($listtebus);
         }
+
+
+        public function getAdvansur($kodcaw,$norujukan)
+        {
+            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+            $listadvansur = Advansur::on($cawangan['mysql'])
+            ->where('norujukan','=',$norujukan)
+            ->orderBy('tarikh','desc')
+            ->get();
+
+            return response()->json($listadvansur,200);
+        }
+
+        public function createAdvansur($kodcaw,Request $request)
+        {
+            $current = Carbon::now();
+            $current = new Carbon();
+
+            $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+            $create_advansur = Advansur::on($cawangan['mysql'])->create([
+                'tarikh'=> $current->toDateString(),
+                'noresit'=> 0,
+                'norujukan' => $request->norujukan,
+                'nopelanggan' => $request->nopelanggan,
+                'nilaimarhun' => $request->nilaimarhun,
+                'pinjaman' => $request->pinjaman,
+                'kadarupah' => $request->kadarupah,
+                'glcode' => $request->glcode,
+                'upahsebenar' => $request->upahsebenar,
+                'upahdibayar' => $request->upahdibayar,
+                'teller' => $request->teller,
+                'prkod' => $request->prkod,
+                'jbg' => $request->jbg,
+                'nowakil' => $request->nowakil,
+                'hubungan' => $request->hubungan,
+                'status' => 0,
+                'historygadaian' => $request->historygadaian
+            ]);
+
+            return response()->json($create_advansur ,201);
+        }
 }

app/Http/Controllers/TunaiController.php

@@ -61,15 +61,13 @@ class TunaiController extends Controller
  
     }
 
-    public function UpdateTunai($kodcaw, $kodlaluan, Request $request)
+    public function UpdateTunai($kodcaw, Request $request)
     {
-
-
         $current = Carbon::now();
         $current = new Carbon();
        
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
-        $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $kodlaluan] ])->
+        $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
         update(array(
              'tambah'=>$request->tambah,
               'kurang'=>$request->kurang,
@@ -77,18 +75,16 @@ class TunaiController extends Controller
         ));
            
         return response()->json($updatetunai, 200);
-    
-
     }
 
-    public function UpdateTunaiGadaianTebus($kodcaw, $kodlaluan, Request $request)
+    public function UpdateTunaiGadaianTebus($kodcaw, Request $request)
     {
 
         $current = Carbon::now();
         $current = new Carbon();
        
         $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
-        $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $kodlaluan] ])->
+        $updatetunai=Tunai::on($cawangan['mysql'])->where( [['tarikh','=', $current->toDateString()],['kodlaluan','=', $request->kodlaluan] ])->
         update(array(
              'keluar'=>$request->keluar,
               'masuk'=>$request->masuk,

routes/web.php

@@ -43,6 +43,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('gadai/{cawangan_code}/{date}',['uses'=>'GadaiController@gadaiTransactionByCawanganAndDay']);
     $router->put('gadai/norujukan/{norujukan}',['uses'=>'GadaiController@updateOneGadaiByNorujukan']);
     $router->put('gadai/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunOnline']); // gadai online ansuran
+    $router->put('gadaikaunter/{kodcaw}/norujukan/{norujukan}',['uses'=>'GadaiController@updateGadaiMarhunKaunter']); 
     $router->put('gadai/norujukan/{kodcaw}/{norujukan}',['uses'=>'GadaiController@daftarGadaiMarhun']);
     $router->put('gadai/norujukan/komuditi/{kodcaw}/{norujukan}',['uses'=>'GadaiController@pembelianKomuditi']);
     $router->put('gadai/norujukan/cetak/{kodcaw}/{norujukan}',['uses'=>'GadaiController@cetakSAG']);
@@ -168,6 +169,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
 
     //ANSURAN API
     $router->get('ansuran/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanAnsuran']); //laporan lelong
+    $router->get('ansuran/{kodcaw}/{norujukan}',['uses'=>'TebusController@getAdvansur']); 
+    $router->post('ansuran/create/{kodcaw}',['uses'=>'TebusController@createAdvansur']);
 
     //LAPORAN API
     $router->get('kawalanstok/laporan/{kodcaw}/{tarikh}',['uses'=>'GadaiController@getLaporanKawalanStok']); //laporan kawalanstok
@@ -184,8 +187,8 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('UpdateVault/{kodcaw}', ['uses'=>'VaultController@updateVault']);
     $router->get('TunaiController/{kodcaw}',['uses'=>'TunaiController@listTunai']);
     $router->post('tunai/daftarTunai/{kodcaw}',['uses'=> 'TunaiController@DaftarTunai']);
-    $router->put('updateTunai/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunai']);
+    $router->put('updateTunai/{kodcaw}',['uses'=>'TunaiController@UpdateTunai']);
-    $router->put('updateTunaiGT/{kodcaw}/{kodlaluan}',['uses'=>'TunaiController@UpdateTunaiGadaianTebus']);
+    $router->put('updateTunaiGT/{kodcaw}',['uses'=>'TunaiController@UpdateTunaiGadaianTebus']);
     $router->get('getLatestBaki/{kodcaw}',['uses'=>'TunaiController@sumBakiTunai']);
     $router->post('add/addTunai/{kodcaw}',['uses'=> 'TunaiController@create']);
     $router->get('listSerahMarhunController/{kodcaw}',['uses'=>'TebusController@listPenebusanBaru']);