FIX_Tracker Issues fixes : ps
This commit is contained in:
parent
c5d43763b8
commit
ae584f91ae
@ -631,7 +631,7 @@ class Invoice extends BaseController
|
||||
$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>
|
||||
|
||||
@ -644,7 +644,7 @@ class Invoice extends BaseController
|
||||
<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 -->
|
||||
|
||||
@ -635,7 +635,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($customerId)) {
|
||||
$emailContent = str_replace("{RENEWAL_LINK}", base_url() . 'subscription_renewal/' . $customerId, $emailContent);
|
||||
@ -732,7 +733,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);
|
||||
@ -1020,7 +1022,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);
|
||||
|
||||
@ -23,19 +23,14 @@
|
||||
.from-address {
|
||||
text-align: left;
|
||||
float: left;
|
||||
width: 60%;
|
||||
}
|
||||
.order-number {
|
||||
text-align: right;
|
||||
float: right;
|
||||
width: 40%;
|
||||
width: 100%;
|
||||
}
|
||||
.to-address {
|
||||
text-align: left;
|
||||
float: right;
|
||||
width: 60%;
|
||||
width: 40%;
|
||||
clear: both;
|
||||
margin-top: 20px; /* Adjust for spacing in landscape */
|
||||
/* margin-top: 20px; Adjust for spacing in landscape */
|
||||
}
|
||||
</style>
|
||||
</head>
|
||||
@ -43,35 +38,38 @@
|
||||
|
||||
<?php foreach ($invoiceData as $value): ?>
|
||||
<div class="label-container">
|
||||
<!-- From Address on the left -->
|
||||
<div class="from-address">
|
||||
<strong>From :</strong><br>
|
||||
<?= $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>
|
||||
<!-- Order Number on the right -->
|
||||
<div class="order-number">
|
||||
<b> Order : </b><?php echo $value->invoice_number; ?>
|
||||
</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 . " " : "" ?>
|
||||
<?= $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>
|
||||
|
||||
<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 . " " : "" ?>
|
||||
<?= $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>
|
||||
</div>
|
||||
<?php endforeach; ?>
|
||||
|
||||
|
||||
@ -237,6 +237,7 @@
|
||||
}
|
||||
</script>
|
||||
<script>
|
||||
|
||||
document.getElementById('myForm').addEventListener('submit', function(event) {
|
||||
var form = event.target;
|
||||
if (form.checkValidity() === false) {
|
||||
|
||||
Loading…
Reference in New Issue
Block a user