Merge branch 'new-super' of https://gitlab.com/online-sistem1/kaunter into tukar-taraf

app/Http/Controllers/KhazanahController.php

@@ -1401,10 +1401,10 @@ class KhazanahController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
-        if($request->datetimepicker1 == null){
+        if($request->datetarikh == null){
             $gadai_date = $current->toDateString();
         }else{
-            $split_date = explode('-',$request->datetimepicker1);
+            $split_date = explode('-',$request->datetarikh);
             $gadai_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
         }
         $gadai = Http::get(config('api.url'). '/api/gadai/laporan/'. $auth_user['cawangan'] .'/'. $gadai_date)->json();
@@ -1428,10 +1428,10 @@ class KhazanahController extends Controller
         $current = Carbon::now();
         $current = new Carbon();
         $tarikh_cetak = $current->toDateString();
-        if($request->datetimepicker1 == null){
+        if($request->datetarikh == null){
             $tebus_date = $current->toDateString();
         }else{
-            $split_date = explode('-',$request->datetimepicker1);
+            $split_date = explode('-',$request->datetarikh);
             $tebus_date = $split_date[2] . '-' . $split_date[1] . '-' . $split_date[0];        
         }
         $tebus = Http::get(config('api.url'). '/api/tebus/laporan/'. $auth_user['cawangan'] .'/'. $tebus_date)->json();
@@ -2384,12 +2384,14 @@ class KhazanahController extends Controller
             $bakilelongxtra = floatval(123.20);
             $cajlelongxtra = floatval(25.50);
             $upahsimpanxtra = floatval(4894.40);
+	    $peruntukanhapuskira = ($xtra['phapuskira']);
             
         }else{
             $upahsimpanxtra = $xtra['upahsimpan'];
             $bakilelongxtra = $xtra['bakilelong'];
             $utgterkumpulxtra = $xtra['untungrugiterkumpul'];
 	    $rugilelongxtra = -($xtra['kerugianlelong']);
+	    $peruntukanhapuskira = ($xtra['phapuskira']);
         }
 
         //Terkumpul
@@ -2409,6 +2411,7 @@ class KhazanahController extends Controller
         if($pinjamandiberi['pinjamankoop'] > 0) array_push($hartasemasa,['glcode' => '1000/013','descpt' => 'Pinjaman Diberi - Koop PKB', 'amaun' => $pinjamandiberi['pinjamankoop']]);
         if($pinjamandiberi['emaspalsu'] > 0) array_push($hartasemasa,['glcode' => '1000/014','descpt' => 'Pinjaman Diberi - Emas Palsu / Kes', 'amaun' => $pinjamandiberi['emaspalsu']]);
         if($imbangduga['pindahkekpkb'] > 0) array_push($hartasemasa,['glcode' => '1000/090','descpt' => 'Pindah Ke KPKB(IP)', 'amaun' => $imbangduga['pindahkekpkb']]);
+        if($peruntukanhapuskira > 0) array_push($hartasemasa,['glcode' => '1000/015','descpt' => 'Peruntukan Hapus Kira', 'amaun' => $peruntukanhapuskira]);
         if($belian1stop > 0) array_push($hartasemasa,['glcode' => '8000/501','descpt' => 'Belian 1 Stop', 'amaun' => $belian1stop]);
         
         $totalhartasemasa = 0;

resources/views/customers/info.blade.php

@@ -430,7 +430,7 @@
                     event.preventDefault();
                     return false;
                 }else{
-                    if(Number(data['unit_komuditi']) < 10000){
+                    if(Number(data['unit_komuditi']) < 50000){
                         Swal.fire({
                             icon: 'error',
                             title: 'Unit Komoditi Berbaki Minumum',

resources/views/lelongan/index.blade.php

@@ -199,6 +199,39 @@
 
     function bayarantuntubaki()
     {
+	$.ajax({
+            method: 'put',
+            url: "{{ route('lelong.tuntutbaki') }}",
+            data: { 
+            "_token": "{{ csrf_token() }}",
+            'batchno' : batchno,
+            'jenis' : jenis,
+            'norujukan' : norujukan,
+            'teller' : teller,
+            'bakipjm' : bakipjm,
+            'bakiupah' : bakiupah,
+            'cajlain' : cajlain,
+            'cajlelong' : cajlelong,
+            'jumlah' : jumlah,
+            'nowakil' : nowakil,
+            'hargajual' : hargajual
+            },
+            success:function(data){
+                let urlroute = '{{ route("resit.tuntutbaki", ":id") }}';
+                urlroute = urlroute.replace(':id', norujukan);
+                Swal.fire(
+                        'Berjaya!',
+                        'Tuntut Baki Berjaya',
+                        'success'
+                    ) .then(function() {
+                        window.open(urlroute, '_blank');
+                        window.location.replace("{{  route('customer_info') }}");
+                    })
+            },error: function(xhr, status, error) {
+                var err = eval("(" + xhr.responseText + ")");
+                alert(xhr.responseText);
+            }
+        });
         const swalWithBootstrapButtons = Swal.mixin({
             customClass: {
                 confirmButton: 'btn btn-success',
@@ -348,4 +381,4 @@
     }
 
 </script>
-@endsection
+@endsection

resources/views/penebusan/index.blade.php

@@ -442,7 +442,7 @@
                 url: api + '/api/upahtawarruq/' + kodcaw + '/' + norujukan,
                 dataType: 'json',
                 success:function(data){
-                    $('#jumlahupah').val(formatter.format(data));
+                    $('#jumlahupah').val(data);
                 }
             });
 
@@ -700,8 +700,8 @@
 
     $("#sltjenistebus").change(function(){
     
-        var jumupah = parseFloat($('#jumlahupah').val());
-        var jumupahrebet = parseFloat($('#bayaranditerima').val());
+        var jumupah = parseFloat($('#jumlahupah').val().replace(/[^0-9.-]+/g,""));
+        var jumupahrebet = parseFloat($('#bayaranditerima').val().replace(/[^0-9.-]+/g,""));
 
         switch($(this).val()) {
             case "T":