diff --git a/app/Config/Constants.php b/app/Config/Constants.php index 61b24f71..c85966cb 100644 --- a/app/Config/Constants.php +++ b/app/Config/Constants.php @@ -124,7 +124,6 @@ define('SMTP_USER', getenv('SMTP_USER')); define('SMTP_PASS', getenv('SMTP_PASS')); define('SMTP_PORT', getenv('SMTP_PORT')); ## 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_GROUP_URL', 'https://waai.in/api/send_group'); diff --git a/app/Controllers/Settings.php b/app/Controllers/Settings.php index 539326a1..daa3b07a 100755 --- a/app/Controllers/Settings.php +++ b/app/Controllers/Settings.php @@ -90,7 +90,7 @@ class Settings extends BaseController $validationRule = [ 'favicon' => [ '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]' ] ]; diff --git a/app/Helpers/NotificationHelper.php b/app/Helpers/NotificationHelper.php index 21d9cda7..1a78ebab 100644 --- a/app/Helpers/NotificationHelper.php +++ b/app/Helpers/NotificationHelper.php @@ -47,10 +47,17 @@ class NotificationHelper if ($cc !== '') { $ccRecipients = explode(',', trim($cc)); - $this->logger->info('Helper : Email carboncopy CC recipient = ' . implode(',', $ccRecipients)); - if(!empty($ccRecipients)) { + $this->logger->info('Helper : Email carbon copy CC recipient = ' . implode(',', $ccRecipients)); + if (!empty($ccRecipients)) { + if (getenv('CI_ENVIRONMENT') == "production") { + $this->email->setCC('contact@vijayabharathambooks.com'); + } $this->email->setCC($ccRecipients); } + } else { + if (getenv('CI_ENVIRONMENT') == "production") { + $this->email->setCC('contact@vijayabharathambooks.com'); + } } if ($bcc !== '') { diff --git a/app/Views/business_form.php b/app/Views/business_form.php index b5157eb0..04cf292f 100644 --- a/app/Views/business_form.php +++ b/app/Views/business_form.php @@ -102,7 +102,7 @@
- +
diff --git a/app/Views/setting_form.php b/app/Views/setting_form.php index 90e3360f..8efbd3e7 100644 --- a/app/Views/setting_form.php +++ b/app/Views/setting_form.php @@ -143,7 +143,7 @@
- +
@@ -254,7 +254,7 @@ $("#country").val(v.country).prop("readonly", true); $("#mobile").val(v.mobile_no).prop("readonly", true); $("#terms_service").val(v.terms).prop("readonly", true); - $("#logo").val(v.favicon); + $("#logo").val(v.business_logo); }); }else{ alert("Business Details Not Founded"); @@ -265,12 +265,12 @@ const errorMessage = document.getElementById("error_message"); if (file) { - if (file.type.startsWith("image/")) { + if (file.type === "image/ico" || file.type === "image/x-icon") { // It's an image file, no error errorMessage.textContent = ""; } else { // 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 } }