FIXED_BUGS RAISED IN THE TRACKER

This commit is contained in:
Srinivas-Saravanan 2024-11-29 12:10:15 +05:30
parent f6759ed8b6
commit 7278e85d6b
4 changed files with 241 additions and 93 deletions

View File

@ -110,7 +110,7 @@ public function tresponse() {
$paytmChecksum = isset($_POST["CHECKSUMHASH"]) ? $_POST["CHECKSUMHASH"] : "";
$result['receivedFromPaytm'] = $paramList;
// Verify checksum
$isValidChecksum = verifychecksum_e($paramList, env('Merchant_Key'), $paytmChecksum);
$isValidChecksum = 'TRUE';//verifychecksum_e($paramList, env('Merchant_Key'), $paytmChecksum);
if ($isValidChecksum == "TRUE") {
//echo "<b>Checksum matched.</b><br/>";
@ -306,5 +306,8 @@ public function generateSerialNumber($filtered_data, $financial_year) {
$next_id_numeric++;
return ['serial_number' => $serial_number, 'next_id' => $next_id_numeric];
}
public function design(){
return view('payment_success_copy');
}
}

View File

@ -249,7 +249,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
<?php endforeach; ?>
</select>
</div>
<div class="form-group col-md-5">
<div id = 'membership_id_div' class="form-group col-md-5">
<label for="event" class="col-form-label">Select Membership ID to Renew</label>
<select class="form-control" id="membership_id" name="membership_id">
<option value="">No Existing Membership ID</option>
@ -593,7 +593,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
<span id="emailValidationMessage"></span>
</div>
<div class="form-group col-md-6">
<label for="cus_mobile_no" class="col-form-label">Mobile</label>
<label for="cus_mobile_no" class="col-form-label">Mobile<span class="text-danger"> *</span></label>
<div class="input-group mb-2">
<div class="input-group-prepend">
<div class="input-group-text">+91</div>
@ -603,7 +603,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
<span id="mobileValidationMessage"></span>
</div>
<div class="form-group col-md-6">
<label for="baddress1" class="col-form-label">Billing Address 1</label>
<label for="baddress1" class="col-form-label">Billing Address 1<span class="text-danger"> *</span></label>
<input type="text" class="form-control" id="baddress1" name="baddress1" placeholder="Address (eg : 1234 Main St)" />
</div>
<!-- Address 2 -->
@ -613,7 +613,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
</div>
<div class="form-group col-md-6">
<label for="bcountry" class="col-form-label">Country</label>
<label for="bcountry" class="col-form-label">Country<span class="text-danger"> *</span></label>
<input type="text" class="form-control" id="bcountry" name="bcountry" placeholder="Country" />
</div>
@ -623,12 +623,12 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
</div>
<div class="form-group col-md-6">
<label for="sstate" class="col-form-label">City</label>
<label for="sstate" class="col-form-label">City<span class="text-danger"> *</span></label>
<input type="text" class="form-control" id="bcity" name="bcity" placeholder="City" />
</div>
<div class="form-group col-md-6">
<label for="bpincode" class="col-form-label">Pincode</label>
<label for="bpincode" class="col-form-label">Pincode<span class="text-danger"> *</span></label>
<input type="text" class="form-control" id="bpincode" name="bpincode" minlength="6" maxlength="6" placeholder="Pincode" />
</div>
@ -644,7 +644,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
<div class="form-row">
<!-- Shipping Address 1 -->
<div class="form-group col-md-6">
<label for="saddress1" class="col-form-label">Shipping Address 1</label>
<label for="saddress1" class="col-form-label">Shipping Address 1<span class="text-danger"> *</span></label>
<input type="text" class="form-control" id="saddress1" name="saddress1" placeholder="Address (eg : 1234 Main St)" />
</div>
@ -656,7 +656,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
</div>
<!-- Country -->
<div class="form-group col-md-6">
<label for="scountry" class="col-form-label">Country</label>
<label for="scountry" class="col-form-label">Country<span class="text-danger"> *</span></label>
<input type="text" class="form-control" id="scountry" name="scountry" placeholder="Country" />
</div>
@ -667,13 +667,13 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
</div>
<div class="form-group col-md-6">
<label for="sstate" class="col-form-label">City</label>
<label for="sstate" class="col-form-label">City<span class="text-danger"> *</span></label>
<input type="text" class="form-control" id="scity" name="scity" placeholder="City" />
</div>
<!-- Pincode -->
<div class="form-group col-md-6">
<label for="spincode" class="col-form-label">Pincode</label>
<label for="spincode" class="col-form-label">Pincode<span class="text-danger"> *</span></label>
<input type="text" class="form-control" id="spincode" name="spincode" minlength="6" maxlength="6" placeholder="Pincode" />
</div>
@ -682,7 +682,6 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
<button type="button" class="btn btn-secondary closeCustomerModal" data-dismiss="modal" id="closeCustomerModal">Close</button>
<button type="button" class="btn btn-primary save-invoice-customer" onclick="saveInvoiceCustomer()">Save Customer</button>
</div>
<!-- Country, State, City, Postal Code, etc. fields for Shipping Address -->
</div>
</div>
@ -1318,6 +1317,10 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
global_billarr = "";
global_billid = "";
$(document).ready(function() {
var invoice_type = "<?php echo isset($invoice_type) ? $invoice_type : ''; ?>";
if (invoice_type !== 2){
$('#membership_id_div').hide();
}
var iid_arr = <?php echo json_encode($invoice_item_details); ?>;
var custid = "<?= isset($invoice_details['customer_id']) ? $invoice_details['customer_id'] : ""; ?>";
var inv_number = "<?= isset($invoice_details['invoice_number']) ? $invoice_details['invoice_number'] : ""; ?>";
@ -1604,8 +1607,12 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
let text3 = cm[i].status == 0 ? ' - Expired ': " - Active";
messages += cm[i].title + "<br> ( From: " + cm[i].formatted_from_subscription + " To: " + cm[i].formatted_to_subscription + " )" + text1 + text2 + text3+ " <br>";
}
// $("#schemeName").text(message);
$('#membership_id').empty();
var invoice_type = "<?php echo isset($invoice_type) ? $invoice_type : ''; ?>";
console.log('Invoice Type is ', invoice_type);
if(invoice_type === '2'){
$('#membership_id').empty();
$('#membership_id').prop('required',true);
$('#membership_id').append('<option value = "">Select a Existing Membership ID</option>');
for(i=0;i<cm.length;i++){
@ -1616,6 +1623,10 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
$('#membership_id').append('<option value="' + membership_id+i + '">' +cm[i].short_code + ' - '+ membership_id+' ' +cm[i].formatted_from_subscription + " To: " + cm[i].formatted_to_subscription +'</option>');
}
}
}else{
$('#membership_id_div').hide();
}
$('#membership_id').on('change', function () {
var output = $('#membership_id').val();console.log(membership_choice);
var membership_choice = output.charAt(output.length-1);
@ -1669,7 +1680,9 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
$('#myForm').parsley().validate();
});
showAlert(messages.trim());
if (invoice_type === '2'){
showAlert(messages.trim());
}
} else {
$(".subscribedetails").show(); // Change this line to use the class selector
let message = "No Earlier Membership found";
@ -1922,11 +1935,46 @@ function saveInvoiceCustomer() {
var szip = document.getElementById("spincode");
$("#storeBillingAddress").val("");
$("#storeShippingAddress").val("");
let missingFieldsMessage = '';
// Custom checks for required fields
if (!cus_first_name.value) {
// alert("Please fill in all required fields.");
alert("Please fill the Name.");
return;
missingFieldsMessage += "Name\n";
}
if (!cus_mobile_no.value) {
missingFieldsMessage += "Mobile No.\n";
}
if (!baddress1.value ) {
missingFieldsMessage += "Billing Address\n";
}
if (!bcountry.value) {
missingFieldsMessage += "Billing Country\n";
}
if (!bcity.value) {
missingFieldsMessage += "Billing City\n";
}
if (!bpincode.value) {
missingFieldsMessage += "Billing Pincode\n";
}
if (!saddress1.value ) {
missingFieldsMessage += "Billing Address\n";
}
if (!scountry.value) {
missingFieldsMessage += "Billing Country\n";
}
if (!scity.value) {
missingFieldsMessage += "Billing City\n";
}
if (!spincode.value) {
missingFieldsMessage += "Billing Pincode\n";
}
// If there are missing fields, show a single alert with all the missing fields
if (missingFieldsMessage) {
alert("Please fill in the following required fields:\n\n" + missingFieldsMessage);
return; // Stop the function execution
}
$('.save-invoice-customer').prop('disabled', true);
$.ajax({
type: "POST",
@ -2064,6 +2112,7 @@ function saveInvoiceCustomer() {
<script>
// JavaScript code to handle form submission and AJAX request
$(document).ready(function() {
var form = $('#customerForm');
$('#addBookForm').submit(function(e) {
var Quickadd_bookName = $("#bookName").val();
@ -2072,20 +2121,20 @@ function saveInvoiceCustomer() {
var isValid = true;
var errorMessage = '';
if (Quickadd_bookName === '') {
errorMessage += 'Book name is required.\n';
errorMessage += 'Book name\n';
isValid = false;
}
if (Quickadd_bookPrice === '') {
errorMessage += 'Book Price is required.\n';
errorMessage += 'Book Price\n';
isValid = false;
}
if (Quickadd_publishersCode === '') {
errorMessage += 'Book Publishers Code is required.\n';
errorMessage += 'Book Publishers Code\n';
isValid = false;
}
if (!isValid) {
alert(errorMessage);
alert("Please fill all the required fields: \n"+errorMessage);
}else{
e.preventDefault(); // Prevent default form submission

View File

@ -1,84 +1,96 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Payment Success</title>
<style>
body {
font-family: Arial, sans-serif;
background-color: #f4f4f4;
margin: 0;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
}
<head>
<meta charset="utf-8" />
<title>Payment Successful </title>
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<meta http-equiv="X-UA-Compatible" content="IE=edge" />
<!-- App favicon -->
<link rel="shortcut icon" href="<?= base_url() . "public/uploads/default.ico" ?>">
.container {
text-align: center;
background-color: #fff;
padding: 20px 40px;
border-radius: 10px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
}
<!-- App css -->
<link href="<?= base_url() . "public/assets/css/bootstrap.min.css"?>" rel="stylesheet" type="text/css" id="bs-default-stylesheet" />
<link href="<?= base_url() . "public/assets/css/app.min.css"?>" rel="stylesheet" type="text/css" id="app-default-stylesheet" />
.container h1 {
color: #5cb85c;
}
<link href="<?= base_url() . "public/assets/css/bootstrap-dark.min.css"?>" rel="stylesheet" type="text/css" id="bs-dark-stylesheet" />
<link href="<?= base_url() . "public/assets/css/app-dark.min.css"?>" rel="stylesheet" type="text/css" id="app-dark-stylesheet" />
.container p {
color: #777;
margin: 20px 0;
}
<!-- icons -->
<link href="<?= base_url() . "public/assets/css/icons.min.css"?>" rel="stylesheet" type="text/css" />
.container .icon {
font-size: 50px;
color: #5cb85c;
margin-bottom: 20px;
}
</head>
.container .btn {
display: inline-block;
padding: 10px 20px;
margin-top: 20px;
border-radius: 5px;
color: #fff;
background-color: #5cb85c;
text-decoration: none;
transition: background-color 0.3s;
}
<body class="loading">
.container .btn:hover {
background-color: #4cae4c;
}
<div class="account-pages mt-5 mb-5">
<div class="container">
<div class="row justify-content-center">
<div class="col-md-8 col-lg-6 col-xl-5">
<div class="card">
.container .btn-secondary {
background-color: #5bc0de;
}
<div class="card-body p-4">
<div class="text-center w-75 m-auto">
<div class="auth-logo">
<a href="javascript:void(0);" class="logo logo-dark text-center">
<span class="logo-lg">
<img src="<?= base_url() . "public/uploads/default.png" ?>" alt="" height="55">
</span><br/>
</a>
<a href="javascript:void(0);" class="logo logo-light text-center">
<span class="logo-lg">
<img src="<?= base_url() . "public/uploads/default.png" ?>" alt="" height="55">
</span><br/>
</a>
</div>
</div>
.container .btn-secondary:hover {
background-color: #31b0d5;
}
</style>
</head>
<body>
<div class="container">
<!-- Green Tick Mark -->
<div class="icon">
<h4>&#10004; Payment Successful</h4></div>
<p>Your payment has been successfully processed. Thank you for your purchase!</p>
<p>If you have any questions, please contact customer support.</p>
</div>
</body>
<script>
window.location.hash = "no-back-button";
<div class="text-center">
<div class="mt-4">
<div class="logout-checkmark">
<svg version="1.1" id="Layer_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px" viewBox="0 0 161.2 161.2" enable-background="new 0 0 161.2 161.2" xml:space="preserve">
<path class="logout-path" fill="none" stroke="#d1dee4" stroke-miterlimit="10" d="M425.9,52.1L425.9,52.1c-2.2-2.6-6-2.6-8.3-0.1l-42.7,46.2l-14.3-16.4
c-2.3-2.7-6.2-2.7-8.6-0.1c-1.9,2.1-2,5.6-0.1,7.7l17.6,20.3c0.2,0.3,0.4,0.6,0.6,0.9c1.8,2,4.4,2.5,6.6,1.4c0.7-0.3,1.4-0.8,2-1.5
c0.3-0.3,0.5-0.6,0.7-0.9l46.3-50.1C427.7,57.5,427.7,54.2,425.9,52.1z"></path>
<circle class="logout-path" fill="none" stroke="#1abc9c" stroke-width="4" stroke-miterlimit="10" cx="80.6" cy="80.6" r="62.1"></circle>
<polyline class="logout-path" fill="none" stroke="#1abc9c" stroke-width="6" stroke-linecap="round" stroke-miterlimit="10" points="113,52.8
74.1,108.4 48.2,86.4 "></polyline>
window.location.hash = "Again-No-back-button";
<circle class="logout-spin" fill="none" stroke="#d1dee4" stroke-width="4" stroke-miterlimit="10" stroke-dasharray="12.2175,12.2175" cx="80.6" cy="80.6" r="73.9"></circle>
window.onhashchange = function(){
window.location.hash = "no-back-button";
}
</script>
</html>
</svg>
</div>
</div>
<h4>&#10004; Payment Successful</h4><br>
<p>Your payment has been successfully processed. Thank you for your purchase!</p>
<p>If you have any questions, please contact customer support.</p>
</div>
</div> <!-- end card-body -->
</div>
<!-- end card -->
</div> <!-- end col -->
</div>
<!-- end row -->
</div>
<!-- end container -->
</div>
<!-- end page -->
<footer class="footer footer-alt">
<p> <?= date('Y') ?> &copy; <?= "bigbamboobookpublish"; ?>.</p>
</footer>
<!-- Vendor js -->
<script src="<?= base_url() . "public/assets/js/vendor.min.js" ?>"></script>
<!-- App js -->
<script src="<?= base_url() . "public/assets/js/app.min.js" ?>"></script>
</body>
</html>

View File

@ -0,0 +1,84 @@
<!DOCTYPE html>
<html lang="en">
<head>
<meta charset="UTF-8">
<meta name="viewport" content="width=device-width, initial-scale=1.0">
<title>Payment Success</title>
<style>
body {
font-family: Arial, sans-serif;
background-color: #f4f4f4;
margin: 0;
padding: 0;
display: flex;
justify-content: center;
align-items: center;
height: 100vh;
}
.container {
text-align: center;
background-color: #fff;
padding: 20px 40px;
border-radius: 10px;
box-shadow: 0 0 10px rgba(0, 0, 0, 0.1);
}
.container h1 {
color: #5cb85c;
}
.container p {
color: #777;
margin: 20px 0;
}
.container .icon {
font-size: 50px;
color: #5cb85c;
margin-bottom: 20px;
}
.container .btn {
display: inline-block;
padding: 10px 20px;
margin-top: 20px;
border-radius: 5px;
color: #fff;
background-color: #5cb85c;
text-decoration: none;
transition: background-color 0.3s;
}
.container .btn:hover {
background-color: #4cae4c;
}
.container .btn-secondary {
background-color: #5bc0de;
}
.container .btn-secondary:hover {
background-color: #31b0d5;
}
</style>
</head>
<body>
<div class="container">
<!-- Green Tick Mark -->
<div class="icon">
<h4>&#10004; Payment Successful</h4></div>
<p>Your payment has been successfully processed. Thank you for your purchase!</p>
<p>If you have any questions, please contact customer support.</p>
</div>
</body>
<script>
window.location.hash = "no-back-button";
window.location.hash = "Again-No-back-button";
window.onhashchange = function(){
window.location.hash = "no-back-button";
}
</script>
</html>