Merge branch 'apiaku' into 'master'

online pembayaran

See merge request online-sistem1/api_arrahn!23

app/Denominasi.php

@@ -54,6 +54,7 @@ class Denominasi extends Model
         'k100',
         'txtring1000',
         'k1000',
+        'lebihan',
         'jumlahbundle',
         'txtjumlah',
         'nota',

app/GlDetail.php

@@ -0,0 +1,40 @@
+<?php
+
+namespace App;
+
+use Illuminate\Database\Eloquent\Model;
+
+class AnsRugi extends Model
+{
+    protected $table = 'gldetail';
+    public $timestamps = false;
+
+    /**
+     * The attributes that are mass assignable.
+     *
+     * @var array
+     */
+    protected $fillable = [
+      'kodcaw',
+      'tarikh',
+      'dtacct',
+      'ktacct',
+      'descpt',
+      'acttype',
+      'fracttype',
+      'amaun',
+      'teller',
+      'pelulus',
+      'terima',
+      'jenisbyr',
+      'bkcode',
+      'nocek'
+    ];
+
+    /**
+     * The attributes excluded from the model's JSON form.
+     *
+     * @var array
+     */
+    // protected $hidden = [];
+}

app/Http/Controllers/DenominasiController.php

@@ -40,17 +40,17 @@ class DenominasiController extends Controller
       $bd50 = ($request->bd50 * 5000);
       $bd10 = ($request->bd10 * 1000);
       $bd100 = ($request->bd100 * 5000);
-      $k01 = ($request->txtSen1 * 0.01);
-      $k05 = ($request->txtSen5 * 0.05);
-      $k010 = ($request->txtSen10 * 0.10);
-      $k020 = ($request->txtSen20 * 0.20);
-      $k050 = ($request->txtSen50 * 0.50);
-      $k1 = ($request->txtRing1 * 1);
-      $k5 = ($request->txtRing5 * 5);
-      $k10 = ($request->txtRing10 * 10);
-      $k20 = ($request->txtRing20 * 20);
-      $k50 = ($request->txtRing50 * 50);
-      $k100 = ($request->txtRing100 * 100);
+      $k01 = ($request->txtsen1 * 0.01);
+      $k05 = ($request->txtsen5 * 0.05);
+      $k010 = ($request->txtsen10 * 0.10);
+      $k020 = ($request->txtsen20 * 0.20);
+      $k050 = ($request->txtsen50 * 0.50);
+      $k1 = ($request->txtring1 * 1);
+      $k5 = ($request->txtring5 * 5);
+      $k10 = ($request->txtring10 * 10);
+      $k20 = ($request->txtring20 * 20);
+      $k50 = ($request->txtring50 * 50);
+      $k100 = ($request->txtring100 * 100);
 
       //Total Wang
 
@@ -74,29 +74,29 @@ class DenominasiController extends Controller
          'b50'=> $bd50,
          'bd100'=> $request->bd100,
          'b100'=> $bd100,
-         'txtring1'=> $request->txtRing1,
+         'txtring1'=> $request->txtring1,
          'k1'=> $k1,
-         'txtring5'=> $request->txtRing5,
+         'txtring5'=> $request->txtring5,
          'k5'=> $k5,
-         'txtsen1'=> $request->txtSen1,
+         'txtsen1'=> $request->txtsen1,
          'k01'=> $k01,
-         'txtsen5'=> $request->txtSen5,
+         'txtsen5'=> $request->txtsen5,
          'k05'=> $k05,
-         'txtsen10'=> $request->txtSen10,
+         'txtsen10'=> $request->txtsen10,
          'k010'=> $k010,
-         'txtsen20'=> $request->txtSen20,
+         'txtsen20'=> $request->txtsen20,
          'k020'=> $k020,
-         'txtsen50'=> $request->txtSen50,
+         'txtsen50'=> $request->txtsen50,
          'k050'=> $k050,
-         'txtring10'=> $request->txtRing10,
+         'txtring10'=> $request->txtring10,
          'k10'=> $k10,
-         'txtring20'=> $request->txtRing20,
+         'txtring20'=> $request->txtring20,
          'k20'=> $k20,
-         'txtring50'=> $request->txtRing50,
+         'txtring50'=> $request->txtring50,
          'k50'=> $k50,
-         'txtring100'=> $request->txtRing100,
+         'txtring100'=> $request->txtring100,
          'k100'=> $k100,
-         'txtring1000'=> $request->txtRing1000,
+         'txtring1000'=> $request->txtring1000,
          'k1000'=> $request->k1000,
          'jumlahbundle'=> $totalbundle,
          'txtjumlah'=> $totaljumlah,
@@ -158,6 +158,7 @@ class DenominasiController extends Controller
             'k1000' => $deno['k1000'],
             'jumlahbundle' => $deno['jumlahbundle'],
             'txtjumlah' => $deno['txtjumlah'],
+            'lebihan' => $deno['lebihan'],
             'nota' => $deno['nota'],
             'jumlahkeping' => $deno['jumlahkeping']
       ]);

app/Http/Controllers/GadaiController.php

@@ -143,7 +143,7 @@ class GadaiController extends Controller
             'nopelanggan' => $request->nopelanggan,
             'nokp' => $request->nokp,
             'sirig' => $request->sirig,
-            't_gadai' => $current->toDateString(),
+            't_gadai' => $request->t_gadai,
             'sttebus' => '',
             'masa' =>$current->toTimeString(),
             "nilaimarhun" => $request->nilaimarhun,

routes/web.php

@@ -194,6 +194,7 @@ $router->group(['prefix'=>'api'], function () use ($router){
     $router->put('gadai/edit/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@deletemarhun']); //deletemarhun edit
     $router->put('gadai/ubah/marhun/{kodcaw}/{norujukan}/', ['uses' => 'MarhunController@editmarhun']); //editmarhun edit
 
+
     //API PANJAR KHAZANAH
     $router->get('SenaraiPanjar/{kodcaw}',['uses'=>'PanjarController@list']);
     $router->get('SenaraiPanjar/list/{kodcaw}',['uses'=>'PanjarController@listpanjar']);