This commit is contained in:
bitbucket 2024-03-04 13:52:59 +05:30
parent d546834126
commit 91f6465181
4 changed files with 24 additions and 11 deletions

View File

@ -102,11 +102,11 @@ class Notifications extends BaseController
$receiving_status = $success['receiving_status']; $receiving_status = $success['receiving_status'];
$parents_status = $success['receiving_status']; $parents_status = $success['receiving_status'];
$history_msg = strtolower(gettype($success)) == "string" ? $success : json_encode($success['reponse']); $history_msg = strtolower(gettype($success)) == "string" ? $success : json_encode($success['reponse']);
session()->setFlashdata('success', 'Message : ' . $success['message']); session()->setFlashdata('success', 'Message : Success');
$this->logger->info("Whatsapp : Reponse = " . $success['message']); $this->logger->info("Whatsapp : Reponse = " . $success['message']);
} catch (\Exception $e) { } catch (\Exception $e) {
$this->logger->error("Whatsapp : Exception Message = " . $e->getMessage() . "<br> File: " . $e->getFile() . "<br> Line: " . $e->getLine() . "<br>"); $this->logger->error("Whatsapp : Exception Message = " . $e->getMessage() . "<br> File: " . $e->getFile() . "<br> Line: " . $e->getLine() . "<br>");
session()->setFlashdata('error', 'Message: ' . $e->getMessage()); session()->setFlashdata('error', 'Message: Failed');
$history_msg = strtolower(gettype($success)) == "string" ? $success : json_encode($success['reponse']); $history_msg = strtolower(gettype($success)) == "string" ? $success : json_encode($success['reponse']);
} }
$NotificationModel = new NotificationModel(); $NotificationModel = new NotificationModel();

View File

@ -68,7 +68,7 @@
<!-- <div class="input-group-prepend"> --> <!-- <div class="input-group-prepend"> -->
<div class="input-group-text">+91</div> <div class="input-group-text">+91</div>
<!-- </div> --> <!-- </div> -->
<input name="mobile"class="form-control" pattern="[0-9]{10}" value="<?= isset($customer['mobile_no']) ? $customer['mobile_no'] : '' ?>" type="tel" data-parsley-type="number" data-parsley-length="[10,10]" class="form-control" placeholder="Enter Contact Mobile" id="mobile" maxlength="10" onkeypress = "return onlyNumbers(event)" style="width: 85% !important;" required> <input name="mobile"class="form-control" pattern="[0-9]{10}" value="<?= isset($customer['mobile_no']) ? $customer['mobile_no'] : '' ?>" type="tel" data-parsley-type="number" data-parsley-length="[10,10]" class="form-control" placeholder="Enter Contact Mobile" id="mobile" maxlength="10" onkeypress = "return onlyNumbers(event)" style="width: 80% !important;" required>
<div class="invalid-feedback"> Please provide. </div> <div class="invalid-feedback"> Please provide. </div>

View File

@ -129,12 +129,12 @@
<button type="button" class="btn btn-primary waves-effect mr-1" onclick="refreshPage()">Reset</button> <button type="button" class="btn btn-primary waves-effect mr-1" onclick="refreshPage()">Reset</button>
<a href="<?= base_url() . "donor_group"; ?>" class="btn btn-secondary waves-effect mr-3">Cancel</a> <a href="<?= base_url() . "donor_group"; ?>" class="btn btn-secondary waves-effect mr-3">Cancel</a>
</div> </div>
<div class="modal" id="scrollable-modal" tabindex="-1" role="dialog" aria-labelledby="scrollableModalTitle" aria-hidden="true"> <div class="modal" id="scrollable-modal" tabindex="-1" role="dialog" aria-labelledby="scrollableModalTitle" aria-hidden="true" data-backdrop="static">
<div class="modal-dialog modal-dialog-scrollable" role="document"> <div class="modal-dialog modal-dialog-scrollable" role="document">
<div class="modal-content"> <div class="modal-content">
<div class="modal-header"> <div class="modal-header">
<h5 class="modal-title" id="scrollableModalTitle">Customer list</h5> <h5 class="modal-title" id="scrollableModalTitle">Customer list</h5>
<button type="button" class="close" data-dismiss="modal" aria-label="Close"> <button type="button" class="close model-close-btn" data-dismiss="modal" aria-label="Close">
<span aria-hidden="true">&times;</span> <span aria-hidden="true">&times;</span>
</button> </button>
</div> </div>
@ -151,18 +151,18 @@
<tbody> <tbody>
<!-- Table rows will be populated here --> <!-- Table rows will be populated here -->
</tbody> </tbody>
</table> </table>
</div> </div>
<div class="modal-footer"> <div class="modal-footer">
<button id="original_save" type="submit" id="submitBtn" hidden> Submit </button> <button id="original_save" type="submit" id="submitBtn" hidden> Submit </button>
<button id="save" class="btn btn-success waves-effect waves-light mr-1" > Submit </button> <button id="save" class="btn btn-success waves-effect waves-light mr-1" > Submit </button>
<button type="button" class="btn btn-secondary" data-dismiss="modal">Close</button> <button type="button" class="btn btn-secondary model-close-btn" data-dismiss="modal">Close</button>
<!-- <button type="button" class="btn btn-primary">Save changes</button> --> <!-- <button type="button" class="btn btn-primary">Save changes</button> -->
</div> </div>
</div><!-- /.modal-content --> </div><!-- /.modal-content -->
</div><!-- /.modal-dialog --> </div><!-- /.modal-dialog -->
</div><!-- /.modal --> </div><!-- /.modal -->
</form> </form>
</div> </div>
@ -447,7 +447,7 @@ document.getElementById("addItem").addEventListener("click", function() {
</script> --> </script> -->
<script> <script>
$(document).ready(function() { $(document).ready(function() {
$('#save').hide();
$('#scrollable-modal').on('show.bs.modal', function() { $('#scrollable-modal').on('show.bs.modal', function() {
var formData = $("#myForm").serialize(); var formData = $("#myForm").serialize();
var groupName = $("#groupname").val(); var groupName = $("#groupname").val();
@ -461,6 +461,7 @@ document.getElementById("addItem").addEventListener("click", function() {
dataType: "json", // Expect JSON response dataType: "json", // Expect JSON response
success: function(response) { success: function(response) {
if (response.length > 0) { if (response.length > 0) {
$('#save').show();
$('#scrollableModalTitle').text(groupName + ' - Customer list'); $('#scrollableModalTitle').text(groupName + ' - Customer list');
// Clear existing rows // Clear existing rows
table.empty(); table.empty();
@ -473,11 +474,13 @@ document.getElementById("addItem").addEventListener("click", function() {
row.append($("<td style='width:30%;'>").text(item.email)); row.append($("<td style='width:30%;'>").text(item.email));
row.append($("<td style='width:30%;'>").text(item.mobile_no)); row.append($("<td style='width:30%;'>").text(item.mobile_no));
table.append(row); table.append(row);
}); });
} else { } else {
// Handle the case where there is no data // Handle the case where there is no data
table.empty(); table.empty();
table.append("<tr><td colspan='4' style='width:100%; text-align: center; vertical-align: middle;'>No data available</td></tr>"); table.append("<tr><td colspan='4' style='width:100%; text-align: center; vertical-align: middle;'>No data available</td></tr>");
$('#save').hide();
} }
}, },
error: function () { error: function () {
@ -616,6 +619,16 @@ function restriction(event,temporary_flag) {
$('#submitBtn').prop('disabled', true); $('#submitBtn').prop('disabled', true);
} }
}); });
// Prevent modal from closing when backdrop is clicked
$('#scrollable-modal').on('click', function(event) {
if ($(event.target).hasClass('modal')) {
return false;
}
});
$('.model-close-btn').on('click', function(event) {
$("#save").prop("disabled", false);
});
</script> </script>

View File

@ -43,8 +43,8 @@
</div> </div>
<div class="form-group col-md-6"> <div class="form-group col-md-6">
<label for="event" class="col-form-label">Causes</label> <label for="event" class="col-form-label">Causes<span class="text-danger"> *</span></label>
<select class="form-control" id="event" name="causes_id" data-toggle="select2" required> <select class="form-control" id="event" name="causes_id" required >
<option value="">Select the Causes</option> <option value="">Select the Causes</option>
<?php foreach ($causes as $causesData) : if(date("Y-m-d") >= $causesData->from_date && date("Y-m-d") <= $causesData->to_date || $causesData->from_date == '' && $causesData->to_date == ''){?> <?php foreach ($causes as $causesData) : if(date("Y-m-d") >= $causesData->from_date && date("Y-m-d") <= $causesData->to_date || $causesData->from_date == '' && $causesData->to_date == ''){?>
<option value="<?= $causesData->causes_id ?>" <?php if (isset($receipt_details['causes_id']) && ($receipt_details['causes_id'] === $causesData->causes_id)) echo "selected"; ?> ><?= $causesData->name ?> <?= ($causesData->from_date != '') ? '('. date("d-m-Y", strtotime($causesData->from_date)) .' - '. date("d-m-Y", strtotime($causesData->to_date)).' )' : ''; ?> </option> <option value="<?= $causesData->causes_id ?>" <?php if (isset($receipt_details['causes_id']) && ($receipt_details['causes_id'] === $causesData->causes_id)) echo "selected"; ?> ><?= $causesData->name ?> <?= ($causesData->from_date != '') ? '('. date("d-m-Y", strtotime($causesData->from_date)) .' - '. date("d-m-Y", strtotime($causesData->to_date)).' )' : ''; ?> </option>