diff --git a/application/modules/Asset/controllers/Asset.php b/application/modules/Asset/controllers/Asset.php index ca042f7..ab4dfbe 100644 --- a/application/modules/Asset/controllers/Asset.php +++ b/application/modules/Asset/controllers/Asset.php @@ -640,10 +640,10 @@ public function getAssetInsuranceForm($id) $insuranceData = $this->MY_Model->select_by_business_id_and_type('third_parties',user()->business_id,4); 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{ $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); @@ -858,17 +858,17 @@ public function getThirdPartyForm($id) echo json_encode($htmlPage); } 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); echo json_encode($htmlPage); } 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); echo json_encode($htmlPage); } 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); echo json_encode($htmlPage); } @@ -944,14 +944,14 @@ public function getCatogaryForm($id) { if ($id == "catogary") { $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); echo json_encode($htmlPage); } else { $table = 'categories'; $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); echo json_encode($htmlPage); } diff --git a/application/modules/Asset/views/catogary_master_form.php b/application/modules/Asset/views/catogary_master_form.php index 1fb3842..3b6e9a8 100644 --- a/application/modules/Asset/views/catogary_master_form.php +++ b/application/modules/Asset/views/catogary_master_form.php @@ -17,7 +17,7 @@
- +
diff --git a/application/modules/Asset/views/master_list.php b/application/modules/Asset/views/master_list.php index b10cf8b..938e48b 100644 --- a/application/modules/Asset/views/master_list.php +++ b/application/modules/Asset/views/master_list.php @@ -290,7 +290,7 @@ - + diff --git a/application/modules/Asset/views/third_party_master_form.php b/application/modules/Asset/views/third_party_master_form.php index ba37c6c..1c91ae7 100644 --- a/application/modules/Asset/views/third_party_master_form.php +++ b/application/modules/Asset/views/third_party_master_form.php @@ -34,7 +34,7 @@
- +
diff --git a/application/modules/Auth/views/otp_verification.php b/application/modules/Auth/views/otp_verification.php index ca18e08..802d029 100644 --- a/application/modules/Auth/views/otp_verification.php +++ b/application/modules/Auth/views/otp_verification.php @@ -68,7 +68,7 @@
- +

diff --git a/application/modules/Business/views/add_business.php b/application/modules/Business/views/add_business.php index cf4d1b1..77f3524 100644 --- a/application/modules/Business/views/add_business.php +++ b/application/modules/Business/views/add_business.php @@ -166,7 +166,7 @@ class="form-control" required>
- +
- + diff --git a/application/modules/Business/views/edit_business.php b/application/modules/Business/views/edit_business.php index 8a82e1e..cfde29e 100644 --- a/application/modules/Business/views/edit_business.php +++ b/application/modules/Business/views/edit_business.php @@ -165,7 +165,7 @@ class="form-control"> style="color:red;">*
+ required="required" class="form-control" onkeyup="check_if_exists(this.id, this.value, this.name)" pattern="[^\s@]+@[^\s@]+\.[^\s@]+"/>
Catogary Category Depreciation % Action
Pincode Country Logo status Status Action