fixed senderid bulk upload, uploaded logo file on prod

app/Http/Controllers/SenderIdController.php

@@ -283,14 +283,12 @@ class SenderIdController extends Controller
     public function getUploadReport($name){
         $file = public_path('documents/general_files/') . $name;
         $headers = ['Content-Type' => 'text/plain '];
-        return \Response::download($file, 'Sender ID Upload Report', $headers);
+        return \Response::download($file, 'Sender ID Upload Report.xlsx', $headers);
     }
     public function getSampleFile(){
         $file = public_path('helper_documents/senderid_sample_file.xlsx');
-
-        #$extension = pathinfo($file, PATHINFO_EXTENSION);
         $headers = ['Content-Type' => 'application/vnd.openxmlformats-officedocument.spreadsheetml.sheet']; 
-        return \Response::download($file, 'Sender ID Sample Upload File', $headers);
+        return \Response::download($file, 'Sender ID Sample Upload File.xlsx', $headers);
     }
     public function edit($id){
         $senderid = Models\SenderId::findOrFail($id);

public/assets/js/senderid.js

@@ -36,8 +36,8 @@ $(document).ready(function(){
       // $('#mnoDivEdit').removeClass('hidden');
       // $('#supplierDivEdit').addClass('hidden');
       $('#supplierNameEdit').attr('required', false);
-      $('#supplierNameEdit').attr('disabled', false);
-      $('#networkNameEdit').attr('disabled', true);
+      $('#supplierNameEdit').attr('disabled', true);
+      $('#networkNameEdit').attr('disabled', false);
     }
     else if(directMnoSelectionEditStart == 'NO'){
       console.log('in the NO in Edit | at rest');

public/documents/general_files/erp_1764328824pKdQDj.xlsx_rejected_rows.txt

@@ -0,0 +1,23 @@
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":"_"}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":"active","remarks":null}

public/documents/general_files/erp_1764333597V6OQz6.xlsx_rejected_rows.txt

@@ -0,0 +1 @@
+{"senderid":null,"direct_mno":null,"mno_name":null,"supplier_name":null,"status":null,"remarks":null}

resources/views/layouts/master.blade.php

@@ -56,7 +56,7 @@
       <div class="col-md-3 left_col">
         <div class="left_col scroll-view">
           <div class="navbar nav_title" style="border: 0;">
-            <img src="{{ url('public/assets/img/clicklogo.png') }}" width="230px" height="70px">
+            <img src="{{ url('public/assets/img/cml-final-3.png') }}" width="230px" height="70px" style="background-color: #fff;">
             <!-- <a href="{{ url('/') }}" class="site_title"><i class="fa fa-paw"></i> 
               <span>Click ERP</span>
             </a> -->

resources/views/senderid/index.blade.php

@@ -52,7 +52,7 @@
           <div class="x_title">
             <h2> Sender IDs </h2>
             <div class="pull-right">
-                <a class="btn btn-warning btn-sm" href="{!! url('senderids/upload') !!}"><i class="fa fa-cloud-upload"></i> Upload Sender ID</a>
+                <a class="btn btn-warning btn-sm" href="{!! url('senderids/upload') !!}"><i class="fa fa-cloud-upload"></i> Upload Sender IDs</a>
                 <a class="btn btn-primary btn-sm" href="{!! url('senderids/create') !!}"><i class="fa fa-plus-circle"></i> New Sender ID</a>
                 <a class="btn btn-success btn-sm" href="{!! url('senderids/exportall') !!}"><i class="fa fa-plus-circle"></i> Download All</a>
             </div>

resources/views/staff_members/profile.blade.php

@@ -96,15 +96,20 @@
 
             <div class="" role="tabpanel" data-example-id="togglable-tabs">
               <ul id="myTab" class="nav nav-tabs bar_tabs" role="tablist">
-                <li role="presentation" class="active"><a href="#tab_content1" id="home-tab" role="tab" data-toggle="tab" aria-expanded="true">Recent Activity</a>
-                </li>
-                <li role="presentation" class=""><a href="#tab_content2" role="tab" id="profile-tab" data-toggle="tab" aria-expanded="false">Personal Details</a>
-                </li>
-                <li role="presentation" class=""><a href="#tab_content3" role="tab" id="profile-tab2" data-toggle="tab" aria-expanded="false">Leave Profile</a>
-                </li>
+                <li role="presentation" class="active"><a href="#tab_content1" role="tab" id="profile-tab" data-toggle="tab" aria-expanded="false">Personal Details</a></li>
+                <li role="presentation" class=""><a href="#tab_content2" id="home-tab" role="tab" data-toggle="tab" aria-expanded="true">Recent Activity</a></li>       
+                <li role="presentation" class=""><a href="#tab_content3" role="tab" id="profile-tab2" data-toggle="tab" aria-expanded="false">Leave Profile</a></li>
               </ul>
               <div id="myTabContent" class="tab-content">
-                <div role="tabpanel" class="tab-pane fade active in" id="tab_content1" aria-labelledby="home-tab">
+                <div role="tabpanel" class="tab-pane fade active in" id="tab_content1" aria-labelledby="profile-tab">
+                  <div>
+                    Name : <br> 
+                    Designation : <br>
+                    Country : <br>
+                    DOB : <br>
+                  </div>
+                </div>
+                <div role="tabpanel" class="tab-pane fade" id="tab_content2" aria-labelledby="home-tab">
 
                   <!-- start recent activity -->
                   <ul class="messages">
@@ -145,38 +150,6 @@
 
                   </ul>
                   <!-- end recent activity -->
-
-                </div>
-                <div role="tabpanel" class="tab-pane fade" id="tab_content2" aria-labelledby="profile-tab">
-
-                  <!-- start user projects -->
-                  <table class="data table table-striped no-margin">
-                    <thead>
-                      <tr>
-                        <th>#</th>
-                        <th>Project Name</th>
-                        <th>Client Company</th>
-                        <th class="hidden-phone">Hours Spent</th>
-                        <th>Contribution</th>
-                      </tr>
-                    </thead>
-                    <tbody>
-                      <tr>
-                        <td>1</td>
-                        <td>New Company Takeover Review</td>
-                        <td>Deveint Inc</td>
-                        <td class="hidden-phone">18</td>
-                        <td class="vertical-align-mid">
-                          <div class="progress">
-                            <div class="progress-bar progress-bar-success" data-transitiongoal="35"></div>
-                          </div>
-                        </td>
-                      </tr>
-
-                    </tbody>
-                  </table>
-                  <!-- end user projects -->
-
                 </div>
                 <div role="tabpanel" class="tab-pane fade" id="tab_content3" aria-labelledby="profile-tab">
                   <p>xxFood truck fixie locavore, accusamus mcsweeney's marfa nulla single-origin coffee squid. Exercitation +1 labore velit, blog sartorial PBR leggings next level wes anderson artisan four loko farm-to-table craft beer twee. Qui