KoPKB/erahn-click
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'second' into 'main'

Browse Source 
fix sikit2

See merge request online-sistem1/arrahn-portal!29
This commit is contained in:
hafifie rahman
2022-05-23 15:02:13 +00:00
parent 57f92a937d ce7699904e
commit cd2c7ce9e7
4 changed files with 32 additions and 16 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/views/auth/pertama-kali/firsttime2.blade.php
+9 -5
View File
@@ -221,9 +221,13 @@
<div class="modal-content justify-content-center">
<div class="modal-header" style="text-align: center;">
<h5 class="modal-title" id="seterusnyaModalLabel">Maklumat Pelanggan</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span>
</button>
</div>
<div class="modal-body">
<p class="text-danger">*Sila semak maklumat pelanggan di bawah. Pelanggan hendaklah hadir di mana-mana cawangan Ar-Rahn berdekatan untuk membuat pengemaskinian maklumat pelanggan.</p>
<p class="text-danger text-sm text-justify">*Sila semak maklumat pelanggan di bawah. Pelanggan hendaklah hadir di mana-mana cawangan Ar-Rahn berdekatan untuk membuat pengemaskinian maklumat pelanggan.</p>
<div>
@if (Session::has('custdetail'))
<?php $customerdetails = Session::get('custdetail'); ?>
@@ -273,7 +277,7 @@
// $kodnegeri = Http::withOptions(['verify' => config('app.api_verify')])->get(config('api.url') .'/api/negeri/' .$customerdetails[0]['kodnegeri'] )->json();
@endphp
<textarea name="alamat" class="form-control input-group-outline" rows="2" disabled>{{ Session::has('custdetail') ? $customerdetails[0]['alamat1'] . ' ' . $customerdetails[0]['alamat2'] : old('alamat') }}
<textarea name="alamat" class="form-control input-group-outline" rows="2" disabled>{{ Session::has('custdetail') ? $customerdetails[0]['alamat1'] : old('alamat') }}
</textarea>
</div>
</div>
@@ -319,12 +323,12 @@
</div>
<div class="modal-footer justify-content-between">
<div class="modal-footer justify-content-center">
<!-- <button type="button" class="btn bg-gradient-dark mb-0" data-dismiss="modal">Close</button> -->
<button type="button" class="btn btn-danger mb-0" onclick="backfunc()" data-dismiss="modal">Salah</button>
{{-- <button type="button" class="btn btn-danger mb-0" onclick="backfunc()" data-dismiss="modal">Salah</button> --}}
<!-- <button type="button" class="btn bg-gradient-primary mb-0">Save changes</button> -->
<button id="betulbtn" type="submit" class="btn btn-success mb-0">Betul</button>
<button id="betulbtn" type="submit" class="btn btn-success mb-0">Sahkan</button>
</div>
</form>
</div>
resources/views/auth/verify.blade.php
+8 -4
View File
@@ -161,7 +161,7 @@
<table border="0" cellspacing="0" cellpadding="0">
<tr>
<td align="center" style="border-radius: 3px; background-color:#005CA7;">
<a href="#" target="_blank" style="font-size: 20px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; padding: 15px 25px; border-radius: 2px; border: 1px solid #10ac84; display: inline-block;" onclick="event.preventDefault(); document.getElementById('email-form').submit();">Hantar Semula</a>
<a href="#" target="_blank" style="font-size: 15px; font-family: Helvetica, Arial, sans-serif; color: #ffffff; text-decoration: none; color: #ffffff; text-decoration: none; padding: 15px 20px; border-radius: 5px; display: inline-block;" onclick="event.preventDefault(); document.getElementById('email-form').submit();">Hantar Semula</a>
</td>
</tr>
</table>
@@ -174,11 +174,11 @@
</table>
</td>
</tr> <!-- COPY -->
<tr>
{{-- <tr>
<td bgcolor="#ffffff" align="left" style="padding: 0px 30px 20px 30px; color: #666666; font-family: 'Lato', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;">
<p style="margin: 0;text-align:justify;">Sekiranya anda mempunyai sebarang pertanyaan, hantarkan email ke arrahncareline@gmail.com.</p>
</td>
</tr>
</tr> --}}
</table>
</td>
</tr>
@@ -186,13 +186,17 @@
<td align="center" style="padding: 30px 10px 0px 10px;">
<table border="0" cellpadding="0" cellspacing="0" width="100%" style="max-width: 600px;">
<tr>
<td bgcolor="#fff" align="center" style="padding: 30px 30px 30px 30px; border-radius: 4px 4px 4px 4px; color: #666666; font-family: 'Lato', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;">
{{-- <td bgcolor="#fff" align="center" style="padding: 30px 30px 30px 30px; border-radius: 4px 4px 4px 4px; color: #666666; font-family: 'Lato', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;">
<p style="margin: 0;"><button href="{{ route('logout') }}" onclick="event.preventDefault(); document.getElementById('logout-form').submit();" class="buttonstyle btn-primary">Log Masuk</button></p>
<form id="logout-form" action="{{ route('logout') }}" method="POST" style="display: none;">
@csrf
</form>
</td> --}}
<td bgcolor="#ffffff" align="left" style="padding: 30px 30px 30px 30px; border-radius: 4px 4px 4px 4px; color: #666666; font-family: 'Lato', Helvetica, Arial, sans-serif; font-size: 18px; font-weight: 400; line-height: 25px;">
<p style="margin: 0;text-align:justify;">Sekiranya anda mempunyai sebarang pertanyaan, hantarkan email ke arrahncareline@gmail.com.</p>
</td>
</tr>
</table>
resources/views/includes/bayaran/pembayaransag.blade.php
+11 -3
View File
@@ -15,7 +15,7 @@
<title>Bayar SAG | Portal Pelanggan</title>
<div class="container">
<form method="post" action="{{ route('payment.engine') }}">
<form name="formpayment" method="post" action="{{ route('payment.engine') }}">
@csrf
<div class="row">
<div class="row">
@@ -88,13 +88,13 @@
</td>
<td>
<select name="sltbayaran" class="form-control mb-2" data-upah="{{ $upahtawarruq }}" data-jenis="tawarruq" style="text-align: center; border: revert;">
<select name="sltbayaran" value="{{ old('sltbayaran') ? old('sltbayaran') : '' }}" class="form-control mb-2" data-upah="{{ $upahtawarruq }}" data-jenis="tawarruq" style="text-align: center; border: revert;">
<option selected disabled>Pilih Bayaran</option>
<option value="fixed">Amaun Semasa</option>
<option value="otheramount">Amaun Lain</option>
</select>
<input type="text" data-bakipjm="{{ $bayar['bakipjm'] }}" data-taglel="{{ $bayar['taglel'] }}" data-upah="{{ $upahtawarruq }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="tawarruq" name="txtbayarantawarruq" readonly class="form-control txtbayaran" style="text-align: center; border: outset;" />
<input type="text" value="{{ old('txtbayarantawarruq') ? old('txtbayarantawarruq') : '' }}" data-bakipjm="{{ $bayar['bakipjm'] }}" data-taglel="{{ $bayar['taglel'] }}" data-upah="{{ $upahtawarruq }}" data-nm="{{ $bayar['nilaimarhun'] }}" data-jenis="tawarruq" name="txtbayarantawarruq" readonly class="form-control txtbayaran" style="text-align: center; border: outset;" />
<input type="hidden" name="txtbayaranhidden[]" class="bayaran" style="text-align: center;" />
<input type="hidden" name="txtjenisbayaran[]" value="{{ $jenisbayaran }}" style="text-align: center;" />
<input type="hidden" name="txtnorujukanhidden[]" value="{{ $bayar['norujukan'] }}" style="text-align: center;" />
@@ -376,6 +376,11 @@
sum = sumarrahn + sumtawarruq;
if (counterrorbayar > 0) {
Swal.fire(
'Amaran!',
'Kotak bayaran tidak boleh dibiarkan kosong!',
'error'
);
$("#bayarsbmt").prop('disabled', true);
} else {
$("#bayarsbmt").prop('disabled', false);
@@ -391,6 +396,9 @@
if (event.persisted || window.performance && window.performance.navigation.type == 2) {
$('#logout-form').submit();
}
if (event.persisted || window.performance && window.performance.navigation.type == 0) {
$('form[name="formpayment"]')[0].reset();
}
},
false);
}
resources/views/includes/profile.blade.php
+4 -4
View File
@@ -118,8 +118,8 @@
<div class="col-12">
<div class="form-group{{ $errors->has('old_password') ? ' has-danger' : '' }} input-group input-group-static mb-4">
<label class="form-control-label" for="input-current-password">{{ __('Current Password') }}</label>
<input type="password" name="old_password" id="input-current-password" class="form-control form-control-alternative{{ $errors->has('old_password') ? ' is-invalid' : '' }}" placeholder="Kata laluan sekarang" value="" required>
<label class="form-control-label" for="input-current-password">{{ __('Kata Laluan Semasa') }}</label>
<input type="password" name="old_password" id="input-current-password" class="form-control form-control-alternative{{ $errors->has('old_password') ? ' is-invalid' : '' }}" placeholder="Kata laluan Semasa" value="" required>
@if ($errors->has('old_password'))
<span class="invalid-feedback" role="alert">
@@ -131,7 +131,7 @@
<div class="col-12">
<div class="form-group{{ $errors->has('password') ? ' has-danger' : '' }} input-group input-group-static mb-4">
<label class="form-control-label" for="input-password">{{ __('New Password') }}</label>
<label class="form-control-label" for="input-password">{{ __('Kata Laluan Baharu') }}</label>
<input type="password" name="password" id="input-password" class="form-control form-control-alternative{{ $errors->has('password') ? ' is-invalid' : '' }}" placeholder="Masukkan kata laluan baharu" value="" required>
@if ($errors->has('password'))
@@ -141,7 +141,7 @@
@endif
</div>
<div class="form-group input-group input-group-static mb-4">
<label class="form-control-label" for="input-password-confirmation">{{ __('Confirm New Password') }}</label>
<label class="form-control-label" for="input-password-confirmation">{{ __('Sahkan Kata Laluan Baharu') }}</label>
<input type="password" name="password_confirmation" id="input-password-confirmation" class="form-control form-control-alternative" placeholder="Mengesahkan kata laluan baharu" value="" required>
</div>