Merge branch 'kaunter' into 'new-super'

fix lelong

See merge request online-sistem1/kaunter!190

app/Console/Commands/initiateTunai.php

@@ -0,0 +1,48 @@
+<?php
+
+namespace App\Console\Commands;
+
+use Illuminate\Console\Command;
+use Illuminate\Support\Facades\Http;
+
+class initiateTunai extends Command
+{
+    /**
+     * The name and signature of the console command.
+     *
+     * @var string
+     */
+    protected $signature = 'initiate:tunai';
+
+    /**
+     * The console command description.
+     *
+     * @var string
+     */
+    protected $description = 'Initiate Tunai';
+
+    /**
+     * Create a new command instance.
+     *
+     * @return void
+     */
+    public function __construct()
+    {
+        parent::__construct();
+    }
+
+    /**
+     * Execute the console command.
+     *
+     * @return int
+     */
+    public function handle()
+    {
+        $updateOnline = Http::get(config('api.url') . '/api/initiate/tunai')->json();
+        if($updateOnline == 'successful'){
+            return 0;
+        }else{
+            return 'failed';
+        }
+    }
+}

resources/views/gadaian/edit.blade.php

@@ -481,20 +481,21 @@
             success:function(data){
                 $.each(data,function(index,jemas){
                     $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
+                    $('#nota_edit').val(res).trigger('change');
+
+                    $('#sltkarat').val(karat);
+                    $('#marhun_edit').val(jenismarhun);
+                    $('#berat_edit').val(berat);
+                    $('#nilaimarhun_edit').val(nm);
+                    $('#harga_edit').val(harga);
+                    $('#norujukedit').val(norujuk);
+                    $('#recnoedit').val(recno[1]);
+                    $('#editMarhunModal').modal();
                 })
             }
         });
 
-        $('#nota_edit').val(res).trigger('change');
         
-        $('#sltkarat').val(karat);
-        $('#marhun_edit').val(jenismarhun);
-        $('#berat_edit').val(berat);
-        $('#nilaimarhun_edit').val(nm);
-        $('#harga_edit').val(harga);
-        $('#norujukedit').val(norujuk);
-        $('#recnoedit').val(recno[1]);
-        $('#editMarhunModal').modal();
     }
 
     $("#sltkarat").change(function(e){
@@ -787,6 +788,7 @@
         var pinjaman = Number($('#pinjaman').val());
         var total_nilai_marhun = $('#total_nilai_marhun').val();
         var nilai_marhun_total = Number(total_nilai_marhun.replace(/[^0-9.-]+/g,""));
+        var pinjaman_asal = "{{ $gadaiannorujukan['pinjaman']}}";
 
         var pembiayaan_max_teller = $('#pembiayaan_max_teller').val();
         var pembiayaan_max_teller = Number(pembiayaan_max_teller.replace(/[^0-9.-]+/g,""));
@@ -808,7 +810,7 @@
                 'kodlaluan': teller
             },
             success:function(data){
-                bakiakhir = data.baki;
+                bakiakhir = data.baki + pinjaman_asal;
             }
         });
 

resources/views/gadaian/index.blade.php

@@ -1073,20 +1073,21 @@
             success:function(data){
                 $.each(data,function(index,jemas){
                     $("#marhun_edit").append(new Option(jemas['descpt'], jemas['marhun']));
+                    $('#nota_edit').val(res).trigger('change');
+
+                    $('#sltkarat').val(karat);
+                    $('#marhun_edit').val(jenismarhun);
+                    $('#berat_edit').val(berat);
+                    $('#nilaimarhun_edit').val(nm);
+                    $('#harga_edit').val(harga);
+                    $('#norujukedit').val(norujuk);
+                    $('#recnoedit').val(recno[1]);
+                    $('#editMarhunModal').modal();
                 })
             }
         });
 
-        $('#nota_edit').val(res).trigger('change');
         
-        $('#sltkarat').val(karat);
-        $('#marhun_edit').val(jenismarhun);
-        $('#berat_edit').val(berat);
-        $('#nilaimarhun_edit').val(nm);
-        $('#harga_edit').val(harga);
-        $('#norujukedit').val(norujuk);
-        $('#recnoedit').val(recno[1]);
-        $('#editMarhunModal').modal();
     }
 
     $('#terima_edit').on('click',function(){