KoPKB/kaunter
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 1 Wiki Activity

Merge branch 'kaunter' into 'new-super'

Browse Source 
Kaunter

See merge request online-sistem1/kaunter!188
This commit is contained in:
Afiq Zakwan Hamdan
2021-12-01 00:07:40 +00:00
parent 8be0d6571c c2bf670590
commit 4e8e094a45
11 changed files with 124 additions and 40 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.DS_Store
Vendored
BIN
View File
Binary file not shown.
app/.DS_Store
Vendored
BIN
View File
Binary file not shown.
app/Events/.DS_Store
Vendored
BIN
View File
Binary file not shown.
app/Events/Dashboard/KomoditiNotify.php
+32
View File
@@ -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';
}
}
app/Events/Dashboard/PelangganNotify.php
+32
View File
@@ -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';
}
}
app/Http/Controllers/Auth/LoginController.php
+1 -1
View File
@@ -118,7 +118,7 @@ class LoginController extends Controller
return response()->json([ return response()->json([
'success' => false, 'success' => false,
'message' => 'Invalid Email or Password', 'message' => 'Invalid Email or Password',
], 401); ], 200);
} }
} }
app/Http/Controllers/CustomersController.php
+2
View File
@@ -13,6 +13,7 @@ use Illuminate\Support\Facades\Http;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Twilio\Rest\Client; use Twilio\Rest\Client;
use App\Komoditi; use App\Komoditi;
use App\Events\Dashboard\PelangganNotify;
use Carbon\Carbon; use Carbon\Carbon;
@@ -204,6 +205,7 @@ class CustomersController extends Controller
]); ]);
Session::put('customer_info',$customer_info); Session::put('customer_info',$customer_info);
event(new PelangganNotify('lulus',$auth_user['cawangan']));
return redirect()->route('customer_info')->with( ['customer_info' => $customer_info] ); return redirect()->route('customer_info')->with( ['customer_info' => $customer_info] );
} }
app/Http/Controllers/OperasiController.php
+7
View File
@@ -7,6 +7,7 @@ namespace App\Http\Controllers;
use App\Events\OperasiNotice; use App\Events\OperasiNotice;
use App\Events\StatusLiked; use App\Events\StatusLiked;
use App\Events\NotifikasiKelulusan; use App\Events\NotifikasiKelulusan;
use App\Events\Dashboard\KomoditiNotify;
use Illuminate\Support\Facades\Auth; use Illuminate\Support\Facades\Auth;
use Illuminate\Http\Request; use Illuminate\Http\Request;
@@ -234,4 +235,10 @@ class OperasiController extends Controller
return view('operasi.rekodtelahlulus',compact('cawangan_info','api_url','arraykelulusan')); return view('operasi.rekodtelahlulus',compact('cawangan_info','api_url','arraykelulusan'));
} }
public function notifyKomoditi()
{
$auth_user = Auth::user();
event(new KomoditiNotify('lulus',$auth_user['cawangan']));
}
} }
resources/views/operasi/komuditi/index.blade.php
+10
View File
@@ -414,9 +414,19 @@
text: 'Pendahuluan Unit Komuditi Berjaya' text: 'Pendahuluan Unit Komuditi Berjaya'
}); });
$('#pembelian_modal').modal('hide'); $('#pembelian_modal').modal('hide');
komoditiNotify();
} }
}); });
}); });
function komoditiNotify(){
$.ajax({
method:'get',
url: "{{ route('beli.notifyKomoditi') }}",
success:function(data){
console.log('berjaya');
}
});
}
</script> </script>
@endsection @endsection
resources/views/print/resitansuran.blade.php
+37 -38
View File
@@ -7,10 +7,10 @@
<meta name="viewport" content="width=device-width, initial-scale=1"> <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 src="https://ajax.googleapis.com/ajax/libs/jquery/3.3.1/jquery.min.js"></script>
<script> <script>
$(document).ready(function () { // $(document).ready(function () {
window.print(); // window.print();
window.onfocus=function(){ window.close();} // window.onfocus=function(){ window.close();}
}); // });
</script> </script>
<style> <style>
/* Red border */ /* Red border */
@@ -222,7 +222,7 @@ hr.new5 {
#payment { #payment {
font-family: Arial, Helvetica, sans-serif; font-family: Arial, Helvetica, sans-serif;
border-collapse:collapse; border-collapse:collapse;
width: 60%; width: 90%;
font-size:13px; font-size:13px;
border: 1px solid black; border: 1px solid black;
@@ -394,34 +394,34 @@ hr.new5 {
</table> </table>
<br> <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"> <table id="payment">
<tr> <tr>
<td style="width:10px">Harga/Baki Harga Jualan</td> <td style="width:30%">Harga Jualan/Baki</td>
<td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td> <td style="width:20%">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
<td style="width:10px">Pembiayaan/Baki Pembiayaan</td> <td style="width:30%">Pembiayaan/Baki</td>
<td style="width:10px">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td> <td style="width:20%">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
</tr> </tr>
<tr> <tr>
<td style="width:10px">Bayaran Harga Jualan</td> <td style="width:30%"><b>Bayaran Harga Jualan</b></td>
<td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td> <td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
<td style="width:10px">Ansuran Pembiyaan</td> <td style="width:30%">Ansuran Pembiyaan</td>
<td style="width:10px">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td> <td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
</tr> </tr>
<tr> <tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td> <td style="width:30%">Baki Harga Jualan</td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td> <td style="width:20%">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
<td style="width:10px"><b>Baki Pembiayaan</b></td> <td style="width:30%">Baki Pembiayaan</td>
<td style="width:10px">:<b> RM {{ number_format($gadai['bakipjm'],2) }}</b> </td> <td style="width:20%">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
</tr> </tr>
<tr> <tr>
<td style="width:10px"></td> <td style="width:10px"></td>
<td style="width:10px"></td> <td style="width:10px"></td>
<td style="width:10px"><b>Keuntungan</b></td> <td style="width:10px">Keuntungan</td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bayaran_keuntungan'],2) }}</b> </td> <td style="width:10px">: RM {{ number_format($transaction['bayaran_keuntungan'],2) }} </td>
</tr> </tr>
</table> </table>
<p style="float:left;position:absolute;margin-left:50px;"><i>* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan</i></p>
<br> <br>
@@ -496,35 +496,34 @@ hr.new5 {
</table> </table>
<br> <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"> <table id="payment">
<tr> <tr>
<td style="width:10px">Harga/Baki Harga Jualan</td> <td style="width:30%">Harga Jualan/Baki</td>
<td style="width:10px">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td> <td style="width:20%">: RM {{ number_format(($transaction['bakiharga'] + $transaction['duit_masuk']),2) }} </td>
<td style="width:10px">Pembiayaan/Baki Pembiayaan</td> <td style="width:30%">Pembiayaan/Baki</td>
<td style="width:10px">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td> <td style="width:20%">: RM {{ number_format(($gadai['bakipjm']+$transaction['bayaran_pembiayaan']),2) }} </td>
</tr> </tr>
<tr> <tr>
<td style="width:10px">Bayaran Harga Jualan</td> <td style="width:30%"><b>Bayaran Harga Jualan</b></td>
<td style="width:10px">: RM {{ number_format($transaction['duit_masuk'],2) }} </td> <td style="width:20%">: <b>RM {{ number_format($transaction['duit_masuk'],2) }} </b></td>
<td style="width:10px">Ansuran Pembiyaan</td> <td style="width:30%">Ansuran Pembiyaan</td>
<td style="width:10px">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td> <td style="width:20%">: RM {{ number_format($transaction['bayaran_pembiayaan'],2) }} </td>
</tr> </tr>
<tr> <tr>
<td style="width:10px"><b>Baki Harga Jualan</b></td> <td style="width:30%">Baki Harga Jualan</td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bakiharga'],2) }}</b> </td> <td style="width:20%">: RM {{ number_format($transaction['bakiharga'],2) }}</td>
<td style="width:10px"><b>Baki Pembiayaan</b></td> <td style="width:30%">Baki Pembiayaan</td>
<td style="width:10px">:<b> RM {{ number_format($gadai['bakipjm'],2) }}</b> </td> <td style="width:20%">: RM {{ number_format($gadai['bakipjm'],2) }} </td>
</tr> </tr>
<tr> <tr>
<td style="width:10px"></td> <td style="width:10px"></td>
<td style="width:10px"></td> <td style="width:10px"></td>
<td style="width:10px"><b>Keuntungan</b></td> <td style="width:10px">Keuntungan</td>
<td style="width:10px">:<b> RM {{ number_format($transaction['bayaran_keuntungan'],2) }}</b> </td> <td style="width:10px">: RM {{ number_format($transaction['bayaran_keuntungan'],2) }} </td>
</tr> </tr>
</table> </table>
<p style="float:left;position:absolute;margin-left:50px;"><i>* Keuntungan sebenar atas setiap baki pembiayaan akan direbat semasa penebusan</i></p>
<br> <br>
routes/web.php
+3 -1
View File
@@ -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/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/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/searchpelanggan',['as'=>'admin.searchpelanggan','uses'=>'KhazanahController@searchAdmin'])->middleware('auth','admin');
Route::get('admin/poskod',['as'=>'admin.poskod','uses'=>'HomeController@poskod']); Route::get('admin/poskod',['as'=>'admin.poskod','uses'=>'HomeController@poskod']);
Route::get('pembeliannotifykomuditi',['as'=>'beli.notifyKomoditi','uses'=>'OperasiController@notifyKomoditi'])->middleware('auth','operasi');