diff --git a/app/Config/Routes.php b/app/Config/Routes.php index 7da5622c..a3e8f911 100755 --- a/app/Config/Routes.php +++ b/app/Config/Routes.php @@ -405,6 +405,7 @@ $routes->get('transporterListing', 'Supplier::transporterListing'); $routes->post('fetchTransporterDetails', 'Supplier::fetchTransporterDetails');// for Ajax both add and edit.... $routes->get('deleteTransporter', 'Supplier::deleteTransporter'); $routes->get('reActivateTransporter', 'Supplier::reActivateTransporter'); +$routes->post('checkTransporter', 'Supplier::checkTransporter'); //Factory Machine Master Routes diff --git a/app/Controllers/Supplier.php b/app/Controllers/Supplier.php index 99473f78..f44b7bdf 100755 --- a/app/Controllers/Supplier.php +++ b/app/Controllers/Supplier.php @@ -464,6 +464,22 @@ class Supplier extends BaseController return $this->response->setJSON($data); } + + /** + * check the Transporter exists? + */ + + function checkTransporter(){ + + $data = $this->request->getPost(); + $message = $this->supplier_model->checkTransporter($data['transportername']); + if(!empty($message)){ + echo true; + }else{ + echo false; + } + + } /** * delete the Transporter @@ -486,6 +502,9 @@ class Supplier extends BaseController } + /** + * reactivate the Transporter + */ function reActivateTransporter($id = NULL) { diff --git a/app/Models/Supplier_model.php b/app/Models/Supplier_model.php index 13a17b8e..60c6fa15 100755 --- a/app/Models/Supplier_model.php +++ b/app/Models/Supplier_model.php @@ -53,6 +53,16 @@ class Supplier_model extends Model } + function checkTransporter($transporterName){ + $builder = $this->db->table('t_transporter') + ->where('name', $transporterName) + ->where('isactive',1); + $query = $builder->get(); + + return $query->getResult(); + } + + function deleteTransporter($Sid, $SupplierInfo){ diff --git a/app/Views/transporterListing.php b/app/Views/transporterListing.php index 3d499186..894e8434 100755 --- a/app/Views/transporterListing.php +++ b/app/Views/transporterListing.php @@ -82,50 +82,58 @@
-
+
-
- - Add New Transporter + + +
+ + Add New Transporter
- +
-
+ - + - + + + + - - -
-
- - -
+
+ + +
- - + +
@@ -146,29 +154,32 @@ $createdat = new DateTime($record->created_on); $date = $createdat->format('d-m-Y'); $time = $createdat->format('h:i A'); - ?> - " - style="isactive == 0){echo"display:none";}?>" - > + ?> + " style="isactive == 0) { + echo "display:none"; + } ?>"> name ?> FirstName ?> isactive == 0) { ?> -     - -    -     +     + +    +     - @@ -186,14 +197,13 @@
-