updated server 10123

app/Http/Controllers/BayaranController.php

@@ -77,6 +77,10 @@ class BayaranController extends Controller
         {
             $gadai = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') . '/api/gadai/norujukan/'. $sag)->json();
 
+	    if($gadai[0][0]['tempoh'] >= 12){
+		return redirect()->route('home')->with('error','SAG Yang Dipilih melebihi tempoh 12 bulan ke atas.');
+	    }
+
             $arraybayar[] = $gadai[0][0];
         }
 
@@ -137,10 +141,11 @@ class BayaranController extends Controller
             }
             else
             {
-                array_push($array_payment,['customer_name' => Auth::user()->name,'nokp' => Auth::user()->icno,'kodcaw'=>$request->txtkodcawhidden[$index1],'norujukan'=>$norujukan,'bayaran'=>$request->txtbayaranhidden[$index1]]);
+                array_push($array_payment,['customer_name' => Auth::user()->name,'nokp' => Auth::user()->icno,'kodcaw'=>$request->txtkodcawhidden[$index1],'norujukan'=>$norujukan,'bayaran'=>round($request->txtbayaranhidden[$index1],1)]);
             }
 
-            $total_bayaran += $request->txtbayaranhidden[$index1];
+            //$total_bayaran += $request->txtbayaranhidden[$index1];
+		$total_bayaran += round($request->txtbayaranhidden[$index1],1);
         }
 
         $total_bayaran = ($total_bayaran * 100) + 100;

resources/views/includes/bayaran/pembayaransag.blade.php

@@ -317,7 +317,7 @@
 
         let bayar = Number(this.value);
 
-        let errorlebih = (bakipinjam - (nm * 0.1));
+        let errorlebih = (bakipinjam - (nm * 0.1) + upah);
 
         if (bayar > parseFloat(errorlebih)) {
             $("#bayarsbmt").prop('disabled', false);
@@ -326,8 +326,8 @@
                 'Baki Pembiayaan tidak boleh kurang 10% daripada Nilai Marhun',
                 'error'
             )
-            $(this).val(upah);
-            $(this).closest('tr').find('.bayaran').val(upah);
+            $(this).val(errorlebih.toFixed(2));
+            $(this).closest('tr').find('.bayaran').val(errorlebih.toFixed(2));
             calculateall(jenis, taglel);
             return false;
         }else if(bayar < parseFloat(upah) && parseFloat(upah) !== 0.00)
@@ -366,7 +366,11 @@
 
         $('#selepas_tawarruq').find('input[name=txtbayarantawarruq]').each(function(index) {
 
-            $('#spantransaksi' + (index+1)).text(formatter.format(this.value));
+            var bayaranselepas = (this.value * 100) / 10;
+            bayaranselepas = Math.round(bayaranselepas);
+            bayaranselepas = bayaranselepas / 10;
+
+            $('#spantransaksi' + (index+1)).text(formatter.format(bayaranselepas));
 
             sumtawarruq += parseFloat(this.value) || 0;
 
@@ -376,6 +380,9 @@
         });
 
         sum = sumarrahn + sumtawarruq;
+        sum = (sum * 100) / 10;
+        sum = Math.round(sum);
+        sum = sum / 10;
 
         if (counterrorbayar > 0) {
             $('#spanamarankosong').removeClass("d-none");

resources/views/includes/home.blade.php

@@ -154,6 +154,16 @@
                 <i class="text-danger" style="font-size:12px;">Sila 'Tick' Pada Kotak Yang Hendak Dibayar.</i>
             </div>
 
+            @if (\Session::has('error'))
+                <script>
+                    Swal.fire(
+                        "Melebihi tempoh 12 Bulan.",
+                        "{{ \Session::get('error') }}",
+                        'warning'
+                    )
+                </script>
+            @endif
+
             <div class="table-responsive table-bordered table-hover">
                 <table class="table align-items-center table-flush border" id="selepas_tawarruq" style="text-align: center; width: 100%">
                     <thead class="thead-light bg-dark text-white text-center">
@@ -503,7 +513,6 @@ var hargaemastable = $('#harga_emas').DataTable({
         selepastawarruqtable.clear().draw();
         var counter = 1;
         $.each(datapemb6,function(index,ps){
-
             let namacawangan = '';
             $.ajax({
                 url: api_url + '/api/cawangan/detail/' + ps.kodcaw,
@@ -573,7 +582,7 @@ var hargaemastable = $('#harga_emas').DataTable({
                 }   
             });
 
-            
+		var today = new Date();
             var tarikh_12bulan = DateDiff(new Date(ps.t_matang1),today);
 
             var lelong_12bulanblock = false;