Merge branch 'ngoduykhanh:master' into master

This commit is contained in:
ned3y2k 2022-03-18 14:28:39 +09:00 committed by GitHub
commit 686ff85ea9
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
4 changed files with 78 additions and 23 deletions

View file

@ -31,7 +31,7 @@ function renderClientList(data) {
<div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm" data-toggle="modal"
data-target="#modal_qr_client" data-clientid="${obj.Client.id}"
data-clientname="${obj.Client.name}">Scan</button>
data-clientname="${obj.Client.name}" ${obj.QRCode != "" ? '' : ' disabled'}>Scan</button>
</div>
<div class="btn-group">
<button type="button" class="btn btn-outline-secondary btn-sm" data-toggle="modal"