bug fixes and new additions

resources/views/senderid/index.blade.php

@@ -52,12 +52,19 @@
           <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-primary btn-sm" href="{!! url('senderids/create') !!}"><i class="fa fa-plus-circle"></i> New Sender ID</a>
             </div>
             <div class="clearfix"></div>
           </div>
 
           <div class="x_content">
+            <div class=" well" >
+              @if(session('current_user.rejected_rows_filename') !== null)
+                  <?php $url = session('current_user.rejected_rows_filename');?>
+                  <a href="{{ url('senderids/uploadreportdownload', $url) }}" class="btn btn-link">View Sender ID Bulk Upload Report</a>
+                @endif
+            </div>
             <div>
               <button id="senderid-download-xlsx" class="btn btn-success btn-sm"><i class="fa fa-file-excel-o"></i> Download XLSX</button>
               <button id="senderid-download-pdf" class="btn btn-danger btn-sm"><i class="fa fa-file-pdf-o"></i> Download PDF</button>
@@ -90,8 +97,12 @@
     }
     function statusDesign (cell, formatterParams){
       var value = cell.getValue();
-      if(value === 'Approved'){
-            return "<span style='color:#3FB449; font-weight:bold;'>" + value + "</span>";
+      // if(value === 'Approved'){
+      if(value.includes('Approved')){
+        return "<span style='color:#3FB449; font-weight:bold;'>" + value + "</span>";
+      }
+      else if(value.includes('Active')){
+        return "<span style='color:#3FB449; font-weight:bold;'>" + value + "</span>";
       }
       else{
             return "<span style='color:#E4A11B;'>" + value + "</span>";
@@ -106,23 +117,13 @@
         printAsHtml: true,
         ajaxLoaderLoading: $('#logo_spinner').html(),
         columns: [
-            {
-                title: "Client",
-                field: "clientName",
-                sorter: "string",
-                formatter:link,
-            },
+            
             {
                 title: "Sender ID",
                 field: "senderid",
                 sorter: "string",
                 formatter: cellDesign,
-            },
-            {
-                title: "Status",
-                field: "status",
-                sorter: "string",
-                formatter: statusDesign,
+                formatter:link,
             },
             {
                 title: "Direct MNO",
@@ -130,16 +131,27 @@
                 sorter: "string",
             },
             {
-                title: "Country",
-                field: "country",
+                title: "Network",
+                field: "mno_name",
                 sorter: "string",
             },
             {
-                title: "Network",
-                field: "networkName",
+                title: "Supplier",
+                field: "supplier_name",
                 sorter: "string",
             },
-            
+            {
+                title: "Status",
+                field: "status",
+                sorter: "string",
+                formatter: statusDesign,
+            }, 
+            {
+                title: "Remarks",
+                field: "remarks",
+                sorter: "string",
+                formatter: statusDesign,
+            },            
             {
                 title: "Created By",
                 field: "createdBy",