Merge branch 'main' of https://github.com/yogapangestu777/pangestu-barbershop
This commit is contained in:
commit
59fb6b94be
@ -122,6 +122,7 @@ class="form-control rupiah-format @error('amount') is-invalid @enderror" id="amo
|
||||
@enderror
|
||||
</div>
|
||||
<div class="col-lg-12 position-relative">
|
||||
<<<<<<< HEAD
|
||||
<label class="form-label" for="use_cash">Gunakan Kas</label>
|
||||
<div class="form-check radio ps-0">
|
||||
<ul class="radio-wrapper">
|
||||
@ -148,6 +149,8 @@ class="form-control rupiah-format @error('amount') is-invalid @enderror" id="amo
|
||||
@enderror
|
||||
</div>
|
||||
<div class="col-lg-12 position-relative">
|
||||
=======
|
||||
>>>>>>> 21e2ec04bd9458fd280d8f46f52746684c355e1c
|
||||
<label class="form-label" for="proof">Bukti
|
||||
<span class="form-span"><i>(.jpeg,.png,.jpg,.gif,.svg)</i></span>
|
||||
</label>
|
||||
|
||||
Loading…
Reference in New Issue
Block a user