diff --git a/application/config/constants.php b/application/config/constants.php index 7d7b49a7..af1cd51d 100755 --- a/application/config/constants.php +++ b/application/config/constants.php @@ -337,10 +337,11 @@ define('Capital_RMCIncludingCustomers_Charge1', //stock final product define('Consumables', 'Consumables'); -define('RawMaterial', 'Raw Material'); + define('RawMaterial', 'Raw Material'); define('Packingmaterial', 'Packing material'); define('FinalProduct', 'Final Product'); +//define('RawMaterial', 'Raw Material Liquid Resin'); //Adavnce Payments and Receipts diff --git a/application/config/database.php b/application/config/database.php index 04a6241c..dd1c19de 100755 --- a/application/config/database.php +++ b/application/config/database.php @@ -53,6 +53,7 @@ $db['default']['username'] = 'kasiram9_Siddh'; $db['default']['password'] = 'sidh@1234'; $db['default']['database'] = 'kasiram9_SIADEV'; //$db['default']['database'] = 'kasiram9_SiddharthIndustries'; +//$db['default']['database'] = 'kasiram9_SIAPROD'; $db['default']['dbdriver'] = 'mysqli'; $db['default']['dbprefix'] = ''; $db['default']['pconnect'] = TRUE; diff --git a/application/models/batchcard_model.php b/application/models/batchcard_model.php index d68d8be8..066ceeea 100755 --- a/application/models/batchcard_model.php +++ b/application/models/batchcard_model.php @@ -607,7 +607,8 @@ class batchcard_model extends CI_Model $this->db->select('MaterialCode,MaterialName,'); $this->db->from('T_MaterialMaster'); - $this->db->where('T_MaterialMaster.Category',Consumables); + //$this->db->where('T_MaterialMaster.Category',Consumables); + $this->db->where('T_MaterialMaster.Category like','%Consumables%'); $supp = $this->db->get(); return $supp->result(); @@ -618,8 +619,9 @@ class batchcard_model extends CI_Model { $this->db->select('MaterialCode,MaterialName,'); $this->db->from('T_MaterialMaster'); - $this->db->where('T_MaterialMaster.Category',RawMaterial); + $this->db->where('T_MaterialMaster.Category like','%Raw Material%'); $supp = $this->db->get(); + //print_r($this->db->last_query()); return $supp->result(); } @@ -628,7 +630,8 @@ class batchcard_model extends CI_Model { $this->db->select('MaterialCode,MaterialName,'); $this->db->from('T_MaterialMaster'); - $this->db->where('T_MaterialMaster.Category',Packingmaterial); + // $this->db->where('T_MaterialMaster.Category',Packingmaterial); + $this->db->where('T_MaterialMaster.Category like','%Packing%'); $supp = $this->db->get(); return $supp->result(); }