Bigbamboo/bbone
5
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

BBone-Asset issues fixes : ps

Browse Source
This commit is contained in:
VE10-Sanjeev 2024-03-21 15:59:54 +05:30
parent c9f450541a
commit 4b725e3fd5
12 changed files with 21 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

14
application/modules/Asset/controllers/Asset.php
View File

@ -640,10 +640,10 @@ public function getAssetInsuranceForm($id)
$insuranceData = $this->MY_Model->select_by_business_id_and_type('third_parties',user()->business_id,4); $insuranceData = $this->MY_Model->select_by_business_id_and_type('third_parties',user()->business_id,4);
if(count($split) > 1) if(count($split) > 1)
{ {
$data = array('asset_id'=> $split[0], 'insuranceData'=>$insuranceData, 'heading'=>'Add Insurence' , 'submit_button_title'=>'Submit'); $data = array('asset_id'=> $split[0], 'insuranceData'=>$insuranceData, 'heading'=>'Add Insurance' , 'submit_button_title'=>'Submit');
}else{ }else{
$asset_insurance_data = $this->Asset_model->get_insurance_by_id_with_join($id); $asset_insurance_data = $this->Asset_model->get_insurance_by_id_with_join($id);
$data = array('insuranceData'=>$insuranceData,'assetInsuranceData'=>$asset_insurance_data ,'heading'=>'Edit Insurence' , 'submit_button_title'=>'Update'); $data = array('insuranceData'=>$insuranceData,'assetInsuranceData'=>$asset_insurance_data ,'heading'=>'Edit Insurance' , 'submit_button_title'=>'Update');
} }
$htmlPage = $this->load->view('asset_insurance_form.php',$data,true); $htmlPage = $this->load->view('asset_insurance_form.php',$data,true);
@ -858,17 +858,17 @@ public function getThirdPartyForm($id)
echo json_encode($htmlPage); echo json_encode($htmlPage);
} }
else if ($id == "supplier") { else if ($id == "supplier") {
$data = array('heading'=> "supplier Details", 'type' => 2 , 'states' => $state , 'submit_button_title'=>'Add' ); $data = array('heading'=> "Supplier Details", 'type' => 2 , 'states' => $state , 'submit_button_title'=>'Add' );
$htmlPage = $this->load->view('third_party_master_form.php',$data,true); $htmlPage = $this->load->view('third_party_master_form.php',$data,true);
echo json_encode($htmlPage); echo json_encode($htmlPage);
} }
else if ($id == "service_privoder") { else if ($id == "service_privoder") {
$data = array('heading'=> "Service Privoder Details", 'type' => 3 , 'states' => $state , 'submit_button_title'=>'Add' ); $data = array('heading'=> "Service Provider Details", 'type' => 3 , 'states' => $state , 'submit_button_title'=>'Add' );
$htmlPage = $this->load->view('third_party_master_form.php',$data,true); $htmlPage = $this->load->view('third_party_master_form.php',$data,true);
echo json_encode($htmlPage); echo json_encode($htmlPage);
} }
else if ($id == "insurence") { else if ($id == "insurence") {
$data = array('heading'=> "Insurence Details", 'type' => 4 , 'states' => $state , 'submit_button_title'=>'Add' ); $data = array('heading'=> "Insurance Details", 'type' => 4 , 'states' => $state , 'submit_button_title'=>'Add' );
$htmlPage = $this->load->view('third_party_master_form.php',$data,true); $htmlPage = $this->load->view('third_party_master_form.php',$data,true);
echo json_encode($htmlPage); echo json_encode($htmlPage);
} }
@ -944,14 +944,14 @@ public function getCatogaryForm($id)
{ {
if ($id == "catogary") { if ($id == "catogary") {
$table = 'categories'; $table = 'categories';
$data = array('heading'=> "Catogary Details", 'submit_button_title'=>'Add' ); $data = array('heading'=> "Category Details", 'submit_button_title'=>'Add' );
$htmlPage = $this->load->view('catogary_master_form.php',$data,true); $htmlPage = $this->load->view('catogary_master_form.php',$data,true);
echo json_encode($htmlPage); echo json_encode($htmlPage);
} }
else { else {
$table = 'categories'; $table = 'categories';
$catogary_data = $this->MY_Model->get_by_md5_id($id, $table); $catogary_data = $this->MY_Model->get_by_md5_id($id, $table);
$data = array('heading'=> "Catogary Details", 'catogary_data'=> $catogary_data , 'submit_button_title'=>'Update' ); $data = array('heading'=> "Category Details", 'catogary_data'=> $catogary_data , 'submit_button_title'=>'Update' );
$htmlPage = $this->load->view('catogary_master_form.php',$data,true); $htmlPage = $this->load->view('catogary_master_form.php',$data,true);
echo json_encode($htmlPage); echo json_encode($htmlPage);
} }

2
application/modules/Asset/views/catogary_master_form.php
View File

@ -17,7 +17,7 @@
<input type="hidden" name="business_id" value="<?php echo user()->business_id; ?>"> <input type="hidden" name="business_id" value="<?php echo user()->business_id; ?>">
<div class="form-group row"> <div class="form-group row">
<label class="col-form-label col-md-3 col-sm-3 ">Catogary<a style="color:red;">*</a></label> <label class="col-form-label col-md-3 col-sm-3 ">Category<a style="color:red;">*</a></label>
<div class="col-md-9 col-sm-9 "> <div class="col-md-9 col-sm-9 ">
<input type="text" class="form-control" name="name" value="<?php if(isset($catogary_data)) { echo $catogary_data->name; } ?>" required> <input type="text" class="form-control" name="name" value="<?php if(isset($catogary_data)) { echo $catogary_data->name; } ?>" required>
</div> </div>

2
application/modules/Asset/views/master_list.php
View File

@ -290,7 +290,7 @@
<table class="table table-bordered table-striped" cellspacing="0" width="100%"> <table class="table table-bordered table-striped" cellspacing="0" width="100%">
<thead> <thead>
<tr class="headings"> <tr class="headings">
<th class="column-title" width="15%">Catogary </th> <th class="column-title" width="15%">Category </th>
<th class="column-title" width="15%">Depreciation % </th> <th class="column-title" width="15%">Depreciation % </th>
<th class="column-title" width="10%">Action </th> <th class="column-title" width="10%">Action </th>
</tr> </tr>

2
application/modules/Asset/views/third_party_master_form.php
View File

@ -34,7 +34,7 @@
<div class="form-group row"> <div class="form-group row">
<label class="col-form-label col-md-3 col-sm-3 ">Email</label> <label class="col-form-label col-md-3 col-sm-3 ">Email</label>
<div class="col-md-9 col-sm-9 "> <div class="col-md-9 col-sm-9 ">
<input type="email" class="form-control" name="email" value="<?php if(isset($third_party_data)) { echo $third_party_data->email; } ?>" > <input type="email" class="form-control" name="email" value="<?php if(isset($third_party_data)) { echo $third_party_data->email; } ?>" pattern="[^\s@]+@[^\s@]+\.[^\s@]+">
</div> </div>
</div> </div>

2
application/modules/Auth/views/otp_verification.php
View File

@ -68,7 +68,7 @@
<div> <div>
<div> <div>
<input type="email" id="email" name="user_name" class="form-control" placeholder="Email" required="required" /> <input type="email" id="email" name="user_name" class="form-control" placeholder="Email" required="required" pattern="[^\s@]+@[^\s@]+\.[^\s@]+" />
<p id="span_msg"></p> <p id="span_msg"></p>
</div> </div>
</div> </div>

4
application/modules/Business/views/add_business.php
View File

@ -166,7 +166,7 @@ class="form-control" required>
<label class="control-label col-md-1 col-sm-1 " for="last-name">Email<a <label class="control-label col-md-1 col-sm-1 " for="last-name">Email<a
style="color:red;">*</a> </label> style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3 "> <div class="col-md-3 col-sm-3 ">
<input type="email" id="email" name="email" onkeyup="check_if_exists(this.id, this.value, this.name)" class="form-control" required> <input type="email" id="email" name="email" onkeyup="check_if_exists(this.id, this.value, this.name)" class="form-control" required pattern="[^\s@]+@[^\s@]+\.[^\s@]+">
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Phone<a <label class="control-label col-md-1 col-sm-1 " for="first-name"> Phone<a
@ -224,7 +224,7 @@ class="form-control" onkeyup="check_if_exists(this.id, this.value, this.name)">
</select> </select>
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name">country</label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Country</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="country" name="country" class="form-control" type="text"> <input id="country" name="country" class="form-control" type="text">
</div> </div>

2
application/modules/Business/views/business_list.php
View File

@ -50,7 +50,7 @@
<th class="column-title">Pincode </th> <th class="column-title">Pincode </th>
<th class="column-title">Country </th> <th class="column-title">Country </th>
<th class="column-title">Logo </th> <th class="column-title">Logo </th>
<th class="column-title">status </th> <th class="column-title">Status </th>
<th class="column-title" >Action </th> <th class="column-title" >Action </th>
</tr> </tr>
</thead> </thead>

4
application/modules/Business/views/edit_business.php
View File

@ -165,7 +165,7 @@ class="form-control">
style="color:red;">*</a> </label> style="color:red;">*</a> </label>
<div class="col-md-3 col-sm-3"> <div class="col-md-3 col-sm-3">
<input type="email" id="email" name="email" value="<?php echo $businessData->email; ?>" <input type="email" id="email" name="email" value="<?php echo $businessData->email; ?>"
required="required" class="form-control" onkeyup="check_if_exists(this.id, this.value, this.name)" /> required="required" class="form-control" onkeyup="check_if_exists(this.id, this.value, this.name)" pattern="[^\s@]+@[^\s@]+\.[^\s@]+"/>
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name"> Phone<a <label class="control-label col-md-1 col-sm-1 " for="first-name"> Phone<a
@ -247,7 +247,7 @@ class="form-control" type="text">
</select> </select>
</div> </div>
<label class="control-label col-md-1 col-sm-1 " for="first-name">country</label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Country</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="country" name="country" value="<?php echo $businessData->country; ?>" <input id="country" name="country" value="<?php echo $businessData->country; ?>"
class="form-control" type="text"> class="form-control" type="text">

2
application/modules/Dashboard/views/dashboard.php
View File

@ -168,7 +168,7 @@
<div class="col-md-6 col-sm-6 "> <div class="col-md-6 col-sm-6 ">
<div class="x_panel tile "> <div class="x_panel tile ">
<div class="x_title"> <div class="x_title">
<h2>Insurence</h2> <h2>Insurance</h2>
<!-- <ul class="nav navbar-right panel_toolbox"> <!-- <ul class="nav navbar-right panel_toolbox">
<li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a> <li><a class="collapse-link"><i class="fa fa-chevron-up"></i></a>
</li> </li>

4
application/modules/Employee/views/add_emp.php
View File

@ -170,7 +170,7 @@
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input id="email" name="email" value="<?php if (isset($editData)) { <input id="email" name="email" value="<?php if (isset($editData)) {
echo $editData->email; echo $editData->email;
} ?>" required="required" class="form-control" type="email" oninvalid="setCustomValidity('Enter a Valid E-mail Address.')" oninput="setCustomValidity('')" onkeyup="check_if_exists(this.id, this.value, this.name)"> } ?>" required="required" class="form-control" type="email" oninvalid="setCustomValidity('Enter a Valid E-mail Address.')" oninput="setCustomValidity('')" onkeyup="check_if_exists(this.id, this.value, this.name)" pattern="[^\s@]+@[^\s@]+\.[^\s@]+">
</div> </div>
</div> </div>
@ -187,7 +187,7 @@
<label class="control-label col-md-1 col-sm-1 " for="first-name">Department</label> <label class="control-label col-md-1 col-sm-1 " for="first-name">Department</label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<select id="department" name="department" required="required" class="form-control"> <select id="department" name="department" class="form-control">
<option value="">--Select--</option> <option value="">--Select--</option>
<!-- <option value="<?php if (isset($editData)) { <!-- <option value="<?php if (isset($editData)) {
echo $editData->department; echo $editData->department;

2
application/modules/User/views/add_user.php
View File

@ -117,7 +117,7 @@
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Email<a style="color:red;">*</a> </label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Email<a style="color:red;">*</a> </label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="email" id="email" name="email" pattern="[^\s@]+@[^\s@]+\.[^\s@]+" value="" required="required" class="form-control" onkeyup="check_if_exists(this.id, this.value, this.name)"> <input type="email" id="email" name="email" pattern="[^\s@]+@[^\s@]+\.[^\s@]+" value="" required="required" class="form-control" onkeyup="check_if_exists(this.id, this.value, this.name)" >
</div> </div>
</div> </div>

2
application/modules/User/views/edit_user.php
View File

@ -37,7 +37,7 @@
<label class="control-label col-md-1 col-sm-1 " for="last-name"> Email<a style="color:red;">*</a></label> <label class="control-label col-md-1 col-sm-1 " for="last-name"> Email<a style="color:red;">*</a></label>
<div class="col-md-5 col-sm-5 "> <div class="col-md-5 col-sm-5 ">
<input type="email" id="email" name="email" pattern="[^\s@]+@[^\s@]+\.[^\s@]+" value="<?php echo $editData->email; ?>" required="required" class="form-control" onkeyup="check_if_exists(this.id, this.value, this.name)"> <input type="email" id="email" name="email" pattern="[^\s@]+@[^\s@]+\.[^\s@]+" value="<?php echo $editData->email; ?>" required="required" class="form-control" onkeyup="check_if_exists(this.id, this.value, this.name)" >
</div> </div>
</div> </div>