Sadmin Mail Columns Removed : ps

This commit is contained in:
VE10-Sanjeev 2023-12-21 18:50:16 +05:30
parent ecdfc71c98
commit ca431aecb8
5 changed files with 24 additions and 106 deletions

View File

@ -106,7 +106,7 @@ abstract class BaseController extends Controller
$details = $auth_model->getheringDetailsForHeader($session_uid);
// $data['company_name'] = $details[0]['site_name'];
$data['company_name'] = $details[0]['company_name'];
$data['company_short_name'] = $details[0]['site_title'];
$data['company_short_name'] = $details[0]['site_short_name'];
$data['company_address'] = $details[0]['company_address'];
$data['company_mobile_no'] = $details[0]['company_mobile_no'];
$data['company_email'] = $details[0]['company_email'];

View File

@ -151,24 +151,16 @@ class Settings extends BaseController
$SettingsModel = new SettingsModel();
$data = [
'site_name' => $this->request->getPost('site_name'),
'site_title' => $this->request->getPost('site_title'),
'site_short_name' => $this->request->getPost('site_short_name'),
'site_color' => $this->request->getPost('site_color'),
'logo' => $this->request->getPost('logo'),
'terms_service' => $this->request->getPost('terms_service'),
'footer_about' => $this->request->getPost('footer_about'),
'admin_email' => $this->request->getPost('admin_email'),
'site_email' => $this->request->getPost('site_email'),
'mobile'=> $this->request->getPost('mobile'),
'copyright'=> $this->request->getPost('copyright'),
'pagination_limit'=> $this->request->getPost('pagination_limit'),
'site_info'=> $this->request->getPost('site_info'),
'about_info'=> $this->request->getPost('about_info'),
'mail_protocol'=> $this->request->getPost('mail_protocol'),
'mail_title'=> $this->request->getPost('mail_title'),
'mail_host'=> $this->request->getPost('mail_host'),
'mail_port'=> $this->request->getPost('mail_port'),
'mail_encryption'=> $this->request->getPost('mail_encryption'),
'mail_username'=> $this->request->getPost('mail_username'),
'mail_password'=> $this->request->getPost('mail_password'),
'currency'=> $this->request->getPost('currency'),
'country'=> $this->request->getPost('country'),
'business_id'=> $this->request->getPost('business_id'),
'favicon'=>$final_img_name

View File

@ -16,13 +16,6 @@ class Users extends BaseController
$session_role = get_user_role();
$session_bid = get_business_id();
if (!empty($session_role) && $session_role !== "sadmin") {
} else {
}
switch ($session_role) {
case "sadmin":
$this->logger->info("Users: Listing In Super-admin role .");

View File

@ -10,7 +10,7 @@ class AuthenticationModel extends Model
public function getheringDetailsForHeader($user_id)
{
$builder = $this->db->table('users');
$builder->select('users.user_id,users.business_id,users.profile_picture,users.role,settings.site_name,settings.site_title,settings.favicon,settings.logo as company_logo_large,business.business_logo as company_logo_small,business.email as company_email,business.address as company_address,business.mobile_no as company_mobile_no,business.title as company_name,settings.footer_about');
$builder->select('users.user_id,users.business_id,users.profile_picture,users.role,settings.site_name,settings.site_short_name,settings.favicon,settings.logo as company_logo_large,business.business_logo as company_logo_small,business.email as company_email,business.address as company_address,business.mobile_no as company_mobile_no,business.title as company_name,settings.footer_about,settings.site_color,settings.about_info,settings.copyright');
$builder->join('settings', 'settings.business_id = users.business_id', 'left');
$builder->join('business', 'business.business_id = users.business_id', 'left');
$builder->where('user_id', $user_id);

View File

@ -52,18 +52,18 @@
placeholder="Site Name" readonly />
</div>
<div class="form-group col-md-6">
<label for="site_title" class="col-form-label">Site Short Name<span
<label for="site_short_name" class="col-form-label">Site Short Name<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="site_title" name="site_title"
placeholder="Site Title"
value="<?= isset($details['site_title']) ? $details['site_title'] : '' ?>"
<input type="text" class="form-control" id="site_short_name" name="site_short_name"
placeholder="Site Short Name"
value="<?= isset($details['site_short_name']) ? $details['site_short_name'] : '' ?>"
required />
</div>
</div>
<div class="form-row">
<div class="form-group col-md-12">
<label for="site_color" class="col-form-label">Site Color</label>
<input class="form-control" type="color" id="site_color" value="#3bafda">
<input class="form-control" type="color" id="site_color" name="site_color" value="<?= isset($details['site_short_name']) ? $details['site_short_name'] : '#3bafda' ?>">
</div>
</div>
<div class="form-row">
@ -99,12 +99,11 @@
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="admin_email" class="col-form-label">Admin Email<span
class="text-danger">*</span></label>
<input type="email" class="form-control" id="admin_email" name="admin_email"
placeholder="Admin Email"
value="<?= isset($details['admin_email']) ? $details['admin_email'] : '' ?>"
required />
<label for="site_email" class="col-form-label">Email</label>
<input type="email" class="form-control" id="site_email" name="site_email"
placeholder="Site Email" readonly
value="<?= isset($details['site_email']) ? $details['site_email'] : '' ?>"
/>
</div>
<div class="form-group col-md-6">
<label for="mobile" class="col-form-label">Mobile Number</label>
@ -112,21 +111,22 @@
placeholder="Mobile Number (Enter only numbers)" data-parsley-type="number"
value="<?= isset($details['mobile']) ? $details['mobile'] : '' ?>" readonly />
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="country" class="col-form-label">Country</label>
<input type="text" class="form-control" id="country" name="country"
placeholder="Country"
value="<?= isset($details['country']) ? $details['country'] : '' ?>" readonly />
</div>
<div class="form-group col-md-6">
<label for="copyright" class="col-form-label">Copyright</label>
<input type="text" class="form-control" id="copyright" name="copyright"
placeholder="Copy Right"
value="<?= isset($details['copyright']) ? $details['copyright'] : '' ?>" />
</div>
<div class="form-group col-md-6">
<label for="pagination_limit" class="col-form-label">Pagination Limit<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="pagination_limit" name="pagination_limit"
placeholder="Pagination Limit" required
value="<?= isset($details['pagination_limit']) ? $details['pagination_limit'] : '' ?>" />
</div>
</div>
<div class="form-row">
<?php if (!empty($details['favicon'])) { ?>
@ -147,74 +147,6 @@
<div id="error_message" style="color: red;"></div>
</div>
</div>
<div class="form-row">
<div class="form-group col-md-6">
<label for="currency" class="col-form-label">Currency<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="currency" name="currency"
placeholder="currency (eg : Rupees,Dollar,Euro)" required
value="<?= isset($details['currency']) ? $details['currency'] : '' ?>" />
</div>
<div class="form-group col-md-6">
<label for="country" class="col-form-label">Country</label>
<input type="text" class="form-control" id="country" name="country"
placeholder="Country"
value="<?= isset($details['country']) ? $details['country'] : '' ?>" readonly />
</div>
</div>
<div class="form-row">
<div class="form-group col-md-4">
<label for="mail_protocol" class="col-form-label">Mail Protocol<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="mail_protocol" name="mail_protocol"
placeholder="Mail Protocol (eg : zoho,gmail,yahoo,outlook)" required
value="<?= isset($details['mail_protocol']) ? $details['mail_protocol'] : '' ?>" />
</div>
<div class="form-group col-md-4">
<label for="mail_title" class="col-form-label">Mail Title<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="mail_title" name="mail_title"
placeholder="Mail Title" required
value="<?= isset($details['mail_title']) ? $details['mail_title'] : '' ?>" />
</div>
<div class="form-group col-md-4">
<label for="mail_host" class="col-form-label">Mail Host<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="mail_host" name="mail_host"
placeholder="Mail Host" required
value="<?= isset($details['mail_host']) ? $details['mail_host'] : '' ?>" />
</div>
</div>
<div class="form-row">
<div class="form-group col-md-3">
<label for="mail_port" class="col-form-label">Mail Port<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="mail_port" name="mail_port"
placeholder="Mail Port" required
value="<?= isset($details['mail_port']) ? $details['mail_port'] : '' ?>" />
</div>
<div class="form-group col-md-3">
<label for="mail_encryption" class="col-form-label">Mail Encryption<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="mail_encryption" name="mail_encryption"
placeholder="Mail Encryption" required
value="<?= isset($details['mail_encryption']) ? $details['mail_encryption'] : '' ?>" />
</div>
<div class="form-group col-md-3">
<label for="mail_username" class="col-form-label">Mail Username<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="mail_username" name="mail_username"
placeholder="Mail Username" required
value="<?= isset($details['mail_username']) ? $details['mail_username'] : '' ?>" />
</div>
<div class="form-group col-md-3">
<label for="mail_password" class="col-form-label">Mail Password<span
class="text-danger">*</span></label>
<input type="text" class="form-control" id="mail_password" name="mail_password"
placeholder="Mail Password" required
value="<?= isset($details['mail_password']) ? $details['mail_password'] : '' ?>" />
</div>
</div>
<input type="hidden" id="setting_id" name="setting_id" placeholder="hidden for setting id"
value="<?= isset($details['setting_id']) ? $details['setting_id'] : '' ?>" />
<input type="hidden" id="logo" name="logo" placeholder="hidden for logo"
@ -254,6 +186,7 @@
$("#country").val(v.country).prop("readonly", true);
$("#mobile").val(v.mobile_no).prop("readonly", true);
$("#terms_service").val(v.terms).prop("readonly", true);
$("#site_email").val(v.email);
$("#logo").val(v.business_logo);
});
}else{