Merge branch 'new-pipi' into 'new-super'

New pipi

See merge request online-sistem1/kaunter!155
This commit is contained in:
Zakwan Hamdan
2021-08-19 20:00:27 +00:00
23 changed files with 1192 additions and 722 deletions
Vendored
BIN
View File
Binary file not shown.
@@ -446,7 +446,8 @@ class AliranTunaiController extends Controller
$gadaian = floatval($totalgadai);
if(strtoupper(Auth::user()->name) === 'LELONG'){
$bakisemasa = $lelongan;
$penebusanbarcodescanned = floatval($lelongan);
$bakisemasa = floatval($lelongan) - floatval($totalserahan);
}else{
$bakisemasa = floatval($bakiawal) + floatval($totalpendahuluan) + floatval($penebusan) - (floatval($gadaian) + floatval($totalserahan)) - floatval($totaltuntutbaki);
}
+8 -2
View File
@@ -334,7 +334,7 @@ class GadaianController extends Controller
public function resitansurans($id)
{
$auth_user = Auth::user();
$totaltransaction = 0;
$transaction = Http::get(config('api.url') . '/api/transaction/one/'. $id)->json();
@@ -349,8 +349,14 @@ class GadaianController extends Controller
// if(sizeof($customers_info) != 0)
// $customers_info = $customers_info[0];
$wakil = Http::get(config('api.url') . '/api/getwakil/' . $auth_user['cawangan'] . '/code/' . $penebusan['nowakil'])->json();
return view('print.resitansuran',compact('transaction','gadai','customers_info'));
// dd($wakil);
if(sizeof($wakil) != 0)
$wakil = $wakil[0];
return view('print.resitansuran',compact('transaction','gadai','customers_info','wakil'));
}
public function resitbelumansurans($id)
+1 -6
View File
@@ -1224,7 +1224,6 @@ class KhazanahController extends Controller
]);
return redirect()->route('khazanah.serahan');
}
public function kemaskiniPendahuluan(Request $request) //Daftar Pendahuluan kepada Kaunter
@@ -1386,9 +1385,6 @@ class KhazanahController extends Controller
$amount = $request->amt;
// if($amount>$baki_awal){
// return redirect()->route('khazanah.serahan')->with('message', 'Jumlah yang dipinta melebihi baki dalam peti besi!.');
// }else{
$tarikh=$request->tarikh;
$kodlaluan=$request->teller;
@@ -1500,8 +1496,6 @@ class KhazanahController extends Controller
}
// }
$GetLatestBakiTunai=Http::get( config('api.url').'/api/getLatestBaki/'.$auth_user['cawangan'])->json();
$sumBaki=$GetLatestBakiTunai;
@@ -2272,6 +2266,7 @@ class KhazanahController extends Controller
public function pendahuluanserahanHQ(Request $request)
{
$auth_user = Auth::user();
$gldetail = Http::post(config('api.url').'/api/gldetailkaunter/'. $auth_user['cawangan'],[
BIN
View File
Binary file not shown.
Binary file not shown.

After

Width:  |  Height:  |  Size: 54 KiB

@@ -295,6 +295,15 @@
function serahankemaskini(data)
{
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading();
}
});
$.ajax({
type: 'get',
url: "{{ route('periksa.alirantunai') }}",
@@ -323,6 +332,15 @@
closeOnClickOutside: false
}).then(function() {
location.reload();
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading();
}
});
});
}else{
@@ -333,6 +351,15 @@
closeOnClickOutside: false
}).then(function() {
location.reload();
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading();
}
});
});
}
}
@@ -345,6 +372,15 @@
function periksaalirantunai()
{
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading();
}
});
$.ajax({
type: 'get',
url: "{{ route('periksa.alirantunai') }}",
@@ -357,6 +393,15 @@
text: 'Aliran tunai selari dengan sistem!'
}).then(function() {
location.reload();
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading();
}
});
});
}else{
@@ -371,6 +416,7 @@
"penebusan" : balasbalik['penebusan']
},
success: function(balas){
if(balas == 'berjaya')
{
Swal.fire({
@@ -380,6 +426,15 @@
closeOnClickOutside: false
}).then(function() {
location.reload();
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading();
}
});
});
}else{
@@ -390,6 +445,15 @@
closeOnClickOutside: false
}).then(function() {
location.reload();
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading();
}
});
});
}
@@ -520,7 +520,7 @@
</table>
<h5>CATATAN:</h5> Serahan kepada peti besi ialah sebanyak <span>RM </span>
Baki Tunai Semasa sebanyak <span>RM </span>
Baki Tunai Semasa sebanyak <span>RM {{ number_format($totalsemua,2) }}</span>
<br>
<br>
+411 -214
View File
@@ -454,6 +454,12 @@
});
});
$('a[data-toggle="tab"]').on('shown.bs.tab', function (e) {
// here is the new selected tab id
var selectedTabId = e.target.id;
});
var tablegadai = $('#myTable').DataTable({
"scrollX": true
});
@@ -487,188 +493,209 @@
$.ajax({
method:'get',
url: api_url + '/api/polis/get/',
url: api_url + '/api/check/serah/lelong',
datatype:'json',
data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'norujukan': norujukan
},
success:function(data){
if(data == 0){
var count = Object.keys(data).length;
if(count > 0)
{
if(data[0].tebus === 0)
{
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger mr-1'
},
buttonsStyling: false
});
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Khazanah',
text: "Surat Akuan Gadaian Hilang!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
if (result.isConfirmed) {
let komen = "Surat Akuan Gadaian Hilang|" + '-' + "|" + '-' + "|" + '-' + "| Tambah Pinjaman";
let teller = "{{ Auth::user()->name }}";
Swal.fire({
title: 'Tunggu Pengesahan Daripada Khazanah.',
icon: 'info',
width: 600,
padding: '3em',
background: '#fffff',
showCancelButton: false,
showConfirmButton: false,
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false
})
let siricreated = 0;
$.ajax({
method:'post',
url: "{{ route('khazanah.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"jumpinjam" : '0.00',
"teller" : teller
},
success:function(data){
siricreated = data;
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1',
encrypted: true
});
var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
Swal.fire({
icon: 'success',
title: 'Telah Disahkan'
}).then(function(){
$.ajax({
method:'put',
url: api_url + '/api/polis/put/',
data: {
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'norujukan': norujukan,
'tebus' : 1
},
success:function(data){
location.reload();
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
});
}
else if(data.kelulusan == 'batal')
{
Swal.fire({
icon: 'warning',
title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}`
}).then(function(){
return false;
});
}
}
});
}
else if (result.dismiss === Swal.DismissReason.cancel) {
swalWithBootstrapButtons.fire(
'Gagal',
'Gagal mendapatkan kelulusan khazanah',
'error'
)
}
});
}
else
{
$.ajax({
method:'get',
url: api_url + '/api/check/serah/gadai',
datatype:'json',
data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'norujukan': norujukan
},
success:function(data){
if(data == 'true'){
window.location = urlpenebusan;
}else if(data == 'false'){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Gadaian Belum Scan Barcode'
});
}
}
});
}
}else{
$.ajax({
method:'get',
url: api_url + '/api/check/serah/gadai',
url: api_url + '/api/polis/get/',
datatype:'json',
data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'norujukan': norujukan
},
success:function(data){
if(data == 'true'){
window.location = urlpenebusan;
}else if(data == 'false'){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Gadaian Belum Scan Barcode'
});
var count = Object.keys(data).length;
if(count > 0)
{
if(data[0].tebus === 0)
{
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger mr-1'
},
buttonsStyling: false
});
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Khazanah',
text: "Surat Akuan Gadaian Hilang!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
if (result.isConfirmed) {
let komen = "Surat Akuan Gadaian Hilang|" + '-' + "|" + '-' + "|" + '-' + "| Tambah Pinjaman";
let teller = "{{ Auth::user()->name }}";
Swal.fire({
title: 'Tunggu Pengesahan Daripada Khazanah.',
icon: 'info',
width: 600,
padding: '3em',
background: '#fffff',
showCancelButton: false,
showConfirmButton: false,
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false
})
let siricreated = 0;
$.ajax({
method:'post',
url: "{{ route('khazanah.createkelulusan') }}",
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : norujukan,
"komen" : komen,
"jumpinjam" : '0.00',
"teller" : teller
},
success:function(data){
siricreated = data;
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1',
encrypted: true
});
var channel = pusher.subscribe('notice-kelulusan');
channel.bind('my-kelulusan', function(data) {
if(data.norujukan == norujukan && data.siri == siricreated && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
Swal.fire({
icon: 'success',
title: 'Telah Disahkan'
}).then(function(){
$.ajax({
method:'put',
url: api_url + '/api/polis/put/',
data: {
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'norujukan': norujukan,
'tebus' : 1
},
success:function(data){
location.reload();
},
error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
});
}
else if(data.kelulusan == 'batal')
{
Swal.fire({
icon: 'warning',
title: 'Telah Dibatalkan',
text: `Komen : ${data.komen}`
}).then(function(){
return false;
});
}
}
});
}
else if (result.dismiss === Swal.DismissReason.cancel) {
swalWithBootstrapButtons.fire(
'Gagal',
'Gagal mendapatkan kelulusan khazanah',
'error'
)
}
});
}
else
{
$.ajax({
method:'get',
url: api_url + '/api/check/serah/gadai',
datatype:'json',
data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'norujukan': norujukan
},
success:function(data){
if(data == 'true'){
window.location = urlpenebusan;
}else if(data == 'false'){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Gadaian Belum Scan Barcode'
});
}
}
});
}
}else{
$.ajax({
method:'get',
url: api_url + '/api/check/serah/gadai',
datatype:'json',
data:{
'kodcaw': "{{ $cawangan_info['kodcaw'] }}",
'norujukan': norujukan
},
success:function(data){
if(data == 'true'){
window.location = urlpenebusan;
}else if(data == 'false'){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Gadaian Belum Scan Barcode'
});
}
}
});
}
}
});
});
}else if(data == 1){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Gadaian Sedang Dilelong..'
});
}
}
});
});
}
@@ -801,40 +828,56 @@
text: 'Sila pilih salah satu SAG'
});
}else{
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading()
}
});
$.ajax({
method:'get',
url:'{{ route("gadai.history") }}',
data:{ "norujukan" : histid},
success:function(data)
{
$('#historytebusModal').modal();
historytebustable(data);
$.ajax({
method: 'get',
url: api_url + '/api/transaction/' + histid,
success: function(data){
historybayarantable(data);
$.ajax({
method:'get',
url: api_url + '/api/gadai/norujukan/'+histid,
success:function(gadai){
rekodasal(gadai);
$.ajax({
method:'get',
url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid,
success:function(ansuran){
rekodansuran(ansuran);
Swal.close();
$('#historytebusModal').modal();
}
});
}
});
}
});
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
$.ajax({
method: 'get',
url: api_url + '/api/transaction/' + histid,
success: function(data){
historybayarantable(data);
}
});
$.ajax({
method:'get',
url: api_url + '/api/gadai/norujukan/'+histid,
success:function(gadai){
rekodasal(gadai);
}
});
$.ajax({
method:'get',
url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid,
success:function(ansuran){
rekodansuran(ansuran);
}
});
}
}else if($("input[name='options']:checked").val() == 'sudah_tebus'){
let histid = $('input[name="sudahtebus"]:checked').val();
@@ -846,39 +889,53 @@
text: 'Sila pilih salah satu SAG'
});
}else{
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading()
}
});
$.ajax({
method:'get',
url:'{{ route("gadai.history") }}',
data:{ "norujukan" : histid},
success:function(data){
$('#historytebusModal').modal();
historytebustable(data);
$.ajax({
method: 'get',
url: api_url + '/api/transaction/' + histid,
success: function(data){
historybayarantable(data);
}
});
$.ajax({
method:'get',
url:api_url + '/api/gadai/norujukan/'+histid,
success:function(gadai){
rekodasal(gadai);
}
});
$.ajax({
method:'get',
url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid,
success:function(ansuran){
rekodansuran(ansuran);
}
});
$('#historytebusModal').modal();
Swal.close();
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
$.ajax({
method: 'get',
url: api_url + '/api/transaction/' + histid,
success: function(data){
historybayarantable(data);
}
});
$.ajax({
method:'get',
url:api_url + '/api/gadai/norujukan/'+histid,
success:function(gadai){
rekodasal(gadai);
}
});
$.ajax({
method:'get',
url: api_url + '/api/ansuran/' + "{{ $cawangan_info['kodcaw'] }}" + '/' + histid,
success:function(ansuran){
rekodansuran(ansuran);
}
});
}
}
}
@@ -1494,14 +1551,154 @@
if($("input[name='options']:checked").val() == 'belum_tebus'){
let test1 = $('input[name="belum"]:checked').closest('tr').children('td:eq(2)').text();
let tarikhgadai2 = new Date(test1);tarikhgadai2.setHours(0, 0, 0, 0);
if(+harini !== +tarikhgadai2){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Hapus Gadai Tidak Dibenarkan'
});
return false;
var id = $('.tab-content .active').attr('id');
if(id == "nav-tawarruq-tab") {
if(+harini !== +tarikhgadai2){
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Hapus Gadai Tidak Dibenarkan'
});
return false;
}
}
else {
$.ajax({
method:'get',
url: api_url + '/api/upahlamatoday/' + kodcaw + '/' + hapusid,
success:function(data){
console.log(data);
if(data == 1){
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
cancelButton: 'btn btn-danger'
},
buttonsStyling: false
});
swalWithBootstrapButtons.fire({
title: 'Dapatkan Pengesahan Khazanah',
text: "Hapus Upah Lama!",
icon: 'info',
showCancelButton: true,
confirmButtonText: 'Hantar',
cancelButtonText: 'Batal',
reverseButtons: true
}).then((result) => {
if(result.isConfirmed) {
Swal.fire({
title: 'Tunggu Pengesahan Daripada Khazanah.',
icon: 'info',
width: 600,
padding: '3em',
background: '#fffff',
showCancelButton: false,
showConfirmButton: false,
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false
})
let mohon = "Hapus Upah Lama";
let id = hapusid;
$.ajax({
method:'post',
url: '{{ route("teller.createkelulusan") }}',
data: {
"_token": "{{ csrf_token() }}",
"norujukan" : id,
"mohon" : mohon
},
success:function(data){
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
let teller = "{{ Auth::user()->name }}";
var pusher = new Pusher("{{ env('PUSHER_APP_KEY') }}", {
cluster: 'ap1',
encrypted: true
});
var channel = pusher.subscribe('notice-ubahhapus');
channel.bind('my-ubahhapus', function(data) {
if(data.norujukan == id && data.teller == teller)
{
if(data.kelulusan == 'lulus')
{
Swal.fire({
icon: 'success',
title: 'Telah Disahkan'
}).then(function(){
$.ajax({
method:'post',
url: api_url + '/api/removeupahlamatoday/' + kodcaw + '/' + id,
success:function(data){
if(data == 1)
{
swalWithBootstrapButtons.fire(
'Hapus!',
'Maklumat upah lama telah dihapuskan.',
'success'
).then(function(){
location.reload();
});
}else{
swalWithBootstrapButtons.fire(
'Hapus!',
'Maklumat Upah lama tidak berjaya untuk dihapuskan.',
'error'
).then(function(){
location.reload();
});
}
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
return true;
});
}
}
});
}
});
return false;
}
else{
Swal.fire({
icon: 'error',
title: 'Amaran',
text: 'Hapus Upah Tidak Dibenarkan'
});
return false;
}
},error: function(xhr, status, error) {
var err = eval("(" + xhr.responseText + ")");
alert(xhr.responseText);
}
});
}
return false;
}else if($("input[name='options']:checked").val() == 'sudah_tebus'){
let test = $('input[name="sudahtebus"]:checked').closest('tr').children('td:eq(2)').text();
let tarikhgadai1 = new Date(test);tarikhgadai1.setHours(0, 0, 0, 0);
@@ -272,6 +272,13 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-addtunai" role="tabpanel" aria-labelledby="addtunai-tab">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div> --}}
<table class="table table-striped table-hover text-center" id="tableaddtunai-{{ $ls->id }}">
<thead class="thead-dark">
<tr>
@@ -300,6 +307,13 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="gt-tab">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div> --}}
<table class="table text-center table-striped table-hover" id="tablegadaitebus-{{ $ls->id }}">
<thead class="thead-dark">
<tr>
@@ -333,6 +347,13 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="tuntutbaki-tab">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div> --}}
<table class="table text-center table-striped table-hover" id="tabletuntutbaki-{{ $ls->id }}">
<thead class="thead-dark">
<tr>
@@ -517,6 +538,15 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-addtunai" role="tabpanel" aria-labelledby="addtunai-tab">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div> --}}
<table class="table text-center table-striped table-hover" id="tableaddtunai-{{ $ls->id }}">
<thead class="thead-dark">
<tr>
@@ -546,6 +576,14 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-gt" role="tabpanel" aria-labelledby="gt-tab">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div> --}}
<table class="table text-center table-striped table-hover" id="tablegadaitebus-{{ $ls->id }}">
<thead class="thead-dark">
<tr>
@@ -579,6 +617,14 @@
</div>
<div class="tab-pane fade" id="nav-{{ $ls->id }}-tuntutbaki" role="tabpanel" aria-labelledby="tuntutbaki-tab">
{{-- <div class="input-group mb-3 col-4" style="margin-left:-15px;">
<div class="input-group-prepend">
<span class="input-group-text" id="basic-addon1">Tarikh</span>
</div>
<input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetarikh" name="datetarikh" aria-describedby="basic-addon1">
</div> --}}
<table class="table text-center table-striped table-hover" id="tabletuntutbaki-{{ $ls->id }}">
<thead class="thead-dark">
<tr>
+1 -1
View File
@@ -171,7 +171,7 @@
<div class="inner">
<h3>RM {{ ($dashboard[0]['variasi']) ? number_format((float)$dashboard[0]['variasi'],2) : "0.00" }}</h3>
<p>Variasi</p>
<p>Varian</p>
</div>
<div class="icon">
</div>
@@ -16,30 +16,24 @@
</nav>
<div class="card-body text-center">
<div class="row form-group">
<div class="col-md-2">
</div>
<div class="col-md-15">
</div>
<div class="row form-group">
<div class="col-md-2"></div>
<div class="col-md-15"></div>
</div>
<div class="container">
<form method="post" onsubmit="loadingmodal()">
@csrf
<div class="row">
<div class="col-sm-2">Tarikh</div>
<div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker2" name="datetimepicker2" autocomplete="off" aria-describedby="basic-addon1"></div>
</div>
<div class="container">
<form method="post">
@csrf
<div class="row">
<div class="col-sm-2">Tarikh</div>
<div class="col-sm-4"><input type="text" class="form-control" placeholder="Pilih Tarikh" aria-label="Tarikh" id="datetimepicker2" name="datetimepicker2" autocomplete="off" aria-describedby="basic-addon1"></div>
</div>
<br>
<div class="row">
<div class="col-sm-3"></div>
<div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Laporan " formaction="{{route('imbangduga.cetak')}}">
</div>
<div class="col-sm-3"></div>
<div class="col-sm-1"> <input type="submit" class="btn btn-success ml-md-1" id="submit_button" name="submit_button" value="Cetak Laporan " formaction="{{route('imbangduga.cetak')}}"></div>
</div>
</form>
</div><!--end section form-->
</form>
</div>
</div>
</div>
</div>
@@ -60,6 +54,18 @@
});
function loadingmodal()
{
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading()
}
});
}
</script>
@endsection
@@ -142,7 +142,6 @@
tb['cajlelong'],
tb['jumlah']
]).draw();
counter = counter + 1;
$('#totalcajlelong').text(formatter.format(totalcajlelong));
$('#totaljumlah').text(formatter.format(totaljumlah));
@@ -345,6 +345,8 @@
});
}
},error: function(jqXHR, textStatus, errorThrown) {
console.log(textStatus, errorThrown);
}
});
}
+2 -4
View File
@@ -253,8 +253,8 @@
}
});
return false;
return false;
const swalWithBootstrapButtons = Swal.mixin({
customClass: {
confirmButton: 'btn btn-success',
@@ -331,8 +331,6 @@
cluster: 'ap1',
encrypted: true
});
//let teller = "{{ Auth::user()->name }}";
var channel = pusher.subscribe('notice-ubahhapus');
channel.bind('my-ubahhapus', function(data) {
+6
View File
@@ -16,6 +16,7 @@
</div>
<div class="col-4">
<input type="text" class="form-control" id="nowakil" name="nowakil" readonly/>
<span name="errornowakil" style="color:red;"></span>
</div>
</div>
@@ -28,6 +29,7 @@
</div>
<div class="col-7">
<input type="text" class="form-control" id="nokpwakil" name="nokpwakil" readonly/>
<span name="errornokpwakil" style="color:red;"></span>
</div>
</div>
@@ -37,6 +39,7 @@
</div>
<div class="col-8">
<input type="text" class="form-control" id="namawakil" name="namawakil"/>
<span name="errornamawakil" style="color:red;"></span>
</div>
</div>
@@ -47,6 +50,7 @@
</div>
<div class="col-8">
<input type="text" class="form-control" id="alamatwakil" name="alamatwakil"/>
<span name="erroralamatwakil" style="color:red;"></span>
</div>
</div>
@@ -56,6 +60,7 @@
</div>
<div class="col-6">
<input type="text" class="form-control" id="notelwakil" name="notelwakil"/>
<span name="errornotelwakil" style="color:red;"></span>
</div>
</div>
@@ -65,6 +70,7 @@
</div>
<div class="col-8">
<input type="text" class="form-control" name="notawakil" id="notawakil"/>
<span name="errornotawakil" style="color:red;"></span>
</div>
</div>
+216 -59
View File
@@ -2428,6 +2428,17 @@
function wakilfunction(e)
{
let wakil = $('#wakiltxt').val();
if(wakil === null || wakil === '')
{
Swal.fire(
'Amaran!',
'Sila masukkan nilai di dalam kotak wakil!',
'error'
)
return false;
}
var patternregex = /\s+|[-,\/]/g;
@@ -2449,7 +2460,7 @@
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false,
confirmButtonText: '<i class="fa fa-thumbs-up"></i> Daftar Dulu Boss!',
confirmButtonText: 'Daftar',
icon: 'info',
title: 'Maklumat anda tiada dalam senarai wakil! Tekan button okay untuk mendaftar!'
}).then(function(){
@@ -2499,90 +2510,236 @@
let nota = $('#notawakil').val();
let nokp = $('#nokpwakil').val();
$.ajax({
method:'POST',
url: "{{ route('wakil.create') }}",
data:{
"_token": "{{ csrf_token() }}",
"nopelanggan" : nopelanggan,
"nowakil" : nowakil,
"nama" : nama,
"hubungan" : hubungan,
"alamat" : alamat,
"telefon" : telefon,
"nota" : nota,
"icno" : nokp
},
success:function(data){
let boolnowakil = false;let boolnama = false;let boolalamat = false;let booltelefon = false;let boolnota = false;let boolnokp = false;
if(data == 1)
{
$('#WakilModal').hide();
$('#WakilModal').modal('hide');
nw = nowakil;
Swal.fire({
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false,
confirmButtonText: '<i class="fa fa-thumbs-up"></i> Baik Boss!',
icon: 'success',
title: 'Berjaya Mendaftar Wakil Pelanggan!'
}).then(function(){
$('#wakiltxt').prop( "disabled", true );
$('#caribtn').html("Ubah");
$('#caribtn').attr("onclick","ubahwakil(this)");
if(nowakil === null || nowakil === '')
{
$("[name='errornowakil']").show();
$("[name='errornowakil']").text("*No wakil tidak dijana lagi!");
$("[name='nowakil']").addClass('is-invalid');
});
boolnowakil = true;
}else{
$("[name='errornowakil']").hide();
$("[name='nowakil']").removeClass('is-invalid');
boolnowakil = false;
}
if(nama === null || nama === '')
{
$("[name='errornamawakil']").show();
$("[name='errornamawakil']").text("*Isikan nama dalam kotak!");
$("[name='namawakil']").addClass('is-invalid');
boolnama = true;
}else{
$("[name='errornamawakil']").hide();
$("[name='namawakil']").removeClass('is-invalid');
boolnama = false;
}
if(alamat === null || alamat === '')
{
$("[name='erroralamatwakil']").show();
$("[name='erroralamatwakil']").text("*Isikan alamat dalam kotak!");
$("[name='alamatwakil']").addClass('is-invalid');
boolalamat = true;
}else{
$("[name='erroralamatwakil']").hide();
$("[name='alamatwakil']").removeClass('is-invalid');
boolalamat = false;
}
if(telefon === null || telefon === '')
{
$("[name='errornotelwakil']").show();
$("[name='errornotelwakil']").text("*Isikan telefon dalam kotak!");
$("[name='notelwakil']").addClass('is-invalid');
booltelefon = true;
}else{
$("[name='errornotelwakil']").hide();
$("[name='notelwakil']").removeClass('is-invalid');
booltelefon = false;
}
if(nota === null || nota === '')
{
$("[name='errornotawakil']").show();
$("[name='errornotawakil']").text("*Isikan nota dalam kotak!");
$("[name='notawakil']").addClass('is-invalid');
boolnota = true;
}else{
$("[name='errornotawakil']").hide();
$("[name='notawakil']").removeClass('is-invalid');
boolnota = false;
}
if(nokp === null || nokp === '')
{
$("[name='errornokpwakil']").show();
$("[name='errornokpwakil']").text("*Isikan nokp dalam kotak!");
$("[name='nokpwakil']").addClass('is-invalid');
boolnokp = true;
}else{
$("[name='errornokpwakil']").hide();
$("[name='nokpwakil']").removeClass('is-invalid');
boolnokp = false;
}
if(boolnowakil == false && boolnama == false && boolalamat == false && booltelefon == false && boolnota == false && boolnokp == false)
{
$.ajax({
method:'POST',
url: "{{ route('wakil.create') }}",
data:{
"_token": "{{ csrf_token() }}",
"nopelanggan" : nopelanggan,
"nowakil" : nowakil,
"nama" : nama,
"hubungan" : hubungan,
"alamat" : alamat,
"telefon" : telefon,
"nota" : nota,
"icno" : nokp
},
success:function(data){
if(data == 1)
{
$('#WakilModal').hide();
$('#WakilModal').modal('hide');
nw = nowakil;
Swal.fire({
allowOutsideClick: false,
allowEscapeKey: false,
allowEnterKey: false,
confirmButtonText: '<i class="fa fa-thumbs-up"></i> Baik Boss!',
icon: 'success',
title: 'Berjaya Mendaftar Wakil Pelanggan!'
}).then(function(){
$('#wakiltxt').prop( "disabled", true );
$('#caribtn').html("Ubah");
$('#caribtn').attr("onclick","ubahwakil(this)");
});
}
},error: function (request, status, error) {
console.log(request.responseText);
}
});
return true;
}else{
return false;
}
},error: function (request, status, error) {
console.log(request.responseText);
}
});
}
$('#WakilModal').on('hidden.bs.modal', function (e) {
$("[name='errornowakil']").hide();
$("[name='nowakil']").removeClass('is-invalid');
$("[name='errornamawakil']").hide();
$("[name='namawakil']").removeClass('is-invalid');
$("[name='erroralamatwakil']").hide();
$("[name='alamatwakil']").removeClass('is-invalid');
$("[name='errornotelwakil']").hide();
$("[name='notelwakil']").removeClass('is-invalid');
$("[name='errornotawakil']").hide();
$("[name='notawakil']").removeClass('is-invalid');
$("[name='errornokpwakil']").hide();
$("[name='nokpwakil']").removeClass('is-invalid');
$(this).find(".invalid-feedback").hide();
});
function daftarfunction(id)
{
let kodcaw = "{{ Auth::user()->cawangan }}";
$('#nokpwakil').val(id);
$.ajax({
$.ajax({
method:'GET',
url: "{{ route('wakil.caricustomer') }}",
data:{ "icno" : id },
// url: "{{ route('wakil.caricustomer') }}",
url: api + '/api/customers/' + id,
// data:{ "icno" : id },
success:function(data){
$('#WakilModal').modal();
$('#namawakil').val('');
$('#alamatwakil').val(data['']);
$('#notelwakil').val(data['']);
$('#alamatwakil').val('');
$('#notelwakil').val('');
//get first wakil
$.ajax({
method:'GET',
url: "{{ route('wakil.first') }}",
success:function(getfirstwakil)
{
let firstwakil = parseInt(getfirstwakil);
$('#nowakil').val(firstwakil+1);
}
});
if(data != 'no-data')
var size = Object.keys(data).length;
if(size > 0)
{
$('#namawakil').val(data['nama']);
$('#alamatwakil').val(data['alamat1']);
$('#notelwakil').val(data['telefon']);
$('#nopelangganwakil').val(data['nopelanggan']);
}
//get first wakil
$.ajax({
method:'GET',
// url: "{{ route('wakil.first') }}",
url: api + '/api/firstwakil/' + kodcaw,
success:function(getfirstwakil)
{
let firstwakil = parseInt(getfirstwakil);
$('#nowakil').val(firstwakil+1);
Swal.close();
$('#WakilModal').modal();
},error: function (request, status, error) {
console.log(request.responseText);
Swal.close();
Swal.fire({
title: 'Punyai Ralat dalam API wakil...',
icon: 'error'
});
}
})
},error: function (request, status, error) {
console.log(request.responseText);
}
});
Swal.fire({
title: 'Memuatkan...',
allowEscapeKey : false,
allowOutsideClick: false,
didOpen: function () {
Swal.showLoading()
}
});
}
+391 -405
View File
@@ -1,416 +1,394 @@
<html>
<head>
<script src="{{ asset('js/jquery.min.js') }}"></script>
<style>
#header {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#header {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#header td, #customers th {
padding:4px;
font-size:12px;
}
#header tr:nth-child(even){background-color: #ffffff;}
#header tr:hover {background-color: #ddd;}
#header th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#scan {
font-family: Arial, Helvetica, sans-serif;
width: 100%;
border: 1px solid #ddd;
}
#scan td, #scan th {
padding: 8px;
font-size:20px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#scan {
font-family: Arial, Helvetica, sans-serif;
width: 100%;
}
#scan td, #scan th {
#header td, #customers th {
padding: 8px;
font-size:12px;
}
padding:4px;
font-size:12px;
}
#header tr:nth-child(even){background-color: #ffffff;}
#header tr:hover {background-color: #ddd;}
#header th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#loading {
position: fixed;
display: block;
width: 100%;
height: 100%;
top: 0;
left: 0;
text-align: center;
opacity: 0.7;
background-color: #fff;
z-index: 99;
}
#loading-image {
position: absolute;
top: 100px;
left: 240px;
z-index: 100;
}
#scan {
font-family: Arial, Helvetica, sans-serif;
width: 100%;
border: 1px solid #ddd;
}
#scan td, #scan th {
padding: 8px;
font-size:20px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#scan {
font-family: Arial, Helvetica, sans-serif;
width: 100%;
}
#scan td, #scan th {
padding: 8px;
font-size:12px;
}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:nth-child(even){background-color: #ffffff;}
#scan tr:hover {background-color: #ddd;}
#scan tr:hover {background-color: #ddd;}
#scan th {
border-collapse: collapse;
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#scan th {
border-collapse: collapse;
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#details td, #details th {
padding: 8px;
font-size:16px;
}
#details tr:nth-child(even){background-color: #ffffff;}
#details tr:hover {background-color: #ffffff;}
#details th {
padding-top: 12px;
font-style:bold;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#sign {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#sign td, #sign th {
padding: 8px;
font-size:11px;
text-align: center;
}
#sign tr:nth-child(even){background-color: #ffffff;}
#sign tr:hover {background-color: #ddd;}
#sign th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#title {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#title td, #title th {
padding:4px;
font-size:12px;
border: 0px solid #fff;
}
#title tr:nth-child(even){background-color: #ffffff;}
#title tr:hover {background-color: #ddd;}
#title th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:80%;
}
#details td, #details th {
padding:4px;
font-size:16px;
border: 1px solid #ddd;
}
#details tr:nth-child(even){background-color: #ffffff;}
#details tr:hover {background-color: #ddd;}
#details th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#tarikh_cetak {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#tarikh_cetak td, #tarikh_cetak th {
padding:4px;
font-size:10px;
}
#tarikh_cetak tr:nth-child(even){background-color: #ffffff;}
#tarikh_cetak tr:hover {background-color: #ddd;}
#tarikh_cetak th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#data {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 80%;
}
#data td, #data th {
padding:4px;
font-size:16px;
}
#data tr:nth-child(even){background-color: #ffffff;}
#data tr:hover {background-color: #ddd;}
#data th {
padding-top: 11px;
padding-bottom: 11px;
text-align: left;
padding:4px;
color:black;
font-size:14px;
}
#tarikh_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:45%;
}
#tarikh_ib td, #tarikh_ib th {
padding:4px;
font-size:12px;
}
#tarikh_ib tr:nth-child(even){background-color: #ffffff;}
#tarikh_ib tr:hover {background-color: #ddd;}
#tarikh_ib th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#GL {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#GL td, #GL th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#GL tr:nth-child(even){background-color: #ffffff;}
#GL tr:hover {background-color: #ddd;}
#GL th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#GL_dtl {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#GL_dtl td, #GL_dtl th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#GL_dtl tr:nth-child(even){background-color: #ffffff;}
#GL_dtl tr:hover {background-color: #ddd;}
#GL_dtl th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#dtl_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#dtl_ib td, #dtl_ib th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#dtl_ib tr:nth-child(even){background-color: #ffffff;}
#dtl_ib tr:hover {background-color: #ddd;}
#dtl_ib th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
#total_harta {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#total_harta td, #total_harta th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#total_harta tr:nth-child(even){background-color: #ffffff;}
#total_harta tr:hover {background-color: #ddd;}
#total_harta th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#details td, #details th {
padding: 8px;
font-size:16px;
}
#details tr:nth-child(even){background-color: #ffffff;}
#details tr:hover {background-color: #ffffff;}
#details th {
padding-top: 12px;
font-style:bold;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#sign {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 100%;
}
#sign td, #sign th {
padding: 8px;
font-size:11px;
text-align: center;
}
#sign tr:nth-child(even){background-color: #ffffff;}
#sign tr:hover {background-color: #ddd;}
#sign th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#title {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#title td, #title th {
padding:4px;
font-size:12px;
border: 0px solid #fff;
}
#title tr:nth-child(even){background-color: #ffffff;}
#title tr:hover {background-color: #ddd;}
#title th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#details {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:80%;
}
#details td, #details th {
padding:4px;
font-size:16px;
border: 1px solid #ddd;
}
#details tr:nth-child(even){background-color: #ffffff;}
#details tr:hover {background-color: #ddd;}
#details th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#tarikh_cetak {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 50%;
}
#tarikh_cetak td, #tarikh_cetak th {
padding:4px;
font-size:10px;
}
#tarikh_cetak tr:nth-child(even){background-color: #ffffff;}
#tarikh_cetak tr:hover {background-color: #ddd;}
#tarikh_cetak th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#data {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width: 80%;
}
#data td, #data th {
padding:4px;
font-size:16px;
}
#data tr:nth-child(even){background-color: #ffffff;}
#data tr:hover {background-color: #ddd;}
#data th {
padding-top: 11px;
padding-bottom: 11px;
text-align: left;
padding:4px;
color:black;
font-size:14px;
}
</style>
<style>
#tarikh_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:45%;
}
#tarikh_ib td, #tarikh_ib th {
padding:4px;
font-size:12px;
}
#tarikh_ib tr:nth-child(even){background-color: #ffffff;}
#tarikh_ib tr:hover {background-color: #ddd;}
#tarikh_ib th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#GL {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#GL td, #GL th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#GL tr:nth-child(even){background-color: #ffffff;}
#GL tr:hover {background-color: #ddd;}
#GL th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#GL_dtl {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#GL_dtl td, #GL_dtl th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#GL_dtl tr:nth-child(even){background-color: #ffffff;}
#GL_dtl tr:hover {background-color: #ddd;}
#GL_dtl th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#dtl_ib {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#dtl_ib td, #dtl_ib th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#dtl_ib tr:nth-child(even){background-color: #ffffff;}
#dtl_ib tr:hover {background-color: #ddd;}
#dtl_ib th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
<style>
#total_harta {
font-family: Arial, Helvetica, sans-serif;
border-collapse: collapse;
width:100%;
}
#total_harta td, #total_harta th {
padding:4px;
font-size:12px;
border: 1px solid #ddd;
}
#total_harta tr:nth-child(even){background-color: #ffffff;}
#total_harta tr:hover {background-color: #ddd;}
#total_harta th {
padding-top: 12px;
padding-bottom: 12px;
text-align: left;
padding:4px;
color:black;
}
</style>
</head>
<body>
<div id="loading">
<img id="loading-image" src="{{ asset('img/loader.gif') }}" alt="Loading..." />
</div>
<table id="header">
<tr>
<th rowspan="4" style="width:50px"><br><img src="{{ asset('img/ARRAHN1.png') }}" style="width:70px"></img></th>
@@ -528,5 +506,13 @@
</table>
<br>
<br>
<script>
$(window).load(function() {
$('#loading').hide();
});
</script>
</body>
</html>
@@ -313,7 +313,6 @@
<br>
<br>
<table id="title">
<td> <b><u>LEJER AM</u></b></td>
</table>
@@ -203,13 +203,14 @@
<th>J Tebus</th>
<th width="6%;">Nilai Marhun(RM)</th>
<th width="6%;">Pembiayaan(RM)</th>
{{-- <th width="6%;">Baki Pembiayaan(RM)</th> --}}
<th width="6%;">Upah/Keuntungan(RM)</th>
<th width="6%;">Bayaran(RM)</th>
<th width="6%;">Jumlah(RM)</th>
</tr>
@php $counter = 1;$totalnm = 0; $totalbayaran = 0; $totalpinjaman = 0; $totalupah = 0;@endphp
@foreach($tebus as $index=>$item)
@php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += $item['pinjaman']; $totalupah += $item['bakiupah']; $totalnm += $item['nilaimarhun'];@endphp
@php $totalbayaran += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; $totalpinjaman += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman']; $totalupah += $item['bakiupah']; $totalnm += $item['nilaimarhun'];@endphp
@if($index > 0)
@if($item['teller'] != $tebus[$index - 1]['teller'])
<tr>
@@ -240,13 +241,20 @@
<td>
{{ number_format($item['nilaimarhun'],2) }}
</td>
<td>{{ number_format($item['pinjaman'],2) }}</td>
<td>@php
if($item['hargajualan'] !== $item['bakihargajualan'])
echo number_format($item['gadaibakipjm'],2);
else
echo number_format($item['pinjaman'],2);
@endphp</td>
{{-- <td>{{ number_format($item['gadaibakipjm'],2) }}</td> --}}
<td>{{ number_format($item['bakiupah'],2) }}</td>
<td>{{ number_format($item['bakipjm'],2) }}</td>
<td>@php if($item['jenistebus'] == 'S'){ $total=($item['pinjaman']+$item['bakiupah']);echo number_format($total,2);} else echo number_format($item['bakipjm'],2); @endphp</td>
</tr>
@php $counter++; @endphp
@php $totalnmteller += $item['nilaimarhun']; $totalpinjamanteller += $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
@php $totalnmteller += $item['nilaimarhun']; $totalpinjamanteller += ($item['hargajualan'] != $item['bakihargajualan']) ? $item['gadaibakipjm'] : $item['pinjaman'];$totalupahteller += $item['bakiupah'];$totalbayaranteller += $item['bakipjm']; @endphp
@php $totaljumlahteller += ($item['jenistebus'] === 'S') ? ($item['pinjaman']+$item['bakiupah']) : $item['bakipjm']; @endphp
@if($index+1 < sizeof($tebus))
@if($item['teller'] != $tebus[$index + 1]['teller'])
@@ -114,7 +114,7 @@
<div class="col-6">{{ 'RM '. number_format($laporan['panjar_harian'],2) }}</div>
<div class="col-6">2. BULANAN</div>
<div class="col-6">{{ 'RM '. number_format($laporan['panjar_bulanan'],2) }}</div>
<div class="col-6">3. TERKUMPUL</div>
<div class="col-6">3. TERKUMPUL (TAHUNAN)</div>
<div class="col-6">{{ 'RM '. number_format($laporan['panjar_tahunan'],2) }}</div>
</div>
</div>
+2 -2
View File
@@ -394,11 +394,11 @@ hr.new5 {
</tr>
<tr>
<td colspan="3">Nama Wakil </td> <td>: </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
<td colspan="3">Nama Wakil </td> <td>: @php if(sizeof($wakil) != 0){ echo $wakil['nama'];} else echo ''; @endphp</td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
</tr>
<tr>
<td colspan="3">No K/P Wakil </td> <td>: </td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
<td colspan="3">No K/P Wakil </td> <td>: @php if(sizeof($wakil) != 0) echo $wakil['nokp']; else echo ''; @endphp</td> <td colspan="3"> </td> <td> </td><td> </td><td> </td><td> </td>
</tr>
</table>
<br>
+1 -1
View File
@@ -68,7 +68,7 @@ Route::get('/daftar_marhun',['as'=>'daftar_marhun','uses'=>'MarhunController@ind
Route::get('/penebusan/{norujukan}',['as'=>'penebusan','uses' => 'PenebusanController@index'])->middleware('auth','teller');
Route::get('/lelongan/{norujukan}',['as'=>'lelongan','uses' => 'LelongController@index'])->middleware('auth','teller');
Route::get('/aliran_tunai','AliranTunaiController@index')->middleware('auth','teller');
Route::get('/aliran_tunai/laporanserahan}',['as'=>'laporan.serahanteller','uses' => 'AliranTunaiController@LaporanSerahan'])->middleware('auth','teller');
Route::get('/aliran_tunai/laporanserahan',['as'=>'laporan.serahanteller','uses' => 'AliranTunaiController@LaporanSerahan'])->middleware('auth','teller');
Route::put('/aliran_tunai/Gadaian',['as'=>'alirantunai.gadai','uses' => 'AliranTunaiController@alirantunaiGadai'])->middleware('auth','teller');
Route::put('/aliran_tunai/Tebusan',['as'=>'alirantunai.tebus','uses' => 'AliranTunaiController@alirantunaiTebus'])->middleware('auth','teller');
Route::put('/aliran_tunai/advansur',['as'=>'alirantunai.advansur','uses' => 'AliranTunaiController@alirantunaiUpahBknTawarruq'])->middleware('auth','teller');