vijayabharathambooks/vb_book
vijayabharathambooks/vb_book
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'uat' of bitbucket.org:venbainformationtechnology/vb_book into uat

Browse Source
This commit is contained in:
VE10-Sanjeev 2023-10-11 11:40:13 +05:30
commit 031108dbb8
2 changed files with 18 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

32
app/Views/customer_form.php
View File

@ -11,6 +11,7 @@
role="tab" aria-controls="customerDetails" aria-selected="true">Customer Details</a> role="tab" aria-controls="customerDetails" aria-selected="true">Customer Details</a>
</li> </li>
<?php if ($page_name === 'Edit Customer'): ?> <?php if ($page_name === 'Edit Customer'): ?>
<li class="nav-item"> <li class="nav-item">
<a class="nav-link active" id="subscriptionDetails-tab" data-toggle="tab" <a class="nav-link active" id="subscriptionDetails-tab" data-toggle="tab"
href="#subscriptionDetails" role="tab" aria-controls="subscriptionDetails" href="#subscriptionDetails" role="tab" aria-controls="subscriptionDetails"
@ -54,8 +55,8 @@
class="text-danger">*</span></label> class="text-danger">*</span></label>
<input type="text" class="form-control" name="cmail" <input type="text" class="form-control" name="cmail"
value="<?= isset($customer['email']) ? $customer['email'] : '' ?>" value="<?= isset($customer['email']) ? $customer['email'] : '' ?>"
placeholder="Email" required /> placeholder="Email" />
<div class="invalid-feedback"> Please provide. </div>
</div> </div>
</div> </div>
<div class="form-row"> <div class="form-row">
@ -78,8 +79,8 @@
class="text-danger">*</span></label> class="text-danger">*</span></label>
<input type="date" class="form-control" name="dob" <input type="date" class="form-control" name="dob"
value="<?= isset($customer['date_of_birth']) ? $customer['date_of_birth'] : '' ?>" value="<?= isset($customer['date_of_birth']) ? $customer['date_of_birth'] : '' ?>"
placeholder="Date Of Birth" required /> placeholder="Date Of Birth" />
<div class="invalid-feedback"> Please provide. </div>
</div> </div>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="gen" class="col-form-label">Gender<span class="text-danger">*</span></label> <label for="gen" class="col-form-label">Gender<span class="text-danger">*</span></label>
@ -97,15 +98,16 @@
<label for="ctype" class="col-form-label">Type<span class="text-danger">*</span></label> <label for="ctype" class="col-form-label">Type<span class="text-danger">*</span></label>
<select class="form-control" name="ctype" required> <select class="form-control" name="ctype" required>
<option value="customer" <?= isset($customer['type']) && $customer['type'] == 'customer' ? 'selected' : '' ?>>Customer</option> <option value="customer" <?= isset($customer['type']) && $customer['type'] == 'customer' ? 'selected' : '' ?>>Customer</option>
<option value="subscriber" <?= isset($customer['type']) && $customer['type'] == 'subscriber' ? 'selected' : '' ?>>Subscriber</option> <option value="subscriber" <?= isset($customer['type']) && $customer['type'] == 'subscriber' ? 'selected' : '' ?>>Member</option>
</select> </select>
<div class="invalid-feedback"> Please provide. </div> <div class="invalid-feedback"> Please provide. </div>
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="cmode" class="col-form-label">Mode<span class="text-danger">*</span></label> <label for="cmode" class="col-form-label">Mode<span class="text-danger">*</span></label>
<select class="form-control" name="cmode" required> <select class="form-control" name="cmode" required>
<option value="offline" <?= isset($customer['mode']) && $customer['mode'] == 'offline' ? 'selected' : '' ?>>Offline</option>
<option value="online" <?= isset($customer['mode']) && $customer['mode'] == 'online' ? 'selected' : '' ?>>Online</option> <option value="online" <?= isset($customer['mode']) && $customer['mode'] == 'online' ? 'selected' : '' ?>>Online</option>
<option value="offline" <?= isset($customer['mode']) && $customer['mode'] == 'offline' ? 'selected' : '' ?>>Offline</option>
</select> </select>
<div class="invalid-feedback"> Please provide. </div> <div class="invalid-feedback"> Please provide. </div>
</div> </div>
@ -315,7 +317,7 @@
</form> </form>
</div> <!-- end card-body--> </div> <!-- end card-body-->
<div class="tab-pane fade show active" id="subscriptionDetails" role="tabpanel" aria-labelledby="subscriptionDetails-tab"> <div class="tab-pane fade show " id="subscriptionDetails" role="tabpanel" aria-labelledby="subscriptionDetails-tab">
<?php if (!empty($subscriptionData)): ?> <?php if (!empty($subscriptionData)): ?>
<table class="table table-bordered"> <table class="table table-bordered">
<thead> <thead>
@ -484,14 +486,14 @@
}); });
</script> </script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
// Show the Subscription Details tab by default // Show the Customer Details tab by default
$('#subscriptionDetails-tab').tab('show'); $('#customerDetails-tab').tab('show');
// Handle tab switching // Handle tab switching
$('#customerTabs a').on('click', function (e) { $('#customerTabs a').on('click', function (e) {
e.preventDefault(); e.preventDefault();
$(this).tab('show'); $(this).tab('show');
});
}); });
});
</script> </script>

2
app/Views/invoice_form.php
View File

@ -262,7 +262,7 @@
<div class="form-group text-left col-md-12 "> <div class="form-group text-left col-md-12 ">
<label for="notes">Notes</label> <label for="notes">Notes</label>
<textarea class="form-control" id="terms" name="notes" > <textarea class="form-control" id="terms" name="notes" >
<?php echo ($invoice_details['notes']);?> <?= isset($invoice_details['notes']) ? $invoice_details['notes'] : '' ?>
</textarea> </textarea>
</div> </div>
</div> </div>