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

Fixes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2023-12-21 17:52:33 +05:30
parent a8c173990b
commit ecdfc71c98
5 changed files with 15 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
app/Config/Constants.php
View File

@ -124,7 +124,6 @@ define('SMTP_USER', getenv('SMTP_USER'));
define('SMTP_PASS', getenv('SMTP_PASS')); define('SMTP_PASS', getenv('SMTP_PASS'));
define('SMTP_PORT', getenv('SMTP_PORT')); define('SMTP_PORT', getenv('SMTP_PORT'));
## GET Constant Based on Env File Ends... ## GET Constant Based on Env File Ends...
define('DUMMY_VAR', $_ENV['WAAI_TOKEN']);
define('SEND_WAAI_URL', 'https://waai.in/api/send'); define('SEND_WAAI_URL', 'https://waai.in/api/send');
define('SEND_WAAI_GROUP_URL', 'https://waai.in/api/send_group'); define('SEND_WAAI_GROUP_URL', 'https://waai.in/api/send_group');

2
app/Controllers/Settings.php
View File

@ -90,7 +90,7 @@ class Settings extends BaseController
$validationRule = [ $validationRule = [
'favicon' => [ 'favicon' => [
'label' => 'Image File', 'label' => 'Image File',
'rules' => 'uploaded[favicon]|is_image[favicon]|mime_in[favicon,image/jpg,image/jpeg,image/gif,image/png,image/webp]' 'rules' => 'uploaded[favicon]|is_image[favicon]|mime_in[favicon,image/ico,image/x-icon]'
] ]
]; ];

11
app/Helpers/NotificationHelper.php
View File

@ -47,10 +47,17 @@ class NotificationHelper
if ($cc !== '') { if ($cc !== '') {
$ccRecipients = explode(',', trim($cc)); $ccRecipients = explode(',', trim($cc));
$this->logger->info('Helper : Email carboncopy CC recipient = ' . implode(',', $ccRecipients)); $this->logger->info('Helper : Email carbon copy CC recipient = ' . implode(',', $ccRecipients));
if(!empty($ccRecipients)) { if (!empty($ccRecipients)) {
if (getenv('CI_ENVIRONMENT') == "production") {
$this->email->setCC('contact@vijayabharathambooks.com');
}
$this->email->setCC($ccRecipients); $this->email->setCC($ccRecipients);
} }
} else {
if (getenv('CI_ENVIRONMENT') == "production") {
$this->email->setCC('contact@vijayabharathambooks.com');
}
} }
if ($bcc !== '') { if ($bcc !== '') {

2
app/Views/business_form.php
View File

@ -102,7 +102,7 @@
<?php } ?> <?php } ?>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="business_logo" class="col-form-label">Business Logo</label> <label for="business_logo" class="col-form-label">Business Logo</label>
<input type="file" name="business_logo" value="<?= isset($businesses['business_logo']) ? $details['business_logo'] : '' ?>" accept="image/*" onchange="validateFile(this)" /> <input type="file" name="business_logo" value="<?= isset($businesses['business_logo']) ? $businesses['business_logo'] : '' ?>" accept="image/*" onchange="validateFile(this)" />
<div id="error_message" style="color: red;"></div> <div id="error_message" style="color: red;"></div>
</div> </div>
</div> </div>

8
app/Views/setting_form.php
View File

@ -143,7 +143,7 @@
<?php } ?> <?php } ?>
<div class="form-group col-md-4"> <div class="form-group col-md-4">
<label for="favicon" class="col-form-label">FavIcon</label> <label for="favicon" class="col-form-label">FavIcon</label>
<input type="file" name="favicon" value="<?= isset($details['favicon']) ? $details['favicon'] : '' ?>" accept="image/*" onchange="validateFile(this)" /> <input type="file" name="favicon" value="<?= isset($details['favicon']) ? $details['favicon'] : '' ?>" accept="image/ico,image/x-icon" onchange="validateFile(this)" />
<div id="error_message" style="color: red;"></div> <div id="error_message" style="color: red;"></div>
</div> </div>
</div> </div>
@ -254,7 +254,7 @@
$("#country").val(v.country).prop("readonly", true); $("#country").val(v.country).prop("readonly", true);
$("#mobile").val(v.mobile_no).prop("readonly", true); $("#mobile").val(v.mobile_no).prop("readonly", true);
$("#terms_service").val(v.terms).prop("readonly", true); $("#terms_service").val(v.terms).prop("readonly", true);
$("#logo").val(v.favicon); $("#logo").val(v.business_logo);
}); });
}else{ }else{
alert("Business Details Not Founded"); alert("Business Details Not Founded");
@ -265,12 +265,12 @@
const errorMessage = document.getElementById("error_message"); const errorMessage = document.getElementById("error_message");
if (file) { if (file) {
if (file.type.startsWith("image/")) { if (file.type === "image/ico" || file.type === "image/x-icon") {
// It's an image file, no error // It's an image file, no error
errorMessage.textContent = ""; errorMessage.textContent = "";
} else { } else {
// Invalid file type // Invalid file type
errorMessage.textContent = "Invalid file type. Please select an image."; errorMessage.textContent = "Invalid file type. Please select an ICO or X-Icon image.";
input.value = ""; // Clear the input field input.value = ""; // Clear the input field
} }
} }