added remarks for payments, expanded currency list
This commit is contained in:
Kwesi Banson Jnr
@@ -175,6 +175,5 @@
|
||||
|
||||
@push('scripts')
|
||||
|
||||
<script src="https://cdn.jsdelivr.net/npm/select2@4.1.0-rc.0/dist/js/select2.min.js"></script>
|
||||
<script src="{{ asset('public/assets/js/client-index.js') }}"></script>
|
||||
@endpush
|
||||
@@ -20,11 +20,7 @@
|
||||
<input type="text" class="form-control" id="clientName" name="name" required placeholder="e.g. Kasapreko Distilleries">
|
||||
</div>
|
||||
<div class="col-md-6">
|
||||
<label class="form-label text-secondary fw-semibold" style="font-size: 0.85rem;">Location / Country *</label>
|
||||
<!-- Changed name from 'location' to 'country' -->
|
||||
<!-- <input type="text" class="form-control" id="country" name="country" required placeholder="e.g. Ghana"> -->
|
||||
<!-- <div class="col-md-4"> -->
|
||||
<label class="form-label text-muted small fw-bold">Country</label>
|
||||
<label class="form-label text-secondary fw-semibold" style="font-size: 0.85rem;">Location / Country *</label>
|
||||
<select name="country" id="create_country" class="form-select w-100">
|
||||
<option value="">Select Country</option>
|
||||
</select>
|
||||
@@ -108,10 +104,12 @@
|
||||
<!-- Added Missing Required Fields for the Controller -->
|
||||
<div class="col-md-6 mt-3">
|
||||
<label class="form-label text-secondary fw-semibold" style="font-size: 0.85rem;">Currency *</label>
|
||||
<select class="form-select" id="clientCurrency" name="currency" required>
|
||||
<select class="form-select select2-currency" id="clientCurrency" name="currency" required style="width: 100%;">
|
||||
<option value="" selected disabled>--Select--</option>
|
||||
<option value="USD">USD</option>
|
||||
<option value="EUR">EUR</option>
|
||||
<!-- Assuming you pass $currencies from your controller -->
|
||||
@foreach($currencies as $currency)
|
||||
<option value="{{ $currency->currency_code }}">{{ $currency->currency_code }} ({{ $currency->name }})</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-6 mt-3">
|
||||
|
||||
@@ -75,15 +75,26 @@
|
||||
<label class="form-label text-muted small fw-bold">Support MS Teams</label>
|
||||
<select name="support_skype[]" id="edit_support_skype" class="form-select select2-tags" multiple="multiple"></select>
|
||||
</div>
|
||||
|
||||
<!-- Status & Meta -->
|
||||
<div class="col-md-4">
|
||||
<label class="form-label text-muted small fw-bold">Status</label>
|
||||
<input type="text" name="status" id="edit_status" class="form-control">
|
||||
<!-- <label class="form-label text-muted small fw-bold">Status</label> -->
|
||||
<!-- <input type="text" name="status" id="edit_status" class="form-control"> -->
|
||||
<label class="form-label text-secondary fw-semibold" style="font-size: 0.85rem;">Account Status *</label>
|
||||
<select class="form-select" id="edit_status" name="status" required>
|
||||
<option value="" selected disabled>--Select--</option>
|
||||
<option value="Live">Active / Live</option>
|
||||
<option value="Prospective">Prospective</option>
|
||||
<option value="Cancelled">Cancelled</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label class="form-label text-muted small fw-bold">Currency</label>
|
||||
<input type="text" name="currency" id="edit_currency" class="form-control">
|
||||
<select name="currency" id="edit_currency" class="form-select select2-currency" style="width: 100%;">
|
||||
<option value="">Select Currency</option>
|
||||
@foreach($currencies as $currency)
|
||||
<option value="{{ $currency->currency_code }}">{{ $currency->currency_code }} ({{ $currency->name }})</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
<div class="col-md-4">
|
||||
<label class="form-label text-muted small fw-bold">Country</label>
|
||||
@@ -91,6 +102,17 @@
|
||||
<option value="">Select Country</option>
|
||||
</select>
|
||||
</div>
|
||||
|
||||
<!-- Add Account Manager Field here -->
|
||||
<div class="col-md-6 mt-3">
|
||||
<label class="form-label text-muted small fw-bold">Account Manager</label>
|
||||
<select name="account_manager" id="edit_account_manager" class="form-select w-100">
|
||||
<option value="">Select Manager</option>
|
||||
@foreach($staff_members as $id => $name)
|
||||
<option value="{{ $id }}">{{ $name }}</option>
|
||||
@endforeach
|
||||
</select>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer bg-light">
|
||||
|
||||
@@ -117,6 +117,10 @@
|
||||
<option value="Cancelled">Cancelled</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="editRemarks" class="form-label text-muted small fw-bold">Remarks</label>
|
||||
<textarea name="remarks" class="form-control" value="" id="editRemarks"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer bg-light">
|
||||
|
||||
@@ -114,6 +114,10 @@
|
||||
<option value="partial">Partial</option>
|
||||
</select>
|
||||
</div>
|
||||
<div class="mb-3">
|
||||
<label for="remarks" class="form-label text-muted small fw-bold">Remarks</label>
|
||||
<textarea name="remarks" class="form-control" value="" id="remarks"></textarea>
|
||||
</div>
|
||||
</div>
|
||||
<div class="modal-footer bg-light">
|
||||
<button type="button" class="btn btn-secondary btn-sm" data-bs-dismiss="modal">Cancel</button>
|
||||
|
||||
@@ -52,6 +52,7 @@
|
||||
<!-- COLUMN 1 -->
|
||||
<div class="col-lg-4 d-flex flex-column">
|
||||
|
||||
<!-- Company Profile -->
|
||||
<!-- Company Profile -->
|
||||
<div class="card border-light-subtle shadow-sm mb-4">
|
||||
<div class="card-header bg-white py-3 border-bottom border-light">
|
||||
@@ -77,6 +78,14 @@
|
||||
<span class="text-muted small">Date Added</span>
|
||||
<span class="fw-medium text-dark">{{ $showclient->created_at ? \Carbon\Carbon::parse($showclient->created_at)->format('d M Y') : 'N/A' }}</span>
|
||||
</li>
|
||||
<!-- Standardized Account Manager Row -->
|
||||
<li class="list-group-item px-0 py-2 d-flex justify-content-between align-items-center border-0">
|
||||
<span class="text-muted small">Account Manager</span>
|
||||
<span class="fw-bold text-primary">
|
||||
<i class="bi bi-person-badge me-1"></i>
|
||||
{{ $showclient->account_manager->name ?? $showclient->accountManager->name ?? 'Unassigned' }}
|
||||
</span>
|
||||
</li>
|
||||
</ul>
|
||||
</div>
|
||||
</div>
|
||||
@@ -505,6 +514,7 @@
|
||||
<th>Invoice #</th>
|
||||
<th>Services</th>
|
||||
<th>Amount</th>
|
||||
<th>Remarks</th>
|
||||
<th>Date</th>
|
||||
<th>Status</th>
|
||||
<th class="text-end">Actions</th>
|
||||
@@ -530,6 +540,7 @@
|
||||
@endif
|
||||
</td>
|
||||
<td>{{ $payment->invoice_amount }}</td>
|
||||
<td>{{ $payment->remarks ?? 'N/A' }}</td>
|
||||
<td class="text-muted small">{{ $payment->invoice_date ? \Carbon\Carbon::parse($payment->invoice_date)->format('d M Y') : 'N/A' }}</td>
|
||||
<td>
|
||||
<span class="badge bg-info bg-opacity-10 text-info text-uppercase">{{ $payment->invoice_status ?? 'Pending' }}</span>
|
||||
|
||||
Reference in New Issue
Block a user