From 029758631b892810c3db36eb7e877c181e6e1efe Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Mon, 12 Apr 2021 12:18:29 +0200
Subject: [PATCH] Dodan id narocila v admin tabelo narocil

---
 admin/survey/script/narocila.js                  | 7 ++++---
 frontend/payments/classes/class.UserNarocila.php | 3 ++-
 public/css/admin.css                             | 3 ++-
 resources/sass/admin/payments.scss               | 3 ++-
 4 files changed, 10 insertions(+), 6 deletions(-)

diff --git a/admin/survey/script/narocila.js b/admin/survey/script/narocila.js
index 103c8c253..115f077d7 100644
--- a/admin/survey/script/narocila.js
+++ b/admin/survey/script/narocila.js
@@ -54,7 +54,7 @@ function popupUserAccess_close() {
 function prepareNarocilaTableAdmin(){
 
     $("#user_narocila").DataTable({
-        order: [[ 4, "desc" ]],
+        order: [[ 5, "desc" ]],
         lengthMenu: [[50, 500, 1000], [50, 500, 1000]],
         select: false,
         lengthChange: true,
@@ -63,8 +63,9 @@ function prepareNarocilaTableAdmin(){
         responsive: true,
         columnDefs: [
             {responsivePriority: 1, targets: 0},
-            {responsivePriority: 2, targets: 7},
-            {responsivePriority: 3, targets: 4}
+            {responsivePriority: 2, targets: 1},
+            {responsivePriority: 3, targets: 8},
+            {responsivePriority: 4, targets: 5}
         ],
         language: {
             "url": siteUrl+"admin/survey/script/datatables/Slovenian.json"
diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php
index 2e34c1942..3eed99e29 100644
--- a/frontend/payments/classes/class.UserNarocila.php
+++ b/frontend/payments/classes/class.UserNarocila.php
@@ -375,7 +375,7 @@ class UserNarocila{
         // Glava tabele
         echo '  <thead>';
         echo '      <tr>';
-
+        echo '          <th>ID</th>';
         echo '          <th>'.$lang['srv_narocilo_ime'].'</th>';
         echo '          <th>'.$lang['email'].'</th>';
         echo '          <th>'.$lang['srv_narocilo_paket'].'</th>';
@@ -406,6 +406,7 @@ class UserNarocila{
 
             echo '<tr class="'.$status_color.'_bg">';   
 
+            echo '<td>'.$data_row['id'].'</td>';
             echo '<td>'.$data_row['ime'].' '.($data_row['podjetje_ime'] != '' ? '('.$data_row['podjetje_ime'].')' : '').'</td>';
             echo '<td><span class="as_link" onClick="edit_user(\''.$data_row['usr_id'].'\'); return false;">'.$data_row['email'].'</span></td>';
             echo '<td>'.$data_row['package_name'].'</td>';
diff --git a/public/css/admin.css b/public/css/admin.css
index 813fe20d7..31a202086 100644
--- a/public/css/admin.css
+++ b/public/css/admin.css
@@ -27083,7 +27083,8 @@ label.user_access_locked:hover,
     background-color: #eeeeee;
   }
 }
-#narocila table.dataTable.user_narocila_admin td:nth-child(n+3) {
+#narocila table.dataTable.user_narocila_admin td:nth-child(1),
+#narocila table.dataTable.user_narocila_admin td:nth-child(n+4) {
   text-align: center;
 }
 #narocila table.user_narocila {
diff --git a/resources/sass/admin/payments.scss b/resources/sass/admin/payments.scss
index 8d1a51236..07f368c1d 100644
--- a/resources/sass/admin/payments.scss
+++ b/resources/sass/admin/payments.scss
@@ -228,7 +228,8 @@ label.user_access_locked,
             }
         }
 
-        td:nth-child(n+3){
+        td:nth-child(1),
+        td:nth-child(n+4){
             text-align: center;
         }
     }