materialmaster changes code

application/controllers/rawmaterialdetails.php

@@ -119,8 +119,8 @@ class rawmaterialdetails extends BaseController
         
             $this->form_validation->set_rules('MaterialName','Material Name','trim|required|');
             $this->form_validation->set_rules('MaterialType','MaterialType','trim|callback_MaterialType_validate');
+            $this->form_validation->set_rules('MaterialCategory','MaterialCategory','trim|callback_materialcategory_validate');
             $this->form_validation->set_rules('UOM','UOM','trim|callback_UOM_validate');
-            $this->form_validation->set_rules('MaterialCategory','MaterialCategory','trim|callback__validate');
                        
             if($this->form_validation->run() == FALSE)
             {
@@ -137,6 +137,7 @@ class rawmaterialdetails extends BaseController
                 $CostCenterCode = $this->input->post('Costcenter');
                 $ConversionFactor = $this->input->post('conversionfactor');
                 $ConversionFactorUOM = $this->input->post('conversionfactorUOM');
+                $HSNcode = $this->input->post('HSNcode');
                 $CreatedBy = $this->session->userdata('userId');
                 
                 $chked =  $this->input->post('isactive');
@@ -150,7 +151,7 @@ class rawmaterialdetails extends BaseController
                         $IsActive = '0';
                     }
                     
-                    $RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'Category'=>$MaterialCategory, 'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks);    
+                    $RawMaterial = array('MaterialName'=>$MaterialName, 'MaterialType'=>$MaterialType, 'UOM'=>$UOM,'Category'=>$MaterialCategory, 'CreatedBy'=>$CreatedBy,'IsActive' => $IsActive,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'HSNCODE'=>$HSNcode);    
                    $result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial);
                 
                 if($result > 0)
@@ -235,6 +236,7 @@ class rawmaterialdetails extends BaseController
                 $CostCenterCode = $this->input->post('Costcenter');
                 $ConversionFactor = $this->input->post('conversionfactor');
                 $ConversionFactorUOM = $this->input->post('conversionfactorUOM');
+                $HSNcode = $this->input->post('HSNcode');
                 $UpdatedBy = $this->session->userdata ('userId');
                 $chked =  $this->input->post('isactive');
                 
@@ -248,8 +250,8 @@ class rawmaterialdetails extends BaseController
                     }
                     
                 $RawMaterial = array();
-                $RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode);//,'RMCode'=>$rmcode);
+                $RawMaterial = array('MaterialName'=>$MaterialName,'MaterialType'=>$MaterialType,'UpdatedBy'=>$UpdatedBy, 'UOM'=>$UOM,'IsActive' => $IsActive,'Category'=>$MaterialCategory,'ConversionFactorUnit'=>$ConversionFactor,'ConversionFactorUOM'=>$ConversionFactorUOM,'Remarks'=>$Remarks,'assetcode'=>$AssetCode,'CostCenterCode'=>$CostCenterCode,'HSNCODE'=>$HSNcode);//,'RMCode'=>$rmcode);
-                //print_r($RawMaterial);die();
+                //print_r($RawMaterial);//die();
                 $result = $this->rawmaterialdetails_model->editRawmaterial($RawMaterial, $MaterialCode);
             
                 if($result == true)

application/views/addRawMaterial.php

@@ -60,8 +60,8 @@ function BlockSpecial(evt) {
                                 <div class="col-md-3">  
                                     <div class="form-group">
                                         <span for="MaterialType">Material Type</span><font color="Red">*</font>
-                                        <select class="form-control required select2"  id="MaterialType" name="MaterialType">
+                                        <select class="form-control select2" required  id="MaterialType" name="MaterialType">
-                                            <option value="-1" required>Select Material Type</option>
+                                            <option value="" required>Select Material Type</option>
                                             <?php
                                             if(!empty($material))
                                             {
@@ -76,11 +76,13 @@ function BlockSpecial(evt) {
                                         </select>
                                     </div>
                                 </div>
+
+
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <span for="MaterialCategory">Material Category</span><font color="Red">*</font>
                                         <select class="form-control required select2" id="MaterialCategory" name="MaterialCategory" onchange="changeTextBox()">
-                                            <option value="0" requried>Select Material Category</option>
+                                            <option value="" requried>Select Material Category</option>
                                             <?php
                                             if(!empty($materialcategory))
                                             {
@@ -100,7 +102,7 @@ function BlockSpecial(evt) {
                                     <div class="form-group">
                                         <span for="UOM">Unit of Measurement</span><font color="Red">*</font>
                                         <select class="form-control required select2" id="UOM" name="UOM">
-                                            <option value="-1" required>Select UOM</option>
+                                            <option value="" required>Select UOM</option>
                                             <?php
                                             if(!empty($UOM))
                                             {
@@ -122,7 +124,7 @@ function BlockSpecial(evt) {
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <span for="Assetcode">Asset Code</span>
-                                         <select class="form-control required select2" id="Assetcode" name="Assetcode">
+                                         <select class="form-control select2" id="Assetcode" name="Assetcode" disabled="true">
                                             <option value="0">Select Asset Code</option>
                                             <?php
                                             if(!empty($assetcode))
@@ -142,7 +144,7 @@ function BlockSpecial(evt) {
                                 <div class="col-md-3">
                                     <div class="form-group">
                                         <span for="Costcenter">Cost Center Code</span>
-                                         <select class="form-control select2" id="Costcenter" name="Costcenter">
+                                         <select class="form-control select2" id="Costcenter" name="Costcenter" disabled="true">
                                             <option value="0">Select Cost Center</option>
                                             <?php
                                             if(!empty($costcentercode))
@@ -185,7 +187,13 @@ function BlockSpecial(evt) {
                                 </div>
                                     </div>
                                     <div class="col-md-12">
-                            <div class="col-md-9">
+                                        <div class="col-md-3">
+                                    <div class="form-group">
+                                        <span for="HSNcode">HSN code</span>
+                                        <input type="text" class="form-control" id="HSNcode"  name="HSNcode" maxlength="255">
+                                    </div>
+                                </div>
+                            <div class="col-md-6">
                                         <div class="form-group">
                                         <span for="remarks">Remarks</span>
                                          <input type="text" class="form-control" id="remarks"  name="remarks" maxlength="255">
@@ -202,7 +210,7 @@ function BlockSpecial(evt) {
                         </div><!-- /.box-body -->
     
                         <div class="box-footer" style="text-align:right">
-                            <input type="submit" class="btn btn-info" value="Submit" />
+                            <input type="submit" class="btn btn-info" onclick="validate();" value="Submit" />
                             <input type="reset" class="btn btn-info" value="Cancel" />
                         </div>
                     </form>
@@ -243,6 +251,42 @@ function BlockSpecial(evt) {
 </div>
 <script src="<?php echo base_url(); ?>assets/js/addUser.js" type="text/javascript"></script>
 <script>
+function Validate()
+{
+     if($("#MaterialName").val().length < 1)
+     {
+        alert('Please Enter MaterialName');
+        $("#MaterialName").focus();
+        return false;
+     }
+   
+    if($("option:selected", $("#UOM")).val() == "")
+    {
+        alert('Please Select UOM ');
+    $("#UOM").focus();
+        return false;
+    }
+    if($("option:selected", $("#MaterialCategory")).val() == "")
+    {
+        alert('Please Select Material Category');
+        $("#MaterialCategory").focus();
+    return false;
+    }
+    if($("option:selected", $("#MaterialType")).val() == "")
+    {
+        alert('Please Select Material Type');
+    $("#MaterialType").focus();
+        return false;
+    }
+}
+        
+   
+     
+    
+
+
+
+//corrected
 $(document).ready(function(){
  $("#MaterialType").select2();
         

application/views/addsupplier.php

@@ -387,7 +387,7 @@ $(function() {
 		  
           <div class="col-md-12">
             <div class="col-md-3"><span>Account Number</span>
-              <input type="text" id="accno" name="accno" maxlength="20" class="form-control">
+            	<input type="text" id="accno" name="accno" maxlength="20" class="form-control" onkeypress='return event.charCode >= 48 && event.charCode <= 57'>
             </div>
             <div class="col-md-3"><span>IFSC Code</span> 
               <input type="text" id="ifsc" name="ifsc" maxlength="12" class="form-control">

application/views/editOldRawmaterial.php

@@ -11,6 +11,7 @@ $remarks='';
 $conversionfactorUOM='';
 $conversionactor ='';
 $RMCode = '';
+$HSNcode = '';
 $IsActive = '';
 
 if(!empty($materialDetails))
@@ -27,7 +28,8 @@ if(!empty($materialDetails))
         $remarks = $MD->Remarks;
         $conversionfactor = $MD->ConversionFactorUnit; 
         $conversionfactorUOM = $MD->ConversionFactorUOM; 
-        $RMCode = $MD->RMCode;     
+        $RMCode = $MD->RMCode;
+        $HSNcode = $MD->HSNCODE;     
         $chk = $MD->IsActive;  
          
          if($chk == 1)
@@ -281,8 +283,13 @@ function changeTextBox() {
                                 </div>
                             </div>
                             <div class="col-md-12">
-                                
+                                 <div class="col-md-3">
-                                    <div class="col-md-9">
+                                    <div class="form-group">  
+                                        <span for="HSNcode">HSN code</span>
+                                        <input type="text" class="form-control" id="HSNcode"  name="HSNcode" maxlength="255" value="<?php echo $HSNcode; ?>">
+                                    </div>
+                                </div>  
+                                    <div class="col-md-6">
                                      <div class="form-group">
                                         <span for="remarks">Remarks</span>
                                         <input type="text" class="form-control" id="remarks"  name="remarks" maxlength="255" value="<?php echo $remarks;?>">

application/views/rawmaterialListing.php

@@ -34,7 +34,8 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
                       <th>Conversion Factor</th>
                       <th>Conversion Factor UOM</th>
                       <th>Asset Code</th>
-                      <th>Cost Center</th>                     
+                      <th>Cost Center Code</th>
+                      <th>HSN Code</th>                     
                                        
                     </tr>
           </thead>
@@ -57,7 +58,8 @@ collection:{container:"DTTT_dropdown dropdown-menu",buttons:{normal:"",disabled:
                       <td><?php echo $record->ConversionFactorUnit ?></td> 
                       <td><?php echo $record->ConversionFactorUOM ?></td>
                       <td><?php echo $record->assetcode ?></td>
-                      <td><?php echo $record->CostCenterCode ?></td>                     
+                      <td><?php echo $record->CostCenterCode ?></td> 
+                      <td><?php echo $record->HSNCODE ?></td>                    
                      
                     </tr>
                     <?php