From 557ec8cb3b48cb0fb1895ff35f499de4845eea66 Mon Sep 17 00:00:00 2001 From: hafifierahman Date: Mon, 13 Sep 2021 00:39:24 +0800 Subject: [PATCH] buat benda baru --- app/Http/Controllers/SemakController.php | 42 ++++++ app/Models/loguser.php | 22 ++++ public/argon/img/brand/ARRAHN1.png | Bin 0 -> 2200 bytes public/argon/img/brand/ajax-loader.gif | Bin 0 -> 3208 bytes resources/views/dashboard.blade.php | 34 ++++- resources/views/layouts/app.blade.php | 4 +- .../views/pembayaran/senaraibayaran.blade.php | 3 +- resources/views/penyata/summary.blade.php | 122 ++++++++++++------ resources/views/semak/semaksag.blade.php | 37 +++--- routes/web.php | 81 ++++-------- 10 files changed, 218 insertions(+), 127 deletions(-) create mode 100644 app/Models/loguser.php create mode 100644 public/argon/img/brand/ARRAHN1.png create mode 100644 public/argon/img/brand/ajax-loader.gif diff --git a/app/Http/Controllers/SemakController.php b/app/Http/Controllers/SemakController.php index bcf9e1f..8d2a072 100644 --- a/app/Http/Controllers/SemakController.php +++ b/app/Http/Controllers/SemakController.php @@ -35,4 +35,46 @@ class SemakController extends Controller return view('semak.senaraisag', compact('belum_tebus','sudah_tebus')); } + + public function PenyataSummary($norujukan) + { + $api_url = config('api.url'); + + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. 'KB2')->json(); + $cawangan_detail=$cawangan[0]; + + $auth_user = Auth::user(); + + $customer = Http::get(config('api.url'). '/api/customers/'.$auth_user['icno'])->json(); + + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); + + if(sizeof($gadai) != 0) + $gadai = $gadai[0]; + + $transaction = Http::get(config('api.url').'/api/transaction/norujukan/'. $norujukan)->json(); + + return view('penyata.summary',compact('cawangan_detail','transaction','customer','gadai','api_url')); + } + + public function Penyata($norujukan) + { + $api_url = config('api.url'); + + $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. 'KB2')->json(); + $cawangan_detail=$cawangan[0]; + + $auth_user = Auth::user(); + + $customer = Http::get(config('api.url'). '/api/customers/'.$auth_user['icno'])->json(); + + $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); + + if(sizeof($gadai) != 0) + $gadai = $gadai[0]; + + $transaction = Http::get(config('api.url').'/api/transaction/norujukan/'. $norujukan)->json(); + + return view('penyata.penyata',compact('cawangan_detail','transaction','customer','gadai','api_url')); + } } diff --git a/app/Models/loguser.php b/app/Models/loguser.php new file mode 100644 index 0000000..e15283f --- /dev/null +++ b/app/Models/loguser.php @@ -0,0 +1,22 @@ +Px#1ZP1_K>z@;j|==^1poj5AY({UO#lFTCIA3{ga82g0001h=l}q9FaQARU;qF* zm;eA5aGbhPJOBUy32;bRa{vGf5dZ)S5dnW>Uy%R+2mwh%K~z{r%~)w{R8yDRm3c&x9e)qD!MIz`JanKTc+j&bK-`Tai7*wfs|J0iLimb!Jh1ZG*3L4gNq;lX4gnxKx8G zlJ#l8;BaRws9xgge0?m)+YpdTGt*o{xxOpNQ`pp>QH@P1$amD_vuuOy>sVJ&TF`_% zM&Y%-$%x=H(K_D)aQguACJDZ|W8Em}$I(j1!SCNXn{88>0Wc}g1Ypnu&lmJ;Xd!*aW&{I;{fm?eUIwwXW}xR34l&H>-aU;#1*KO1hOlL>+z79 zJn4|26d+9&7TE9|B5*2T1+>}Ll;4s~lZ9iAKMMJJ0+CwQ4d)2PpBe2Y`2tXY;i4<3 zCc*D|VJagK>n6Z zW$z#rIM0t=eUG#~R?M**(b(N2L9W4mg+#sU8tPnIS8u}xega>s#nLO!$oK)+P4Ka_ zy>9Giy!+R-d^3@S*MR4fusM1RfVN?Hy|}3INu({wg=b5!nXeGZ zU&J=Q@B)0z(X~E5tw$L_!LFv~u&K>ZARP?f97Ir7JE;ZUH+Fyq;U6o&)+~&1g!hKnpliAEgQxph+%2VH7oJ<3Jt0 z%zjVwNHjv~;0MQ>axX~(h(9$S59O{6emg+9q=%%7wxL!bokKcSj~<(^@WM6xd@2~E zdAh67@y!oY!JI_38qPdR-Pw(Gy*@Y))kR`=Ih}ByfdYIb0RZW*=?|>rm#)l1bdx01 zRA>X+v#&vc-RZgP{Un`Iwfz3fyhu=0JlqJ7p%BrD=$O5xyRQ6P(CVnz>=zMTxrY`x z1|u&PEFZ9cq=P~#28pzlZu9beP&hNCf}n|!b%DmHyMd!PS(pwUM7a^ZTPRS(c|>ks z-{ze92pLr!QU^Mgfb=5Kz`IE*28vX=7F0Lf>gh>|E8 z>X76KluU<(mI>{p+f_G?A@KZavd5LHP>dT zAkn-)aacXs9|xkboMb5 z1%VV}otFxsRbQJjRl5Y;`6j#|=P z;wdV8O@E4#YfWKNSEX(Q6;~BCSKbs1_9R9N(*HABwTB{R*@TR=kXBL!Q?whozr;NU#yD6g3glAVU>4V;q#CjxGzu5b;d* zDS;o1ADn78;YLtX=pJdFE7h`I{03&1A#Fh5ut4e3N&F+AwYnDECPanNQ?@if-C|-AS@vP zSwmP8lmrq(v_-@Pw6$5JL2M{&7t|gdpu1ggZ_6ILr)y@w`7%|*hnbqHp8NUM{nt7F zbADBq7vSg0Nn`>{;2rQ^AIrZZTYMw7a=k)**W0r}qlE`7|7ONb-<_DbTgc2#&P-w^ z?n}(spPDGNPd>OO6|npTqEHuZty>(mI23@M7>@-cCu-*>o(T97>oz~sq$8Z*rHDAY zj-*|`b08ma6F0d|(Z`E%ELZC;UT1eI8B;6ylI zio5A*t6wH<-#Pf|+*u)wl%2!#jDe_oX;4YFzo5+GFzn?iXH%l$RB-&iuRf z`9@jxJCB~P$b9D^8F0@Rf z!bX#>UsYdgP7w`Z$!1O0$+^|-H^-BXi0&lGc@InHqDC~`MbChj{m+_ejmh!=6E0#>aV*0!2 zn)!*nroNHJZH>%3?cvfyMTEEU{m$k1?A5f5HWwN?caz^+%UY~tAT3V1+Sie5bWnV) znpSeXVEPUaXu59YpVoOLHjoWwZIRhKoQwikp${LCmuDeiD>rN)O%2+nxsx};LS0hA9wWQKhZ9sJ=+D@V!+7la&UEnpc`W0!HuCR5~7Q8nwJXPY1 zkCm|luIUcsrpTb-oC%y9Axp>~TU!H2rgzNE$lU-PuSS{YK8F)wK!cj92!pXA}ic1zxb;tU0z(T5@gpe zW4VZ}c%5s7*0EMn`G>%sKMwdMeNhX8i5Mdc3a#3i#xfr&bMW>HjoTHuY;M`6h^b7% zHitBr#9I@R=|fCRFwcN;E%y7^1UI+fh^p-nr6O}zbDI`XYg%-Opk1@RwZ{jnuMGxK z)Xk#qyjg!gQX^E$SOj%R7> zuznnv9Q@K_CT7OH;@%lt+${8{XNC}pGoydmZ@L;xC`YoYqm_ClxoQJPlJH5tm}lvsu_x)G6je0IkHxr&zfH#wQzhun4IR>4z=$b8Ld-^*G$vL~>tMCgn68 zhn1@OcDO~-p)hbjF{{d)h#=t6WKM4{+=l6yTr#O2Az77qTY#uH1oxl!$-rx9Bou{d z;N*^IXivU%C}kSW3wpFE6c|Slg)+nmK&Gb#d~dyjev~Vto?FxV9*?gu5(0$4snxca z)4j^BcgLWRXinyBnBO%!go@Sm?#o>q*DgXT?xLR1IRc5V*hK}(VF_3xpdC!#M1mesiCi^}Cyih>FyE4q|V06~sL ziJL}W#Ln+zQHXkwxTqY0y~#bD`{}z-&x9YXXOGJ`;HIDVBUQK!dA z2%?7w=LhBV(HO&>rxe_-DxM&1|5I-6L8w`s^ zka`i)MTYN!4_yY>1t5=@#nQ;DJRyU&4~DhiG_WmajqPpNbo$!>j*N8s6fnCvl}o%$ z!sjD4@gIHt>>e)sj`5oIQ~ZZP@6Xi(KykYZnLc&WXUQTw{hvZWM!y!Dd<20po4jEq z(a@_%y3>c3C=&;o_Aw(dB9g}qNHISk;IEeM;@8PBu`8uCFHzp$+Hz3YKyPlT*Gh|{ zYTaZGL>NBg7F@)jlDfOOS>giVVjrp8%r~hw<#ad61)zXefJGM)x_e4M&?VHvA(DI_ zjPduA&vG_l!9y(SEbqoQ&$zQG?|{R4#{IV&?c;xSp>@5nl-e%;gb*eBPZ|)3{*!`~ zVY(u4VBd!=>ofQ+HPjv@Dm)rsEFLqlMNFy2LHGR6Y*X`47Ybqg6Mi&Zhn2i&?~&WP zXoP3 + + + +
+
+
+
+
+ + +
+
+
+
+
+ + +
@@ -26,8 +48,8 @@
-
-
+
+
@@ -65,8 +87,8 @@
-
-
+
+
@@ -83,7 +105,7 @@
-
+
diff --git a/resources/views/layouts/app.blade.php b/resources/views/layouts/app.blade.php index e0d57f0..6a3d3e3 100644 --- a/resources/views/layouts/app.blade.php +++ b/resources/views/layouts/app.blade.php @@ -7,9 +7,9 @@ - {{ config('app.name', 'Argon Dashboard') }} + {{ config('app.name', 'Ar-Rahn Panel') }} - + diff --git a/resources/views/pembayaran/senaraibayaran.blade.php b/resources/views/pembayaran/senaraibayaran.blade.php index 1fbe436..2c20821 100644 --- a/resources/views/pembayaran/senaraibayaran.blade.php +++ b/resources/views/pembayaran/senaraibayaran.blade.php @@ -13,8 +13,7 @@
diff --git a/resources/views/penyata/summary.blade.php b/resources/views/penyata/summary.blade.php index d0fb3b1..9926881 100644 --- a/resources/views/penyata/summary.blade.php +++ b/resources/views/penyata/summary.blade.php @@ -112,6 +112,38 @@ text-align: center; } + + .btn-sub{ + border-radius: 12px; + font-size: 14px; + background-color: #008CBA; + border: none; + color: white; + padding: 10px 10px; + text-align: center; + text-decoration: none; + display: inline-block; + } + + .btn-sub:hover{ + background-color: #4CAF50; /* Green */ + color: white; + cursor: pointer; + } + + .tablebayaran{ + margin-left:auto; + margin-right:auto; + border-spacing:10px; + } + + input[type=text] { + width: 70%; + padding: 7px 10px; + margin: 8px 0; + box-sizing: border-box; + } + @@ -176,9 +208,10 @@
- +
- + + @foreach($gadai as $index1=>$gad) @@ -190,37 +223,44 @@ echo($formattedweddingdate) @endphp - - + + + + + @endforeach + @foreach($transaction as $index=>$trans) + + + + + + + @endforeach - @php - $poskod = Http::get($api_url . '/api/poskod/' . $customer['poskod'])->json(); - $negeri = Http::get($api_url . '/api/negeri/' . $poskod['kodnegeri'])->json(); - $daerah = Http::get($api_url . '/api/daerah/' . $poskod['koddaerah'])->json(); - - @endphp - - - - - - - - + - - - - - + +
TRANSAKSI PELANGGANTRANSAKSI PELANGGAN(RM)
:{{ number_format($gad['pinjaman'],2) }}:{{ number_format($gad['pinjaman'],2) }}
+ @php + $myDateTime = DateTime::createFromFormat('Y-m-d', $gad['t_gadai']); + $formattgadai = $myDateTime->format('d/m/Y'); + + switch($trans['trans_type']){ + + case 'T': echo 'PELANGGAN TEBUS PENUH PADA ' . $formattgadai; + break; + case 'A': echo 'PELANGGAN BAYAR ANSURAN PADA ' . $formattgadai; + break; + case 'S': echo 'PELANGGAN TEBUS SEBAHAGIAN PADA ' . $formattgadai;; + break; + case 'P': echo 'PELANGGAN TAMBAH PINJAMAN PADA ' . $formattgadai;; + break; + } + + + @endphp:{{ number_format(($trans['duit_masuk']*-1),2) }}
Alamat:{!! strtoupper($customer['alamat1']) . ',
' . $customer['poskod'] . ', ' . strtoupper($daerah['namadaerah']) . ', ' . strtoupper($negeri['negeri']) !!}
Tarikh Cetak:@php - - $myDateTime = DateTime::createFromFormat('Y-m-d', '2021-04-04'); - $formattedweddingdate = $myDateTime->format('d-m-Y'); - echo($formattedweddingdate); - - @endphp
BAKI KESELURUHAN Baki Keseluruhansadsad:{{ number_format($gad['bakipjm'],2) }}
@@ -316,14 +356,22 @@
-
- - Dengan Ini saya bersetuju untuk membayar sejumlah wang ansuran keatas surat ini. -
-
- - -
+
+ + + + + + + + + + + +
NorujukanPembiayaanJumlah Pembiayaan
{{ $gad['norujukan'] }}{{ number_format($gad['pinjaman'],2) }}
+ + +
diff --git a/resources/views/semak/semaksag.blade.php b/resources/views/semak/semaksag.blade.php index 17bc9b0..7f0adfe 100644 --- a/resources/views/semak/semaksag.blade.php +++ b/resources/views/semak/semaksag.blade.php @@ -3,28 +3,25 @@ @section('content') @include('layouts.headers.cards') -
- -
- -
- -
- - + + +
+
+
+
+
+ + +
+
- {{--
- New - Filters -
--}}
-
@@ -62,8 +59,6 @@
- -
@endsection @push('js') diff --git a/routes/web.php b/routes/web.php index cb75222..3fbeea4 100644 --- a/routes/web.php +++ b/routes/web.php @@ -29,9 +29,9 @@ Route::group(['middleware' => 'auth'], function () { Route::get('profile', ['as' => 'profile.edit', 'uses' => 'App\Http\Controllers\ProfileController@edit']); Route::put('profile', ['as' => 'profile.update', 'uses' => 'App\Http\Controllers\ProfileController@update']); Route::get('upgrade', function () {return view('pages.upgrade');})->name('upgrade'); - Route::get('map', function () {return view('pages.maps');})->name('map'); - Route::get('icons', function () {return view('pages.icons');})->name('icons'); - Route::get('table-list', function () {return view('pages.tables');})->name('table'); + Route::get('map', function () {return view('pages.maps');})->name('map'); + Route::get('icons', function () {return view('pages.icons');})->name('icons'); + Route::get('table-list', function () {return view('pages.tables');})->name('table'); Route::put('profile/password', ['as' => 'profile.password', 'uses' => 'App\Http\Controllers\ProfileController@password']); }); @@ -40,66 +40,29 @@ Auth::routes(); Route::get('/home', 'App\Http\Controllers\HomeController@index')->name('home'); Route::group(['middleware' => 'auth'], function () { - Route::resource('user', 'App\Http\Controllers\UserController', ['except' => ['show']]); - Route::get('profile', ['as' => 'profile.edit', 'uses' => 'App\Http\Controllers\ProfileController@edit']); - Route::put('profile', ['as' => 'profile.update', 'uses' => 'App\Http\Controllers\ProfileController@update']); - Route::get('upgrade', function () {return view('pages.upgrade');})->name('upgrade'); - Route::get('map', function () {return view('pages.maps');})->name('map'); - Route::get('icons', function () {return view('pages.icons');})->name('icons'); - Route::get('table-list', function () {return view('pages.tables');})->name('table'); - Route::put('profile/password', ['as' => 'profile.password', 'uses' => 'App\Http\Controllers\ProfileController@password']); + Route::get('/semaksag', 'App\Http\Controllers\SemakController@SemakSAG')->name('semaksag'); + Route::post('/senaraisag', 'App\Http\Controllers\SemakController@SenaraiSAG')->name('senaraisag'); + Route::get('/semakbayaran', 'App\Http\Controllers\BayaranController@SenaraiPembayaran')->name('pembayaransag'); + Route::get('/analisa', 'App\Http\Controllers\AnalisaController@index')->name('analisa.index'); + Route::get('/penyata/{norujukan}', 'App\Http\Controllers\SemakController@Penyata')->name('penyata.show'); + Route::get('/penyata/summary/{norujukan}', 'App\Http\Controllers\SemakController@PenyataSummary')->name('penyata.summary'); + Route::post('/paymentaction', 'App\Http\Controllers\BayaranController@PembayaranAction')->name('payment.action'); }); -Route::get('/semaksag', 'App\Http\Controllers\SemakController@SemakSAG')->name('semaksag'); -Route::post('/senaraisag', 'App\Http\Controllers\SemakController@SenaraiSAG')->name('senaraisag'); -Route::get('/semakbayaran', 'App\Http\Controllers\BayaranController@SenaraiPembayaran')->name('pembayaransag'); - -Route::get('/analisa', 'App\Http\Controllers\AnalisaController@index')->name('analisa.index'); - -Route::get('/penyata/{norujukan}', function ($norujukan) { - - $api_url = config('api.url'); - - $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. 'KB2')->json(); - $cawangan_detail=$cawangan[0]; - - $auth_user = Auth::user(); - - $customer = Http::get(config('api.url'). '/api/customers/'.$auth_user['icno'])->json(); - - $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); - - if(sizeof($gadai) != 0) - $gadai = $gadai[0]; - - $transaction = Http::get(config('api.url').'/api/transaction/norujukan/'. $norujukan)->json(); - - return view('penyata.penyata',compact('cawangan_detail','transaction','customer','gadai','api_url')); -})->name('penyata.show'); - -Route::get('/penyata/summary/{norujukan}', function ($norujukan) { - - $api_url = config('api.url'); - - $cawangan=Http::get(config('api.url').'/api/cawangan/detail/'. 'KB2')->json(); - $cawangan_detail=$cawangan[0]; - - $auth_user = Auth::user(); - - $customer = Http::get(config('api.url'). '/api/customers/'.$auth_user['icno'])->json(); - - $gadai = Http::get(config('api.url') . '/api/gadai/norujukan/'. $norujukan)->json(); - - if(sizeof($gadai) != 0) - $gadai = $gadai[0]; - - $transaction = Http::get(config('api.url').'/api/transaction/norujukan/'. $norujukan)->json(); - - return view('penyata.summary',compact('cawangan_detail','transaction','customer','gadai','api_url')); -})->name('penyata.summary'); -Route::post('/paymentaction', 'App\Http\Controllers\BayaranController@PembayaranAction')->name('payment.action'); + + +//For Reference + +// Route::resource('user', 'App\Http\Controllers\UserController', ['except' => ['show']]); + // Route::get('profile', ['as' => 'profile.edit', 'uses' => 'App\Http\Controllers\ProfileController@edit']); + // Route::put('profile', ['as' => 'profile.update', 'uses' => 'App\Http\Controllers\ProfileController@update']); + // Route::get('upgrade', function () {return view('pages.upgrade');})->name('upgrade'); + // Route::get('map', function () {return view('pages.maps');})->name('map'); + // Route::get('icons', function () {return view('pages.icons');})->name('icons'); + // Route::get('table-list', function () {return view('pages.tables');})->name('table'); + // Route::put('profile/password', ['as' => 'profile.password', 'uses' => 'App\Http\Controllers\ProfileController@password']);