Merge branch 'apiaku' into 'master'

add penebusan

See merge request online-sistem1/api_arrahn!5

app/Http/Controllers/TebusController.php

@@ -8,8 +8,11 @@ use App\Cawangan;
 use App\Transaction;
 use App\TransaksiKeuntungan;
 use App\Advansur;
+use App\Tebus;
 use Illuminate\Http\Request;
 
+use Carbon\Carbon;
+
 class TebusController extends Controller
 {
     public function tebusTawarruq($kodcaw,$norujukan){
@@ -89,7 +92,7 @@ class TebusController extends Controller
             $total_harga_tebus += $harga_tebus;
         }
 
-        $total_harga_tebus += $upahsemasa;
+        // $total_harga_tebus += $upahsemasa;
 
         return response()->json($total_harga_tebus);
     }
@@ -173,8 +176,68 @@ class TebusController extends Controller
             $total_harga_tebus += $harga_tebus;
         }
 
-        $total_harga_tebus += $upah_semasa;
+        // $total_harga_tebus += $upah_semasa;
 
         return response()->json($total_harga_tebus);
     }
-}
+
+    function rebet($kodcaw,$norujukan)
+    {
+        $cawangan = Cawangan::on('mysql7')
+            ->where('kodcaw','=',$kodcaw)
+            ->first();
+
+        $gadai_data = Gadai::on($cawangan['mysql'])
+            ->where('norujukan','=',$norujukan)
+            ->first();
+        
+        $upah_asal = $gadai_data['nilaimarhun'] / 100 * $gadai_data['kadarupah'];
+        $margin_pinjaman = $gadai_data['pinjaman'] / $gadai_data['nilaimarhun'] * 100;
+        $margin_kadarupah = 80;
+
+        $rebet = ($margin_kadarupah-$margin_pinjaman)/$margin_kadarupah * $upah_asal;
+
+        return floatval(number_format($rebet,2));
+    }
+
+    public function tebusUpdate($kodcaw,$norujukan,Request $request)
+    {
+        $current = Carbon::now();
+        $current = new Carbon();
+
+        $cawangan = Cawangan::on('mysql7')->where('kodcaw','=',$kodcaw)->first();
+
+        $rebet = $this->rebet($kodcaw,$norujukan);
+
+            $update_gadai = Gadai::on($cawangan['mysql'])->where('norujukan','=',$norujukan)->update(array(
+                'sttebus' => "T",
+                't_update' => $current->toDateString(),
+            ));
+    
+            $create_tebus = Tebus::on($cawangan['mysql'])->create([
+                'kodcaw'=> $kodcaw,
+                'norujukan'=> $norujukan,
+                'nopelanggan' => $request->nopelanggan,
+                'jenisbyr' => "TN",
+                'jenistebus' => $request->jenistebus,
+                'glcode' => "0",
+                't_tebus' => $current->toDateString(),
+                'jbg' => $request->jbg,
+                'kadarupah' => $request->kadarupah,
+                'nilaimarhun' => $request->nilai_marhun,
+                'pinjaman' => $request->pinjaman,
+                'ansuran' => $request->ansuran,
+                'addpinjaman' => $request->addpinjaman,
+                'BakiPjm' => $request->bakipinjaman,
+                'bakiupah' => $request->bakiupah,
+                'terima' => "*",
+                'kodgl' => "0",
+                'rebate' => $rebet,
+                'marhuntebus' => $request->marhun,
+                'historygadaian' => $request->historygadaian,
+                'tarikhbyrn' => $current->toDateString()
+            ]);
+    
+        return response()->json($update_gadai, 200);
+    }
+}

app/Tebus.php

@@ -0,0 +1,71 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class Tebus extends Model
+{
+    protected $table = 'tebus';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+        'sirit',
+        'kodcaw',
+        'norujukan',
+        'nopelanggan',
+        'JenisByr',
+        'jenistebus',
+        'CajCek',
+        'glcode',
+        't_tebus',
+        'jbg',
+        'kadarupah',
+        'ansuran',
+        'nilaimarhun',
+        'addpinjaman',
+        'pinjaman',
+        'BakiPjm',
+        'bakiupah',
+        'terima',
+        'cetak',
+        'teller',
+        'pelulus',
+        'pelulust',
+        'F_Lulus',
+        'nowakil',
+        'prkod',
+        'cancelID',
+        'CancelTime',
+        'kodgl',
+        'UpahAsal',
+        'rebate',
+        'marhuntebus',
+        // 'Tiada',
+        // 'GantiRugi',
+        // 'TrkhUpah',
+        // 'tagterima',
+        'hubungan',
+        // 'upahpercuma',
+        'upahdibayar' ,
+        // 'bayaranpampasan',
+        'historygadaian',
+        'pinjamanterkini',
+        // 'byrnonline',
+        // 'byrnlebih',
+        // 'byrnkurang',
+        'tarikhbyrn',
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

routes/web.php

@@ -60,8 +60,9 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->get('tebusseparuhbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusSeparuhNotTawarruq']);
     $router->get('tebusbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusNotTawarruq']);
     $router->get('upahbukantawarruq/{kodcaw}/{norujukan}',['uses'=>'TebusController@upahNotTawarruq']);
-    
-    
+    //Maintenance API TEBUS
+    // $router->get('rebet/{kodcaw}/{norujukan}',['uses' => 'TebusController@rebet']);
+    $router->put('updatetebus/{kodcaw}/{norujukan}',['uses'=>'TebusController@tebusUpdate']);
 
     //Lelong API
     $router->get('lelong',['uses'=>'LelongController@showAllLelongs']);