From 4ea0e2641d5c7a98823b95eb6d312ce7a2138195 Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Mon, 8 Nov 2021 15:25:45 +0800
Subject: [PATCH 1/8] fix resit

---
 resources/views/print/resitansuran.blade.php | 75 ++++++++++----------
 1 file changed, 37 insertions(+), 38 deletions(-)

diff --git a/resources/views/print/resitansuran.blade.php b/resources/views/print/resitansuran.blade.php
index 009632c..d7586aa 100644
--- a/resources/views/print/resitansuran.blade.php
+++ b/resources/views/print/resitansuran.blade.php
@@ -7,10 +7,10 @@
 <meta name="viewport" content="width=device-width, initial-scale=1">
 <script src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
 <script>
-    $(document).ready(function () {
-      window.print();
-      window.onfocus=function(){ window.close();}
-    });
+    // $(document).ready(function () {
+    //   window.print();
+    //   window.onfocus=function(){ window.close();}
+    // });
 </script>
 <style>
 /* Red border */
@@ -222,7 +222,7 @@ hr.new5 {
   #payment {
     font-family: Arial, Helvetica, sans-serif;
     border-collapse:collapse;
-    width: 60%;
+    width: 90%;
     font-size:13px;
     border: 1px solid black;
 
@@ -394,34 +394,34 @@ hr.new5 {
   </table>
   <br>
 
-  <h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
+  <h1 style="float:left;position:absolute;margin-left:10px;">A</h1>
 <table id="payment">
   <tr>
-    <td style="width:10px">Harga/Baki Harga Jualan</td>
-    <td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
-    <td style="width:10px">Pembiayaan/Baki Pembiayaan</td>
-    <td style="width:10px">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
+    <td style="width:30%">Harga Jualan/Baki</td>
+    <td style="width:20%">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
+    <td style="width:30%">Pembiayaan/Baki</td>
+    <td style="width:20%">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">Bayaran Harga Jualan</td>
-    <td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
-    <td style="width:10px">Ansuran Pembiyaan</td>
-    <td style="width:10px">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
+    <td style="width:30%"><b>Bayaran Harga Jualan</b></td>
+    <td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
+    <td style="width:30%">Ansuran Pembiyaan</td>
+    <td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px"><b>Baki Harga Jualan</b></td>
-    <td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td>
-    <td style="width:10px"><b>Baki Pembiayaan</b></td>
-    <td style="width:10px">:<b> RM {{ number_format($gadai['bakipjm'],2) }}</b> </td>
+    <td style="width:30%">Baki Harga Jualan</td>
+    <td style="width:20%">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
+    <td style="width:30%">Baki Pembiayaan</td>
+    <td style="width:20%">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
   </tr>
   <tr>
     <td style="width:10px"></td>
     <td style="width:10px"></td>
-    <td style="width:10px"><b>Keuntungan</b></td>
-    <td style="width:10px">:<b> RM {{ number_format($transaction['bayaran_keuntungan'],2) }}</b> </td>
+    <td style="width:10px">Keuntungan</td>
+    <td style="width:10px">: RM {{ number_format($transaction['bayaran_keuntungan'],2) }} </td>
   </tr>
 </table>
-
+<p style="float:left;position:absolute;margin-left:50px;"><i>* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan</i></p>
 <br>
 
 
@@ -496,35 +496,34 @@ hr.new5 {
 </table>
 <br>
 
-<h1 style="float:left;position:absolute;margin-left:100px;">A</h1>
-
-
+<h1 style="float:left;position:absolute;margin-left:10px;">A</h1>
 <table id="payment">
   <tr>
-    <td style="width:10px">Harga/Baki Harga Jualan</td>
-    <td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
-    <td style="width:10px">Pembiayaan/Baki Pembiayaan</td>
-    <td style="width:10px">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
+    <td style="width:30%">Harga Jualan/Baki</td>
+    <td style="width:20%">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
+    <td style="width:30%">Pembiayaan/Baki</td>
+    <td style="width:20%">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px">Bayaran Harga Jualan</td>
-    <td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td>
-    <td style="width:10px">Ansuran Pembiyaan</td>
-    <td style="width:10px">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
+    <td style="width:30%"><b>Bayaran Harga Jualan</b></td>
+    <td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
+    <td style="width:30%">Ansuran Pembiyaan</td>
+    <td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
   </tr>
   <tr>
-    <td style="width:10px"><b>Baki Harga Jualan</b></td>
-    <td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td>
-    <td style="width:10px"><b>Baki Pembiayaan</b></td>
-    <td style="width:10px">:<b> RM {{ number_format($gadai['bakipjm'],2) }}</b> </td>
+    <td style="width:30%">Baki Harga Jualan</td>
+    <td style="width:20%">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
+    <td style="width:30%">Baki Pembiayaan</td>
+    <td style="width:20%">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
   </tr>
   <tr>
     <td style="width:10px"></td>
     <td style="width:10px"></td>
-    <td style="width:10px"><b>Keuntungan</b></td>
-    <td style="width:10px">:<b> RM {{ number_format($transaction['bayaran_keuntungan'],2) }}</b> </td>
+    <td style="width:10px">Keuntungan</td>
+    <td style="width:10px">: RM {{ number_format($transaction['bayaran_keuntungan'],2) }} </td>
   </tr>
 </table>
+<p style="float:left;position:absolute;margin-left:50px;"><i>* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan</i></p>
 
 <br>
 

From c2bf670590a339dabd2c9a3f9929a5547d88e775 Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Wed, 1 Dec 2021 08:06:56 +0800
Subject: [PATCH 2/8] dashboard

---
 .DS_Store                                     | Bin 8196 -> 8196 bytes
 app/.DS_Store                                 | Bin 0 -> 6148 bytes
 app/Events/.DS_Store                          | Bin 0 -> 6148 bytes
 app/Events/Dashboard/KomoditiNotify.php       |  32 ++++++++++++++++++
 app/Events/Dashboard/PelangganNotify.php      |  32 ++++++++++++++++++
 app/Http/Controllers/Auth/LoginController.php |   2 +-
 app/Http/Controllers/CustomersController.php  |   2 ++
 app/Http/Controllers/OperasiController.php    |   7 ++++
 .../views/operasi/komuditi/index.blade.php    |  10 ++++++
 routes/web.php                                |   4 ++-
 10 files changed, 87 insertions(+), 2 deletions(-)
 create mode 100644 app/.DS_Store
 create mode 100644 app/Events/.DS_Store
 create mode 100644 app/Events/Dashboard/KomoditiNotify.php
 create mode 100644 app/Events/Dashboard/PelangganNotify.php

diff --git a/.DS_Store b/.DS_Store
index 6bde6833edaf6deb4e461dd7a2ca9a0a00e17ab4..5680452aab60563dacc1ec3b41ea1312a83c902e 100644
GIT binary patch
delta 142
zcmZp1XmQx!E}*n6sURn_xWvHV8Y2@k3o9Et2L}f?M{ICLetB?7Vo7PS)8s~BZ!b<x
z&UgW_>S}XS9R*{fS{;RIOCtjv1q&17+FDKyQDuGWp!n>Z+`Rk_1~6b`gwPDUP#Q*c
bZWa;z%r>z>Y%{yWH<r!9qF<OMHV6X%*jXUR

delta 32
ocmZp1XmQx!E-=|zxP#GP@)2S8&5VK{*fz6Ed}G=CT!ft&0K69q8UO$Q

diff --git a/app/.DS_Store b/app/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..137b520ca088a2e4e359b4e13ff2c3802d2cc927
GIT binary patch
literal 6148
zcmeHK%}T>S5Z-O8rWBzE6^{#E3)WUq@e*qL0!H+pQWFw17<WsPHiuHkQD4YM@p+ut
z-5i3&qlle>-EVe&b~7Jje;8wYFbj_uYcs|iXowt@6@uoKu9^)-<a&;br9qxff<y%?
zCi;se{Ps;YVsjQT$*SM~5loUe&AQ!BUaL1YHn$wdX*mzxv&y~9&t~bspWfl<TB#%`
zbw9X?qkP=nxl}UqV;N0#LL5dAa(^4kP~`(PlVPfJJ>zhi&E~khw^*E>bVR?m?1;sA
zuiFu4$NlB9>FgdHUR;e|l2@tT42>KZ*RpM~gm+LX70tb=Oq6^Adzn+l5)uQ%05L!e
ztRn;VG;mt$SUlBC3=ji9GJyMofQIN=EDY+c13J7uqrZWO0y@4W5QRn8Vqp+GAl#$^
znpAF|7~G_TUD!C+VqwsvGp<*LdF;yN<Av+h!7g+-<E}yKi2-7u%0S%=+j#zu;FnqX
z$gif*h!`LS{uu+jG4zH5D9WC#-^#<YRzQ1%hJtYgDj=X&E&(vWePmxdjbES+ajwO}
VAkKnzoeoGB0Zj;X#K12w@CECGORxX{

literal 0
HcmV?d00001

diff --git a/app/Events/.DS_Store b/app/Events/.DS_Store
new file mode 100644
index 0000000000000000000000000000000000000000..e3f07cec4741bd6d5ffb8f0609c075e180ffcbae
GIT binary patch
literal 6148
zcmeHK%}N6?5T3MEcPT;-Djow~3)WUq@v_wV0<P#mrS7uDF0Px>ZQVmD>``CHNAY=_
zNm8*?!IOxcfytN5&xU+iG6?{P_Bh%Dr~!b3N?3BS`9jD~x*#QMAr$%>At(r72vL|X
zM6=;9GC+IhLI-y(gFbxPzibdDDn##VI7s4b)M&hkQn|9Sy5=}e)w%WiD)&dhXq>f!
z;WdpeluE)`KL{`5Uf!*3oT_vb#A$D+6XK|cAvafX8mYXk#%Yx4T;Dhx*LAzKt;yu@
zpe|d@X<bf^n~l0W+HXy#uCuwbdve}=NFG!5Y{(S&-)UL5ID;4Le6g-4f0!mJy+`jX
zbC$u#3@`)C!16F)Pe7--JWJ-4G6T%O4;i5IL820R77K&==)i`qkL0fql3<_S5`@yC
zXR$Dd9u#3x5lyPFPYhww(JpPAXR$D7(n08%@jG^AVP7ah&yIGf!$Eikxn%~Jfq4eX
zW>};8fA;<Re?Eyv%m6d+uNV-Oj^AnHl5A~VSRB<_iF$`hLUDz`j}+|aQjD=winmd<
Zpj}c2(X&_>L<<UE1T+oYFay8Jz&n{SOnv|W

literal 0
HcmV?d00001

diff --git a/app/Events/Dashboard/KomoditiNotify.php b/app/Events/Dashboard/KomoditiNotify.php
new file mode 100644
index 0000000..29be14d
--- /dev/null
+++ b/app/Events/Dashboard/KomoditiNotify.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Events\Dashboard;
+
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+
+class KomoditiNotify implements ShouldBroadcast
+{
+  use Dispatchable, InteractsWithSockets, SerializesModels;
+
+  public $response;
+  public $cawangan;
+
+  public function __construct($response,$cawangan)
+  {
+      $this->response = $response;
+      $this->cawangan = $cawangan;
+  }
+
+  public function broadcastOn()
+  {
+    return ['komoditi-notify'];
+  }
+
+  public function broadcastAs()
+  {
+    return 'trigger-komoditi';
+  }
+}
\ No newline at end of file
diff --git a/app/Events/Dashboard/PelangganNotify.php b/app/Events/Dashboard/PelangganNotify.php
new file mode 100644
index 0000000..6790daf
--- /dev/null
+++ b/app/Events/Dashboard/PelangganNotify.php
@@ -0,0 +1,32 @@
+<?php
+
+namespace App\Events\Dashboard;
+
+use Illuminate\Queue\SerializesModels;
+use Illuminate\Foundation\Events\Dispatchable;
+use Illuminate\Broadcasting\InteractsWithSockets;
+use Illuminate\Contracts\Broadcasting\ShouldBroadcast;
+
+class PelangganNotify implements ShouldBroadcast
+{
+  use Dispatchable, InteractsWithSockets, SerializesModels;
+
+  public $response;
+  public $cawangan;
+
+  public function __construct($response,$cawangan)
+  {
+      $this->response = $response;
+      $this->cawangan = $cawangan;
+  }
+
+  public function broadcastOn()
+  {
+    return ['pelanggan-notify'];
+  }
+
+  public function broadcastAs()
+  {
+    return 'trigger-pelanggan';
+  }
+}
\ No newline at end of file
diff --git a/app/Http/Controllers/Auth/LoginController.php b/app/Http/Controllers/Auth/LoginController.php
index b54f825..1c20f12 100644
--- a/app/Http/Controllers/Auth/LoginController.php
+++ b/app/Http/Controllers/Auth/LoginController.php
@@ -118,7 +118,7 @@ class LoginController extends Controller
             return response()->json([
                 'success' => false,
                 'message' => 'Invalid Email or Password',
-            ], 401);
+            ], 200);
         }
     }
 
diff --git a/app/Http/Controllers/CustomersController.php b/app/Http/Controllers/CustomersController.php
index 8424db8..e10d27a 100644
--- a/app/Http/Controllers/CustomersController.php
+++ b/app/Http/Controllers/CustomersController.php
@@ -13,6 +13,7 @@ use Illuminate\Support\Facades\Http;
 use Illuminate\Support\Facades\Auth;
 use Twilio\Rest\Client;
 use App\Komoditi;
+use App\Events\Dashboard\PelangganNotify;
 
 use Carbon\Carbon;
 
@@ -204,6 +205,7 @@ class CustomersController extends Controller
         ]);
         
         Session::put('customer_info',$customer_info);
+        event(new PelangganNotify('lulus',$auth_user['cawangan']));
         return redirect()->route('customer_info')->with( ['customer_info' => $customer_info] );
     }
 
diff --git a/app/Http/Controllers/OperasiController.php b/app/Http/Controllers/OperasiController.php
index d535646..ce6ad94 100644
--- a/app/Http/Controllers/OperasiController.php
+++ b/app/Http/Controllers/OperasiController.php
@@ -7,6 +7,7 @@ namespace App\Http\Controllers;
 use App\Events\OperasiNotice;
 use App\Events\StatusLiked;
 use App\Events\NotifikasiKelulusan;
+use App\Events\Dashboard\KomoditiNotify;
 
 use Illuminate\Support\Facades\Auth;
 use Illuminate\Http\Request;
@@ -234,4 +235,10 @@ class OperasiController extends Controller
         return view('operasi.rekodtelahlulus',compact('cawangan_info','api_url','arraykelulusan'));
 
     }
+
+    public function notifyKomoditi()
+    {
+        $auth_user = Auth::user();
+        event(new KomoditiNotify('lulus',$auth_user['cawangan']));
+    }
 }
diff --git a/resources/views/operasi/komuditi/index.blade.php b/resources/views/operasi/komuditi/index.blade.php
index 5008fd8..0fe9fad 100644
--- a/resources/views/operasi/komuditi/index.blade.php
+++ b/resources/views/operasi/komuditi/index.blade.php
@@ -414,9 +414,19 @@
                     text: 'Pendahuluan Unit Komuditi Berjaya'
                 });
                 $('#pembelian_modal').modal('hide');
+                komoditiNotify();
             }
         });
     });
+    function komoditiNotify(){
+        $.ajax({
+            method:'get',
+            url: "{{ route('beli.notifyKomoditi') }}",
+            success:function(data){
+                console.log('berjaya');
+            }
+        });
+    }
 
 </script>
 @endsection
\ No newline at end of file
diff --git a/routes/web.php b/routes/web.php
index 050bbf3..c41d3c6 100644
--- a/routes/web.php
+++ b/routes/web.php
@@ -317,4 +317,6 @@ Route::get('admin/kakitangan/resetcredentials',['as'=>'admin.kakitangan.resetcre
 Route::get('admin/pelanggan',['as'=>'admin.pelanggan','uses'=>'KhazanahController@index'])->middleware('auth','admin');
 Route::get('admin/customer_info',['as'=>'admin.customer_info','uses'=>'KhazanahController@infoAdmin'])->middleware('auth','admin');
 Route::get('admin/searchpelanggan',['as'=>'admin.searchpelanggan','uses'=>'KhazanahController@searchAdmin'])->middleware('auth','admin');
-Route::get('admin/poskod',['as'=>'admin.poskod','uses'=>'HomeController@poskod']);
\ No newline at end of file
+Route::get('admin/poskod',['as'=>'admin.poskod','uses'=>'HomeController@poskod']);
+
+Route::get('pembeliannotifykomuditi',['as'=>'beli.notifyKomoditi','uses'=>'OperasiController@notifyKomoditi'])->middleware('auth','operasi');
\ No newline at end of file

From c935c24c462330e2dd9ef2b3c0ef30abb7f689fc Mon Sep 17 00:00:00 2001
From: "e.arrahn" <e.arrahn@gmail.com>
Date: Wed, 1 Dec 2021 08:17:12 +0800
Subject: [PATCH 3/8] server

---
 app/Http/Controllers/AliranTunaiController.php  | 2 +-
 resources/views/homepage/penilai/home.blade.php | 6 ++++--
 resources/views/khazanah/gadaian.blade.php      | 3 ++-
 resources/views/khazanah/tebus.blade.php        | 3 ++-
 4 files changed, 9 insertions(+), 5 deletions(-)

diff --git a/app/Http/Controllers/AliranTunaiController.php b/app/Http/Controllers/AliranTunaiController.php
index b78e0f9..6413a0c 100644
--- a/app/Http/Controllers/AliranTunaiController.php
+++ b/app/Http/Controllers/AliranTunaiController.php
@@ -483,7 +483,7 @@ class AliranTunaiController extends Controller
 
         if(strtoupper(Auth::user()->name) === 'LELONG'){
             $penebusanbarcodescanned = floatval($lelongan);
-            $bakisemasa = floatval($bakiawal) + floatval($lelongan) - floatval($totalserahan);
+            $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($lelongan) - floatval($totalserahan);
         }else{
             $bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
         }
diff --git a/resources/views/homepage/penilai/home.blade.php b/resources/views/homepage/penilai/home.blade.php
index d51bf03..35a925e 100644
--- a/resources/views/homepage/penilai/home.blade.php
+++ b/resources/views/homepage/penilai/home.blade.php
@@ -281,8 +281,10 @@
     var channel = pusher.subscribe('gadai-notify');
     channel.bind('trigger-gadai', function(data) {
 
-        fetchGadaianEverytime();
-
+	if(cawangan == data.cawangan)
+        {
+	fetchGadaianEverytime();
+	}
     });
 
     var table_gadaian_semasa = $('#table-gadaian-semasa').DataTable({
diff --git a/resources/views/khazanah/gadaian.blade.php b/resources/views/khazanah/gadaian.blade.php
index 37bd4e5..62cc714 100644
--- a/resources/views/khazanah/gadaian.blade.php
+++ b/resources/views/khazanah/gadaian.blade.php
@@ -219,8 +219,9 @@
     var channel = pusher.subscribe('serahanpenilai-notify');
     channel.bind('trigger-serahanpenilai', function(data) {
 
+	if(cawangan == data.kodcaw){
         fetchGadaianEverytime();
-
+	}
     });
 
     $(document).ready(function(){
diff --git a/resources/views/khazanah/tebus.blade.php b/resources/views/khazanah/tebus.blade.php
index 20428fc..1ab49a1 100644
--- a/resources/views/khazanah/tebus.blade.php
+++ b/resources/views/khazanah/tebus.blade.php
@@ -190,8 +190,9 @@
     var channel = pusher.subscribe('tebus-notify');
     channel.bind('trigger-tebus', function(data) {
 
+	if(cawangan == data.cawangan){
         fetchTebusEverytime();
-
+	}
     });
 
     $(document).ready(function(){

From 973e0ee2c1f747e0f01452fd09715580047c0ac7 Mon Sep 17 00:00:00 2001
From: "e.arrahn" <e.arrahn@gmail.com>
Date: Wed, 22 Dec 2021 04:03:52 +0800
Subject: [PATCH 4/8] server

---
 .../views/homepage/khazanah/home.blade.php    | 30 +++++++++----------
 1 file changed, 15 insertions(+), 15 deletions(-)

diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php
index fdfe7ac..e73e0c1 100644
--- a/resources/views/homepage/khazanah/home.blade.php
+++ b/resources/views/homepage/khazanah/home.blade.php
@@ -494,20 +494,20 @@
 
       function simpanfunc()
       {
+	console.log('simpan');
+        //Swal.fire({
+        //      title: 'Adakah anda pasti untuk mengemaskini denominasi?',
+        //      text: "Sila pastikan denominasi anda betul!",
+        //      icon: 'warning',
+        //      showCancelButton: true,
+        //      confirmButtonColor: '#3085d6',
+        //      cancelButtonColor: '#d33',
+        //      confirmButtonText: 'Simpan'
+        //    }).then((result) => {
 
-        Swal.fire({
-              title: 'Adakah anda pasti untuk mengemaskini denominasi?',
-              text: "Sila pastikan denominasi anda betul!",
-              icon: 'warning',
-              showCancelButton: true,
-              confirmButtonColor: '#3085d6',
-              cancelButtonColor: '#d33',
-              confirmButtonText: 'Simpan'
-            }).then((result) => {
-
-              console.log(result);
-              return false;
-            });
+        //      console.log(result);
+        //      return false;
+        //    });
 
 
         let amaundeno = $('#amaunkeseluruhan').val().replace(/[^0-9.-]+/g,"");
@@ -557,8 +557,8 @@
               confirmButtonText: 'Simpan'
             }).then((result) => {
 
-              console.log(result);
-              return false;
+              //console.log(result);
+              //return false;
               if (result.isConfirmed) {
 
                 saveData();

From 1fa3b31662df8c5f7a8f29937fa6593918302595 Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Wed, 22 Dec 2021 04:33:03 +0800
Subject: [PATCH 5/8] wtd

---
 resources/views/customers/info.blade.php | 19 ++++++++++++++++++-
 1 file changed, 18 insertions(+), 1 deletion(-)

diff --git a/resources/views/customers/info.blade.php b/resources/views/customers/info.blade.php
index 7543186..96e350d 100644
--- a/resources/views/customers/info.blade.php
+++ b/resources/views/customers/info.blade.php
@@ -826,7 +826,24 @@
 
         if (tarikhtuntut == null)
         {
-            window.location.href = urlroute;
+            $.ajax({
+                method: 'GET',
+                url : api_url + '/api/check/wtd',
+                data:{
+                    'norujukan' : norujukan
+                },
+                success:function(data){
+                    if(data == 'yes'){
+                        Swal.fire({
+                            icon: 'error',
+                            title: 'Amaran',
+                            text: 'Lelongan dalam process WTD'
+                        });
+                    }else{
+                        window.location.href = urlroute;
+                    }
+                }
+            });
         }else{
             Swal.fire({
                 icon: 'error',

From cb3086a1a00904c27bd58d804e3b3c0cb70aead5 Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Thu, 23 Dec 2021 12:39:55 +0800
Subject: [PATCH 6/8] fix lelong

---
 app/Console/Commands/initiateTunai.php  | 48 +++++++++++++++++++++++++
 resources/views/gadaian/edit.blade.php  | 24 +++++++------
 resources/views/gadaian/index.blade.php | 21 +++++------
 3 files changed, 72 insertions(+), 21 deletions(-)
 create mode 100644 app/Console/Commands/initiateTunai.php

diff --git a/app/Console/Commands/initiateTunai.php b/app/Console/Commands/initiateTunai.php
new file mode 100644
index 0000000..dfb051b
--- /dev/null
+++ b/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';
+        }
+    }
+}
diff --git a/resources/views/gadaian/edit.blade.php b/resources/views/gadaian/edit.blade.php
index e7874c1..8d57ab7 100644
--- a/resources/views/gadaian/edit.blade.php
+++ b/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;
             }
         });
 
diff --git a/resources/views/gadaian/index.blade.php b/resources/views/gadaian/index.blade.php
index fda67c2..83d35bd 100644
--- a/resources/views/gadaian/index.blade.php
+++ b/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(){

From 75c0b8591daa60a4b6aced302e7da8682cad0000 Mon Sep 17 00:00:00 2001
From: "e.arrahn" <e.arrahn@gmail.com>
Date: Sun, 2 Jan 2022 13:00:09 +0800
Subject: [PATCH 7/8] server

---
 resources/views/homepage/khazanah/home.blade.php | 1 +
 1 file changed, 1 insertion(+)

diff --git a/resources/views/homepage/khazanah/home.blade.php b/resources/views/homepage/khazanah/home.blade.php
index e73e0c1..cec33f1 100644
--- a/resources/views/homepage/khazanah/home.blade.php
+++ b/resources/views/homepage/khazanah/home.blade.php
@@ -276,6 +276,7 @@
 
           $.ajax({
             method: 'put',
+	    async:false,
             url: api + '/api/DenominasiUpdate/' + kodcaw,
             data: { 
               "bd1" : bundle1,

From 0f8f1acc7f3a2c77941abb697dbcf2a41f05773d Mon Sep 17 00:00:00 2001
From: afiq <afiqzakwanhamdan@gmail.com>
Date: Sun, 2 Jan 2022 14:36:31 +0800
Subject: [PATCH 8/8] disable U

---
 resources/views/penebusan/index.blade.php | 1 -
 1 file changed, 1 deletion(-)

diff --git a/resources/views/penebusan/index.blade.php b/resources/views/penebusan/index.blade.php
index 348efac..710c92d 100644
--- a/resources/views/penebusan/index.blade.php
+++ b/resources/views/penebusan/index.blade.php
@@ -74,7 +74,6 @@
                                 @endif
                                 @if($gadai['hargajualan'] == null)
                                     <option value="AT">A = Auto Tawarruq</option>
-                                    <option value="U">U = Bayaran Upah</option>
                                 @endif
                               </select>
                         </div>