diff --git a/app/Controllers/Rawmaterialdetails.php b/app/Controllers/Rawmaterialdetails.php index e8e6744b..e99a8683 100755 --- a/app/Controllers/Rawmaterialdetails.php +++ b/app/Controllers/Rawmaterialdetails.php @@ -190,7 +190,7 @@ class Rawmaterialdetails extends BaseController function addNewRawMaterial() { - //echo "HI";die(); + $TempArr = []; $MaterialName = $this->request->getPost('MaterialName'); @@ -251,7 +251,7 @@ class Rawmaterialdetails extends BaseController $RawMaterial = array('MaterialName' => $MaterialName, 'MaterialType' => $MaterialType, 'UOM' => $UOM, 'Category' => $MaterialCategory, 'CreatedBy' => $CreatedBy, 'Remarks' => $Remarks, 'HSNCODE' => $HSNcode, 'stock' => $stock, 'stockdate' => $stockdate, 'reorder' => $reorder, 'Current_stock' => $currentstock); - //print_r($RawMaterial);die(); + //print_r($RawMaterial);die(); $result = $this->rawmaterialdetails_model->addNewRawMaterial($RawMaterial); if ($result > 0) { diff --git a/app/Views/addRawMaterial.php b/app/Views/addRawMaterial.php index 5204b22b..44def64f 100755 --- a/app/Views/addRawMaterial.php +++ b/app/Views/addRawMaterial.php @@ -327,16 +327,12 @@ if(data[0]?.IsActive == 1){ alert('Material name already existed ! '); $('#MaterialName').val(''); - }else{ - alert('Material name already existing in the deleted section.!!'); $('#MaterialName').val(''); + } - } - - - var related_name = ""; + var related_name = "" ; $.each(data, function(i, obj) { related_name += obj.MaterialCode + " - " + obj.MaterialName + " - " + obj.MaterialType + " - " + obj.Category + "\n"; @@ -349,9 +345,10 @@ } else{ + console.log("Material name is unique"); $('#loader').hide(); - $('addMaterialForm').submit(); + $('#addMaterialForm').submit(); } }, diff --git a/app/Views/includes/new_header.php b/app/Views/includes/new_header.php index f9b7d9fd..09edf7c9 100755 --- a/app/Views/includes/new_header.php +++ b/app/Views/includes/new_header.php @@ -634,7 +634,7 @@ - get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor'){?> + get('roleText') == 'System Administrator' || session()->get('roleText') == 'Auditor' || session()->get('roleText') == 'Security'){?>