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

FIX_LOGO ISSUE IN THE SUBSCRIPTION_RENEWAL PAGE

Browse Source
This commit is contained in:
Srinivas-Saravanan 2024-12-02 13:51:53 +05:30
parent 30ddfa27d0
commit 18854c7427
9 changed files with 24 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
app/Config/Email.php
View File

@ -28,21 +28,21 @@ class Email extends BaseConfig
/** /**
* SMTP Server Address * SMTP Server Address
*/ */
// public string $SMTPHost = 'smtp.zoho.in'; public string $SMTPHost = 'smtp.zoho.in';
public string $SMTPHost = 'smtp.gmail.com'; // public string $SMTPHost = 'smtp.gmail.com';
/** /**
* SMTP Username * SMTP Username
*/ */
// public string $SMTPUser = 'web@vijayabharathambooks.com'; public string $SMTPUser = 'web@vijayabharathambooks.com';
public string $SMTPUser = 'venbalap08@gmail.com'; //public string $SMTPUser = 'venbalap08@gmail.com';
/** /**
* SMTP Password * SMTP Password
*/ */
//public string $SMTPPass = 'Sz9VueQ2iLgH'; public string $SMTPPass = 'Sz9VueQ2iLgH';
public string $SMTPPass = 'bqhvujeauokgcdxt'; //public string $SMTPPass = 'bqhvujeauokgcdxt';
/** /**
* SMTP Port * SMTP Port

2
app/Controllers/Invoice.php
View File

@ -1220,7 +1220,7 @@ public function create_or_update_subscription($invoice_id,$invoice_status, $msg_
} else { } else {
$value = $this->request->getPost('value'); $value = $this->request->getPost('value');
if (!isset($value)){ if (isset($value)){
// Handle CSV export // Handle CSV export
$this->exportCsv(); $this->exportCsv();
$this->logger->info("Itemwise Report CSV "); $this->logger->info("Itemwise Report CSV ");

2
app/Models/HomeModel.php
View File

@ -104,7 +104,7 @@ class HomeModel extends Model
$query = $this->db->table('subscription AS S') $query = $this->db->table('subscription AS S')
->select('S.business_id, BK.title as name, BK.short_code, BK.book_id as id, S.scheme_id, LEFT(BK.title, 1) AS first_letter, COUNT(S.customer_id) AS count, BI.wp_img_url') ->select('S.business_id, BK.title as name, BK.short_code, BK.book_id as id, S.scheme_id, LEFT(BK.title, 1) AS first_letter, COUNT(S.customer_id) AS count, BI.wp_img_url')
->select('COUNT(S.customer_id) AS overall, COUNT(IF(S.isactive = 1, S.customer_id, NULL)) AS activeoverall, COUNT(IF(S.is_renew = 0 AND S.isactive = 1, S.customer_id, NULL)) AS nonrenewal, COUNT(IF(S.is_renew = 1 AND S.isactive = 1, S.customer_id, NULL)) AS renewal, SUM(CASE WHEN S.created_on >= NOW() - INTERVAL 30 DAY THEN 1 ELSE 0 END) AS new_subscribers') ->select('COUNT(S.customer_id) AS overall, COUNT(IF(S.isactive = 1, S.customer_id, NULL)) AS activeoverall, COUNT(IF(S.is_renew = 0 AND S.isactive = 1, S.customer_id, NULL)) AS nonrenewal, COUNT(IF(S.is_renew = 1 AND S.isactive = 1, S.customer_id, NULL)) AS renewal, SUM(CASE WHEN S.created_on >= NOW() - INTERVAL 30 DAY THEN 1 ELSE 0 END) AS new_subscribers')
->select('COUNT(IF(S.status = 1, S.customer_id, NULL)) AS active,COUNT(IF(S.is_renew = 0 AND S.status = 0, S.customer_id, NULL)) AS expired,COUNT(IF(S.is_renew > 0 AND S.status = 1, S.customer_id, NULL)) AS renew') ->select('COUNT(IF(S.status = 1 and S.is_renew =0 ,S.customer_id, NULL)) AS active,COUNT(IF(S.status = 0, S.customer_id, NULL)) AS expired,COUNT(IF(S.is_renew > 0 AND S.status = 1, S.customer_id, NULL)) AS renew')
->join('customers AS C', 'C.customer_id = S.customer_id AND C.isactive = 1', 'left') ->join('customers AS C', 'C.customer_id = S.customer_id AND C.isactive = 1', 'left')
->join('books AS BK', 'BK.book_id = S.scheme_id', 'left') ->join('books AS BK', 'BK.book_id = S.scheme_id', 'left')
->join('book_categories AS BC', 'BC.book_id = S.scheme_id AND BC.isactive = 1', 'left') ->join('book_categories AS BC', 'BC.book_id = S.scheme_id AND BC.isactive = 1', 'left')

9
app/Views/invoice_form.php
View File

@ -947,6 +947,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script> <script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script> <script>
$(document).ready(function() { $(document).ready(function() {
document.getElementById('fromsubcription').value = new Date().toLocaleDateString('en-GB');
var status = "<?php echo isset($invoice_details['status']) ? $invoice_details['status'] : ''; ?>"; var status = "<?php echo isset($invoice_details['status']) ? $invoice_details['status'] : ''; ?>";
var invoice_type = "<?php echo isset($invoice_type) ? $invoice_type : ''; ?>"; var invoice_type = "<?php echo isset($invoice_type) ? $invoice_type : ''; ?>";
console.log('Invoice Type:', invoice_type); console.log('Invoice Type:', invoice_type);
@ -1511,7 +1512,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
console.log("cFAFAFAbbb",cb); console.log("cFAFAFAbbb",cb);
$.each(cb, function(k, v) { $.each(cb, function(k, v) {
var state = v.state_name ? v.state_name : v.state; var state = v.state_name ? v.state_name : v.state;
state = v.postal_code ? state + "-" + v.postal_code : state; state = v.postal_code ? state + v.postal_code : state;
v.address_1 ? customer_billing_addressDetails.push(v.address_1 + " " + v.address_2) : ""; v.address_1 ? customer_billing_addressDetails.push(v.address_1 + " " + v.address_2) : "";
v.city ? customer_billing_addressDetails.push(v.city) : ""; v.city ? customer_billing_addressDetails.push(v.city) : "";
state ? customer_billing_addressDetails.push(state) : ""; state ? customer_billing_addressDetails.push(state) : "";
@ -1581,7 +1582,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
if (cs.length > 0) { if (cs.length > 0) {
$.each(cs, function(k, v) { $.each(cs, function(k, v) {
var state = v.state_name ? v.state_name : v.state; var state = v.state_name ? v.state_name : v.state;
state = v.postal_code ? state + "-" + v.postal_code : state; state = v.postal_code ? state + v.postal_code : state;
v.address_1 ? customer_shipping_addressDetails.push(v.address_1 + " " + v.address_2) : ""; v.address_1 ? customer_shipping_addressDetails.push(v.address_1 + " " + v.address_2) : "";
v.city ? customer_shipping_addressDetails.push(v.city) : ""; v.city ? customer_shipping_addressDetails.push(v.city) : "";
state ? customer_shipping_addressDetails.push(state) : ""; state ? customer_shipping_addressDetails.push(state) : "";
@ -2017,7 +2018,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
const formattedBillingAddress = [ const formattedBillingAddress = [
baddress1 + " " + (baddress2 || ""), baddress1 + " " + (baddress2 || ""),
bcity, bcity,
(bstate ? bstate + "-" + bzip : ""), (bstate ? bstate + bzip : ""),
bcountry bcountry
] ]
.filter(Boolean) // Remove empty values .filter(Boolean) // Remove empty values
@ -2033,7 +2034,7 @@ if (isset($invoice_item_details[0]['to_subscription']) && !empty($invoice_item_d
const formattedShippingAddress = [ const formattedShippingAddress = [
saddress1 + " " + (saddress2 || ""), saddress1 + " " + (saddress2 || ""),
scity, scity,
(sstate ? sstate + "-" + szip : ""), (sstate ? sstate + szip : ""),
scountry scountry
] ]
.filter(Boolean) .filter(Boolean)

2
app/Views/itemwise_report_with_payment_method.php
View File

@ -9,7 +9,7 @@
<!-- Form Section --> <!-- Form Section -->
<div class="col-md-5 offset-md-3"> <div class="col-md-5 offset-md-3">
<form action="<?php echo base_url('expired_customer_report'); ?>" method="post"> <form action="<?php echo base_url('itemwise_report_with_payment_method'); ?>" method="post">
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">

10
app/Views/payment_success.php
View File

@ -34,13 +34,13 @@
<div class="auth-logo"> <div class="auth-logo">
<a href="javascript:void(0);" class="logo logo-dark text-center"> <a href="javascript:void(0);" class="logo logo-dark text-center">
<span class="logo-lg"> <span class="logo-lg">
<img src="<?= base_url() . "public/uploads/default.png" ?>" alt="" height="55"> <img src="<?= base_url() . 'public/uploads/Vijayabharatham_logo_1.png' ?>" alt="" height="55">
</span><br/> </span><br/>
</a> </a>
<a href="javascript:void(0);" class="logo logo-light text-center"> <a href="javascript:void(0);" class="logo logo-light text-center">
<span class="logo-lg"> <span class="logo-lg">
<img src="<?= base_url() . "public/uploads/default.png" ?>" alt="" height="55"> <img src="<?= base_url() . 'public/uploads/Vijayabharatham_logo_1.png' ?>" alt="" height="55">
</span><br/> </span><br/>
</a> </a>
</div> </div>
@ -65,7 +65,7 @@
</div> </div>
<h4>&#10004; Payment Successful</h4><br> <h4>&#10004; Payment Successful</h4><br>
<p>Your payment has been successfully processed. Thank you for your purchase!</p> <p>Your payment has been successfully processed. <br>Thank you for your purchase!</p>
<p>If you have any questions, please contact customer support.</p> <p>If you have any questions, please contact customer support.</p>
</div> </div>
@ -83,9 +83,11 @@
<!-- end page --> <!-- end page -->
<footer class="footer footer-alt"> <footer class="footer footer-alt">
<p> <?= date('Y') ?> &copy; <?= "bigbamboobookpublish"; ?>.</p> <p> <?= date('Y') ?> &copy; <?= "Vijayabharatham Prasuram. All rights reserved."; ?>.</p>
</footer> </footer>
<!-- Vendor js --> <!-- Vendor js -->
<script src="<?= base_url() . "public/assets/js/vendor.min.js" ?>"></script> <script src="<?= base_url() . "public/assets/js/vendor.min.js" ?>"></script>

4
app/Views/report_expired_customers.php
View File

@ -34,10 +34,10 @@
<thead> <thead>
<tr> <tr>
<th hidden>id</th> <th hidden>id</th>
<th>Member Name</th>
<th>Membership ID</th> <th>Membership ID</th>
<th>From Subscription</th> <th>From Subscription</th>
<th>To Subscription</th> <th>To Subscription</th>
<th>Member Name</th>
<th>Mobile Number</th> <th>Mobile Number</th>
<th>Email</th> <th>Email</th>
<th>Scheme Code</th> <th>Scheme Code</th>
@ -46,11 +46,11 @@
<tbody> <tbody>
<?php foreach ($expired_customers as $row) { ?> <?php foreach ($expired_customers as $row) { ?>
<tr> <tr>
<td style="text-align: left;"><?= $row['first_name'] . ' ' . $row['last_name'] ?></td>
<td style="text-align: center;"><?= $row['membership_id'] ?></td> <td style="text-align: center;"><?= $row['membership_id'] ?></td>
<td style="text-align: center;"><?= date("d/m/Y", strtotime($row['from_subscription'])); ?></td> <td style="text-align: center;"><?= date("d/m/Y", strtotime($row['from_subscription'])); ?></td>
<td style="text-align: center;"><?= date("d/m/Y", strtotime($row['to_subscription'])); ?></td> <td style="text-align: center;"><?= date("d/m/Y", strtotime($row['to_subscription'])); ?></td>
<td hidden><?php echo $row["sub_id"]; ?></td> <td hidden><?php echo $row["sub_id"]; ?></td>
<td style="text-align: left;"><?= $row['first_name'] . ' ' . $row['last_name'] ?></td>
<td><?= $row['mobile_no'] ?></td> <td><?= $row['mobile_no'] ?></td>
<td style="text-align: left;"><?= $row['email'] ?></td> <td style="text-align: left;"><?= $row['email'] ?></td>
<td><?= $row['short_code'] ?></td> <td><?= $row['short_code'] ?></td>

2
app/Views/report_itemwise.php
View File

@ -34,7 +34,7 @@
<!-- Form Section --> <!-- Form Section -->
<div class="col-md-5 offset-md-3"> <div class="col-md-5 offset-md-3">
<form action="<?php echo base_url('expired_customer_report'); ?>" method="post"> <form action="<?php echo base_url('itemwise_report'); ?>" method="post">
<div class="form-group"> <div class="form-group">
<div class="row"> <div class="row">
<div class="col-md-7"> <div class="col-md-7">

2
app/Views/subscription_renewal.php
View File

@ -59,7 +59,7 @@
<div class="container"> <div class="container">
<div class="card"> <div class="card">
<div class="logo"> <div class="logo">
<img src="public/uploads/Vijayabharatham_withname.png" /> <img src="<?= base_url() . 'public/uploads/Vijayabharatham_withname_1.png' ?>" alt="Vijayabharatham Prasuram" />
</div><div><br></div> </div><div><br></div>
<div class="card-header text-center"> <div class="card-header text-center">
<h4 class="mb-1">Renew Your Subscription</h4> <h4 class="mb-1">Renew Your Subscription</h4>