From 4595f7abdfd9c8ea8b8d432bbc8b2e9fafa5992a Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Sat, 5 Dec 2020 11:51:24 +0100
Subject: [PATCH] Popravek izpisa predracuna - preko ajax-a namesto preko
 api-ja

---
 admin/survey/script/narocila.js               |  6 +++--
 .../payments/classes/class.UserNarocila.php   | 26 +++++++++++++++++++
 .../payments/classes/class.UserPlacila.php    |  2 +-
 lang/1.php                                    |  2 +-
 lang/2.php                                    |  2 +-
 5 files changed, 33 insertions(+), 5 deletions(-)

diff --git a/admin/survey/script/narocila.js b/admin/survey/script/narocila.js
index dbab3b024..c2a078f8d 100644
--- a/admin/survey/script/narocila.js
+++ b/admin/survey/script/narocila.js
@@ -178,7 +178,8 @@ function preparePlacilaTableAdmin(){
 // Pridobimo predracun preko api-ja in redirectamo
 function getNarociloPredracun(narocilo_id){
 
-    $.post(siteUrl+'frontend/payments/api.php?action=get_predracun', {narocilo_id : narocilo_id}, function(response){
+    //$.post(siteUrl+'frontend/payments/api.php?action=get_predracun', {narocilo_id : narocilo_id}, function(response){
+    $.post('ajax.php?t=userNarocila&a=getPredracun', {narocilo_id : narocilo_id}, function(response){
 
         var pdf_url = response.replace(/\\\//g, "/");
         pdf_url = pdf_url.replace(/['"]+/g, '');
@@ -190,7 +191,8 @@ function getNarociloPredracun(narocilo_id){
 // Pridobimo racun preko api-ja in redirectamo
 function getNarociloRacun(narocilo_id){
 
-    $.post(siteUrl+'frontend/payments/api.php?action=get_racun', {narocilo_id : narocilo_id}, function(response){
+    //$.post(siteUrl+'frontend/payments/api.php?action=get_racun', {narocilo_id : narocilo_id}, function(response){
+    $.post('ajax.php?t=userNarocila&a=getRacun', {narocilo_id : narocilo_id}, function(response){
 
         var pdf_url = response.replace(/\\\//g, "/");
         pdf_url = pdf_url.replace(/['"]+/g, '');
diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php
index 71060af7e..9c833eba5 100644
--- a/frontend/payments/classes/class.UserNarocila.php
+++ b/frontend/payments/classes/class.UserNarocila.php
@@ -1400,5 +1400,31 @@ class UserNarocila{
             // Na novo izrisemo tabelo z narocili
             $this->displayNarocilaTableAdmin();
         }
+
+        // Vrnemo predracun
+        if($_GET['a'] == 'getPredracun') {
+
+            $narocilo_id = (isset($_POST['narocilo_id'])) ? $_POST['narocilo_id'] : '';
+
+            if($narocilo_id != ''){
+                $cebelica = new UserNarocilaCebelica($narocilo_id);
+                $predracun = $cebelica->getNarociloPredracun();
+
+                echo $predracun;
+            }
+        }
+
+        // Vrnemo racun
+        if($_GET['a'] == 'getRacun') {
+
+            $narocilo_id = (isset($_POST['narocilo_id'])) ? $_POST['narocilo_id'] : '';
+
+            if($narocilo_id != ''){
+                $cebelica = new UserNarocilaCebelica($narocilo_id);
+                $this->response = $cebelica->getNarociloRacun();
+
+                echo $predracun;
+            }
+        }
     }
 }
\ No newline at end of file
diff --git a/frontend/payments/classes/class.UserPlacila.php b/frontend/payments/classes/class.UserPlacila.php
index ab2133c08..8a0ba7c3f 100644
--- a/frontend/payments/classes/class.UserPlacila.php
+++ b/frontend/payments/classes/class.UserPlacila.php
@@ -183,7 +183,7 @@ class UserPlacila{
             echo '<td>'.$data_row['narocilo']['podjetje_drzava'].'</td>';
             
             // Paket
-            echo '<td>'.$data_row['narocilo']['package'].'KA</td>';
+            echo '<td>'.$data_row['narocilo']['package_id'].'KA</td>';
 
             // Trajanje
             echo '<td>'.$data_row['narocilo']['trajanje'].'</td>';
diff --git a/lang/1.php b/lang/1.php
index da482c445..9d0ad0907 100644
--- a/lang/1.php
+++ b/lang/1.php
@@ -7476,7 +7476,7 @@ $lang = array (
     'srv_placilo_stornirano'        => "Stornirano",
     'srv_placilo_drzava'            => "Država",
     'srv_placilo_paket'             => "Paket",
-    'srv_placilo_trajanje'          => "Veljavnost",
+    'srv_placilo_trajanje'          => "Trajanje",
 
 
     // DOSTOP GLEDE NA PAKET
diff --git a/lang/2.php b/lang/2.php
index 08e5dc5dd..28484da09 100644
--- a/lang/2.php
+++ b/lang/2.php
@@ -7359,7 +7359,7 @@ $lang = array (
     'srv_placilo_stornirano'        => "Canceled",
     'srv_placilo_drzava'            => "Country",
     'srv_placilo_paket'             => "Package",
-    'srv_placilo_trajanje'          => "Expire",
+    'srv_placilo_trajanje'          => "Expire after",
 
 
     // DOSTOP GLEDE NA PAKET