From 15e90815481b5bf79f53122504ed10eacadecd4d Mon Sep 17 00:00:00 2001
From: "venbatechnologies@gmail.com" <venbatechnologies@gmail.com>
Date: Tue, 24 Jul 2018 15:45:40 +0530
Subject: [PATCH] add customer

---
 application/controllers/cashbook.php      |  7 ++++
 application/views/addnewIncomeExpense.php | 47 ++++++++++++++++++++---
 application/views/bankcashnew.php         | 44 +++++++++++++++++++--
 application/views/editincomeexpenses.php  | 45 +++++++++++++++++++---
 4 files changed, 128 insertions(+), 15 deletions(-)

diff --git a/application/controllers/cashbook.php b/application/controllers/cashbook.php
index 4083ba4b..f96477c7 100755
--- a/application/controllers/cashbook.php
+++ b/application/controllers/cashbook.php
@@ -1737,5 +1737,12 @@ $amountInWords = "Rupees " . $result ." Paise ". $points." Only";
        }
   }
 
+
+  public function getAllSupplier()
+  {
+  	  $suplist = $this->cashbook_model->getsupplier();
+  	  echo json_encode($suplist);
+  }
+
 }
 ?>
\ No newline at end of file
diff --git a/application/views/addnewIncomeExpense.php b/application/views/addnewIncomeExpense.php
index 697e8cf6..139a1d28 100755
--- a/application/views/addnewIncomeExpense.php
+++ b/application/views/addnewIncomeExpense.php
@@ -223,15 +223,18 @@ function loadAccountType(id)
 									<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>  
 												<select class="form-control select2 required" id="supplier" name="supplier">
 											    	<option value="-1">Select Supplier</option>	
-											    	<option value="1">Create New Supplier</option>	
+											    	<!-- <option value="1">Create New Supplier</option>	 -->
 												</select>
 									</div>
 									</div>
+									<a data-target='#Addsup' data-toggle="modal" href="#Addsup">Add New Supplier</a>
 								</div>
 
+
+
   <div>
 <div align="right">
-<a data-toggle="modal"  class="btn btn-primary" data-dismiss="modal">Add Line Item </a>
+
  <div  id="Addsup" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
  <div class="modal-dialog">
 <form>
@@ -794,9 +797,40 @@ $('.AddSupplier').click(function()
 
           success:function(data)
    	      {
-   	   	    $('#content').loader('hide');
-            alert(data);
-            location.reload();
+   	   	    // $('#content').loader('hide');
+            // alert(data);
+            var alertdata=data;
+
+            $.ajax({
+
+            	type:"POST",
+            	url:"<?php echo base_url() ?>cashbook/getAllSupplier",
+            	success:function(data)
+            	{
+                    	var html = ''; 
+          		 	 $('#supplier').find('option:not(:first)').remove();
+          
+        				 $.each(JSON.parse(data), function (supDet, supobj)
+         					{
+                    		
+           					// html +="<option value="+supobj.SupplierID+">"+supobj.SupplierName+"</option>";
+
+           					$("#supplier").append( $('<option></option>').val(supobj.SupplierID).html(supobj.SupplierID+' - '+supobj.SupplierName));	
+
+          					});
+         				
+         				//$("#supplier").append(html);
+         				alert(alertdata);
+         				$('#content').loader('hide');
+         				 $('#Addsup').modal('hide');  
+
+
+
+            	}
+
+
+            });
+             
           
    	     }
 		
@@ -805,4 +839,5 @@ $('.AddSupplier').click(function()
 
   }
 });
-</script>
\ No newline at end of file
+</script>
+
diff --git a/application/views/bankcashnew.php b/application/views/bankcashnew.php
index b60edd23..abe19e76 100644
--- a/application/views/bankcashnew.php
+++ b/application/views/bankcashnew.php
@@ -413,11 +413,13 @@ else
 									<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>  
 												<select class="form-control select2 required" id="supplier" name="supplier">
 											    	<option value="-1">Select Supplier</option>
-											    	<option value="1">Create New Supplier</option>	
+											    	<!-- <option value="1">Create New Supplier</option>	 -->
 												</select>
 									</div>
 									</div>
 
+									<a data-target='#Addsup' data-toggle="modal" href="#Addsup">Add New Supplier</a>
+
 
 
 
@@ -960,9 +962,43 @@ $('.AddSupplier').click(function()
 
           success:function(data)
    	      {
-   	   	    $('#content').loader('hide');
-            alert(data);
-            location.reload();
+   	   	    // $('#content').loader('hide');
+            // alert(data);
+            // location.reload();
+
+
+             var alertdata=data;
+
+            $.ajax({
+
+            	type:"POST",
+            	url:"<?php echo base_url() ?>cashbook/getAllSupplier",
+            	success:function(data)
+            	{
+                    	var html = ''; 
+          		 	 $('#supplier').find('option:not(:first)').remove();
+          
+        				 $.each(JSON.parse(data), function (supDet, supobj)
+         					{
+                    		
+           					// html +="<option value="+supobj.SupplierID+">"+supobj.SupplierName+"</option>";
+
+           					$("#supplier").append( $('<option></option>').val(supobj.SupplierID).html(supobj.SupplierID+' - '+supobj.SupplierName));	
+
+          					});
+         				
+         				//$("#supplier").append(html);
+         				alert(alertdata);
+         				// $('#supplier option[value="<?php echo $supplier?>"]').prop('selected', true);
+         				$('#content').loader('hide');
+         				 $('#Addsup').modal('hide');  
+
+
+
+            	}
+
+
+            });
           
    	     }
 		
diff --git a/application/views/editincomeexpenses.php b/application/views/editincomeexpenses.php
index 58ffd591..f408484f 100755
--- a/application/views/editincomeexpenses.php
+++ b/application/views/editincomeexpenses.php
@@ -424,16 +424,18 @@ function loadAccountType(id)
 										<b><span for="Suppliername">Select Supplier:</span> </b><span style="color:red">*</span></br></br>  
 													<select class="form-control select2 required" id="supplier" name="supplier">
 														<option value="-1">Select Supplier</option>	
-														<option value="1">Create New Supplier</option>
+														<!-- <option value="1">Create New Supplier</option> -->
 													</select>
 										</div>
 										</div>
+
+										<a data-target='#Addsup' data-toggle="modal" href="#Addsup">Add New Supplier</a>
 									</div>
 
 
   <div>
 <div align="right">
-<a data-toggle="modal"  class="btn btn-primary" data-dismiss="modal">Add Line Item </a>
+
  <div  id="Addsup" class="modal fade" tabindex="-1" role="dialog" aria-labelledby="myModalLabel" aria-hidden="true">
  <div class="modal-dialog">
 <!-- <form> -->
@@ -1036,9 +1038,42 @@ $('.AddSupplier').click(function()
 
           success:function(data)
    	      {
-   	   	    $('#content').loader('hide');
-            alert(data);
-            location.reload();
+   	   	    // $('#content').loader('hide');
+            // alert(data);
+            // location.reload();
+
+             var alertdata=data;
+
+            $.ajax({
+
+            	type:"POST",
+            	url:"<?php echo base_url() ?>cashbook/getAllSupplier",
+            	success:function(data)
+            	{
+                    	var html = ''; 
+          		 	 $('#supplier').find('option:not(:first)').remove();
+          
+        				 $.each(JSON.parse(data), function (supDet, supobj)
+         					{
+                    		
+           					// html +="<option value="+supobj.SupplierID+">"+supobj.SupplierName+"</option>";
+
+           					$("#supplier").append( $('<option></option>').val(supobj.SupplierID).html(supobj.SupplierID+' - '+supobj.SupplierName));	
+
+          					});
+         				
+         				//$("#supplier").append(html);
+         				alert(alertdata);
+         				$('#supplier option[value="<?php echo $supplier?>"]').prop('selected', true);
+         				$('#content').loader('hide');
+         				 $('#Addsup').modal('hide');  
+
+
+
+            	}
+
+
+            });
           
    	     }