Merge branch 'master' into 'production'

application/controllers/Broker.php

@@ -42,7 +42,12 @@ class Broker extends CI_Controller {
         $template['page_desc'] = "Brokers List View";
         $template['page_title'] = "View Brokers";
         
-        $template['brokers_data'] = $this->Broker_model->getBroker('','0,1');
+        $company_id = '';
+        if($this->session->userdata('user_type') == 2){
+        	$company_id = $this->session->userdata('id');
+        }
+
+        $template['brokers_data'] = $this->Broker_model->getBroker('','0,1',$company_id);
 
 		$this->load->view('template',$template);
 	}

application/views/Login/login-form.php

@@ -34,7 +34,7 @@
             <?php } ?>
         <form action="" method="post">
           <div class="form-group has-feedback">
-            <input type="text" class="form-control" name="username" placeholder="Email">
+            <input type="text" class="form-control" name="username" placeholder="Username">
             <span class="glyphicon glyphicon-envelope form-control-feedback"></span>
           </div>
           <div class="form-group has-feedback">

application/views/Ride/excel_mapping.php

@@ -88,8 +88,9 @@
                 </div>
             </div>
             <div class="col-md-12 btn-mapping">          
-              <button id="upload_excell" type="button" class="btn btn-primary" dmclick="0">Import Excell</button>
-            </div> 
+              <button id="upload_excell" type="button" class="btn btn-primary" dmclick="0" style="width:100px;">Import Excell</button>
+              <a href="<?= base_url('Ride/import_ride') ?>" class="btn btn-primary" style="width:100px;">Cancel</a>
+            </div>
           </div>
         </div>
       </div>