SIA/siddharth_application
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

duplicate product in material master and supplier name issues fixed

Browse Source
This commit is contained in:
venbatechnologies@gmail.com 2018-01-19 18:56:38 +05:30
parent 91c14858bc
commit d2ce6373f6
6 changed files with 82 additions and 28 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
application/models/rawmaterialdetails_model.php
View File

@ -176,10 +176,13 @@ class rawmaterialdetails_model extends CI_Model
// }
function checkMaterialExists($material)
{
// $sql="SELECT MaterialCode, MaterialName, MaterialType, Category,REPLACE(MaterialName, ' ', '')
// FROM T_MaterialMaster
// WHERE REPLACE(MaterialName, ' ', '') LIKE REPLACE('%'".$material."'%', ' ', '')";
$this->db->select('MaterialCode,MaterialName,MaterialType,Category');
$this->db->from('T_MaterialMaster');
$this->db->like('MaterialName', $material);
$this->db->like('REPLACE(MaterialName, " ", "")',$material);
$query = $this->db->get();
//print_r($query->result());

2
application/models/supplier_model.php
View File

@ -182,7 +182,7 @@ function addNewsupplier($supplier)
$this->db->select('SupplierID,SupplierName,Address');
$this->db->from('T_SupplierDetailsN');
$this->db->like('SupplierName', $supp_name);
$this->db->like('REPLACE(SupplierName, " ", "")', $supp_name);
$query = $this->db->get();

47
application/views/addRawMaterial.php
View File

@ -10,27 +10,27 @@ function isNumberKey(evt)
}
function BlockSpecial(evt) {
var charCode;
if (window.event
charCode = window.event.keyCode; //for IE
else
charCode = evt.which; //for firefox
// function BlockSpecial(evt) {
// var charCode;
// if (window.event
// charCode = window.event.keyCode; //for IE
// else
// charCode = evt.which; //for firefox
if (charCode >= 91 && charCode <= 96)
return false;
if (charCode >= 123 && charCode <= 126)
return false;
if (charCode >= 33 && charCode <= 47)
return false;
if (charCode >= 58&& charCode <= 64)
return false;
// if (charCode >= 91 && charCode <= 96)
// return false;
// if (charCode >= 123 && charCode <= 126)
// return false;
// if (charCode >= 33 && charCode <= 47)
// return false;
// if (charCode >= 58&& charCode <= 64)
// return false;
else
{
return true;
}
}
// else
// {
// return true;
// }
// }
function onlyAlphabets(evt) {
var charCode;
if (window.event)
@ -280,7 +280,11 @@ function BlockSpecial(evt) {
<script>
$('#MaterialName').change(function() {
var material = $('#MaterialName').val();
var materialname = $('#MaterialName').val();
//var s = "I am Given String ";
//material = material.replace(/\s*$/,"");
var material = materialname.replace(/ /g,'');
//alert(m.length+" "+m+" "+s+" "+s.length);
$('#content').loader('show');
$.ajax({
data:{id:material},
@ -301,7 +305,8 @@ $('#MaterialName').change(function() {
});
alert("'" + material + "' - related materials are , " + " \n \n" + related_name);
alert("'" + materialname + "' - related materials are , " + " \n \n" + related_name);
$("#MaterialName").focus();
}
else{
$('#content').loader('hide');

6
application/views/addsupplier.php
View File

@ -706,7 +706,8 @@ if(!validateEmail())
$('#supplierName').change(function() {
var supplier = $('#supplierName').val();
var suppliername = $('#supplierName').val();
var supplier = suppliername.replace(/ /g,'');
$('#content').loader('show');
$.ajax({
data:{id:supplier},
@ -727,7 +728,8 @@ $('#supplierName').change(function() {
});
alert("'" + supplier + "' - related supplier are , " + " \n \n" + related_supplier);
alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier);
$("#supplierName").focus();
}
else{
$('#content').loader('hide');

40
application/views/editOldRawmaterial.php
View File

@ -388,3 +388,43 @@ function changeTextBox() {
</div>
<script src="<?php echo base_url(); ?>assets/js/editUser.js" type="text/javascript"></script>
<script>
$('#MaterialName').change(function() {
var materialname = $('#MaterialName').val();
//var s = "I am Given String ";
//material = material.replace(/\s*$/,"");
var material = materialname.replace(/ /g,'');
//alert(m.length+" "+m+" "+s+" "+s.length);
$('#content').loader('show');
$.ajax({
data:{id:material},
type:"POST",
url:"<?php echo base_url();?>rawmaterialdetails/checkmaterial",
success:function(data) {
var count = data.length;
//alert(count);
if(count >2 ){
$('#content').loader('hide');
alert('Material name already existed ! ');
dat = JSON.parse(data);
var related_name = "";
$.each(dat,function(i,obj){
related_name += obj.MaterialCode +" - "+ obj.MaterialName+" - "+obj.MaterialType+" - "+obj.Category+"\n";
});
alert("'" + materialname + "' - related materials are , " + " \n \n" + related_name);
$("#MaterialName").focus();
}
else{
$('#content').loader('hide');
// alert("empty data");
}
}
});
});
</script>

8
application/views/editSupplier.php
View File

@ -807,7 +807,9 @@ if(!validateGST())
});
$('#supplierName').change(function() {
var supplier = $('#supplierName').val();
var suppliername = $('#supplierName').val();
var supplier = suppliername.replace(/ /g,'');
$('#content').loader('show');
$.ajax({
data:{id:supplier},
@ -828,7 +830,9 @@ $('#supplierName').change(function() {
});
alert("'" + supplier + "' - related supplier are , " + " \n \n" + related_supplier);
alert("'" + suppliername + "' - related supplier are , " + " \n \n" + related_supplier);
$("#supplierName").focus();
}
else{
$('#content').loader('hide');