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

MERGE-PAYMENT CALLBACK ADDEDw

Browse Source
This commit is contained in:
Srinivas-Saravanan 2024-11-12 16:09:54 +05:30
commit 59b08bffd6
4 changed files with 47 additions and 15 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/Controllers/Invoice.php
View File

@ -808,7 +808,7 @@ public function create_or_update_subscription($invoice_id, $msg_flag_name = null
$lineitem_html .= '<p>' . $inv->title . ' x ' . $inv->quantity . ' => ' . $inv->subtotal . '</p>';
}
// print_r($title);die;
$records['subject'] = $invoice_serial_number . " - Approval Notification";
$records['subject'] = $invoice_serial_number . " - Invoice Notification";
$records['description'] = "<html>
@ -821,7 +821,7 @@ public function create_or_update_subscription($invoice_id, $msg_flag_name = null
<h2><img src='https://pbs.twimg.com/profile_images/1116902407332450304/QEQWyRq2_400x400.jpg'alt='Company Logo' style='max-width: 100px; margin-bottom: -20%;;'></h2>
<p style='color: red;
font-size: larger;'><b>THANKS FOR YOUR ORDER!!<b></p>
<p>Order Number:#$invoice_serial_number</p>
<p>Invoice Number:#$invoice_serial_number</p>
<p>Total Amount:$total_amount</p>
<!-- Download Invoice Button -->

9
app/Controllers/Notifications.php
View File

@ -637,7 +637,8 @@ class Notifications extends BaseController
$emailContent = str_replace("{SCHEME_NAME}", $schemename, $emailContent);
}
if (isset($expirydate)) {
$emailContent = str_replace("{EXPIRY_DATE}", $expirydate, $emailContent);
$expiryon = $expirydate ? date('d/m/Y', strtotime($expirydate)) : '';
$emailContent = str_replace("{EXPIRY_DATE}", $expiryon, $emailContent);
}
if (isset($membership_id)) {
$emailContent = str_replace("{RENEWAL_LINK}", base_url() . 'subscription_renewal/' .'MEM'. $membership_id, $emailContent);
@ -734,7 +735,8 @@ class Notifications extends BaseController
$whatsappContent = str_replace("{SCHEME_NAME}", $schemename, $whatsappContent);
}
if (isset($expirydate)) {
$whatsappContent = str_replace("{EXPIRY_DATE}", $expirydate, $whatsappContent);
$expiryon = $expirydate ? date('d/m/Y', strtotime($expirydate)) : '';
$whatsappContent = str_replace("{EXPIRY_DATE}", $expiryon, $whatsappContent);
}
if (isset($customerId)) {
$whatsappContent = str_replace("{RENEWAL_LINK}", base_url() . 'subscription_renewal/' . $customerId, $whatsappContent);
@ -1022,7 +1024,8 @@ class Notifications extends BaseController
$notificationContent = str_replace("{SCHEME_NAME}", $dataPointsArray["scheme_name"], $notificationContent);
}
if (isset($dataPointsArray["formatted_due_date"])) {
$notificationContent = str_replace("{EXPIRY_DATE}", $dataPointsArray["formatted_due_date"], $notificationContent);
$expiryon = $dataPointsArray["formatted_due_date"] ? date('d/m/Y', strtotime($dataPointsArray["formatted_due_date"])) : '';
$notificationContent = str_replace("{EXPIRY_DATE}", $expiryon, $notificationContent);
}
if (isset($dataPointsArray["customer_id"])) {
$notificationContent = str_replace("{RENEWAL_LINK}", base_url() . 'subscription_renewal/' . $dataPointsArray["customer_id"], $notificationContent);

48
app/Views/address_pdf_landscape_template.php
View File

@ -23,21 +23,14 @@
.from-address {
text-align: left;
float: left;
width: 60%;
}
.order-number {
text-align: right;
float: right;
width: 40%;
width: 100%;
}
.to-address {
float: right;
width: 30%;
width: 40%;
clear: both;
margin-top: 20px; /* Adjust for spacing in landscape */
/* padding-right: -200px; */
/* margin-top: 20px; Adjust for spacing in landscape */
}
</style>
</head>
@ -45,6 +38,40 @@
<?php foreach ($invoiceData as $value): ?>
<div class="label-container">
<<<<<<< HEAD
<table width="100%" style="border-collapse: collapse;">
<tr>
<td width="30%" style="text-align: left;"><strong>From :</strong></td>
<td width="70%" style="text-align: right;">
<?php $label = $value->invoice_number == $value->wp_api_order_id ? "Order Number :" : "Invoice Number :"; ?>
<b><?= $label; ?></b> <?= $value->invoice_number; ?>
</td>
</tr>
</table>
<!-- From Address on the left -->
<div class="from-address">
<?= $value->company_name; ?><br>
<?= $value->company_address . ","; ?><br>
<?= $value->company_city; ?> - <?= $value->company_postal_code . ","; ?><br>
<?= $value->company_state . "."; ?><br>
<?= $value->company_mobile_no; ?>
</div>
<!-- To Address -->
<div class="to-address">
<strong>To :</strong><br>
<?= $value->customer_name ?><br>
<?php if($value->customer_ship_address && ($value->saddr_id !== null || $value->saddr_id !== '')){ ?>
<?= $value->customer_ship_address ? $value->customer_ship_address . " , <br>" : "" ?>
<?= $value->customer_ship_city ? $value->customer_ship_city . "&nbsp;" : "" ?>
<?= $value->customer_ship_postal_code ? " - " . $value->customer_ship_postal_code . "<br>" : ""; ?>
<?= $value->customer_ship_state ? $value->customer_ship_state . ". <br>" : "" ?>
<?php }else if ($value->saddr_id === null || $value->saddr_id === '') {
echo $value->shipping_address ? $value->shipping_address.'<br>' : '';
} ?>
<?= $value->mobile_no ? "Mobile : " . $value->mobile_no . " ." : "" ?>
</div>
<div style="clear: both;"></div>
=======
<!-- From Address on the left -->
<div style="font-size: small;" class="from-address">
<strong>From :</strong><br>
@ -74,6 +101,7 @@
</div>
<div style="clear: both;"></div>
>>>>>>> 37dc008a4e67eb19b144ea570725193f87907964
</div>
<?php endforeach; ?>
</body>

1
app/Views/user_form.php
View File

@ -237,6 +237,7 @@
}
</script>
<script>
document.getElementById('myForm').addEventListener('submit', function(event) {
var form = event.target;
if (form.checkValidity() === false) {