From 2f0964e0860cdf6cf0c730d2669cd7de1e93903e Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Sun, 25 Oct 2020 10:44:41 +0100
Subject: [PATCH] Dokoncano placevanje preko paypala

---
 .../classes/class.ApiNarocilaController.php   |  2 +-
 .../payments/classes/class.UserNarocila.php   |  2 +-
 .../classes/class.UserNarocilaPaypal.php      | 33 ++++++++++++++++---
 sql/update2.sql                               |  4 +++
 4 files changed, 34 insertions(+), 7 deletions(-)

diff --git a/frontend/payments/classes/class.ApiNarocilaController.php b/frontend/payments/classes/class.ApiNarocilaController.php
index 994afe0ec..b5a7bcc02 100644
--- a/frontend/payments/classes/class.ApiNarocilaController.php
+++ b/frontend/payments/classes/class.ApiNarocilaController.php
@@ -272,7 +272,7 @@ class ApiNarocilaController{
 
                     if(isset($this->data['narocilo_id'])){
                         $paypal = new UserNarocilaPaypal($this->data['narocilo_id']);
-                        $this->response = $paypal->paypalCaptureOrder();
+                        $this->response = $paypal->paypalCancelOrder();
                     }
                     else{
                         $this->response['error'] = 'Napaka! Manjka ID narocila!';
diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php
index c6325fa20..eb01c87d0 100644
--- a/frontend/payments/classes/class.UserNarocila.php
+++ b/frontend/payments/classes/class.UserNarocila.php
@@ -820,7 +820,7 @@ class UserNarocila{
         return $response;
     }
 
-    // Dokoncaj narocilo s placilom preko predracuna - TODO
+    // Dokoncaj narocilo s placilom preko predracuna
     private function finishNarociloPaypal($narocilo_id, $narocilo_data){
         global $lang;
 
diff --git a/frontend/payments/classes/class.UserNarocilaPaypal.php b/frontend/payments/classes/class.UserNarocilaPaypal.php
index 7053f700a..e8a855400 100644
--- a/frontend/payments/classes/class.UserNarocilaPaypal.php
+++ b/frontend/payments/classes/class.UserNarocilaPaypal.php
@@ -102,9 +102,9 @@ class UserNarocilaPaypal{
 
         // Vstavimo plačilo v bazo
         $sqlNarocilo = sisplet_query("INSERT INTO user_access_paypal_transaction 
-                                        (transaction_id, narocilo_id, price, currency_type, time)
+                                        (transaction_id, narocilo_id, price, currency_type, time, status)
                                         VALUES
-                                        ('".$paypal_response['transaction_id']."', '".$this->narocilo['id']."', '".$cena_za_placilo."', 'EUR', NOW())
+                                        ('".$paypal_response['transaction_id']."', '".$this->narocilo['id']."', '".$cena_za_placilo."', 'EUR', NOW(), 'CREATED')
                                     ");
         if (!$sqlNarocilo){
             $response['error'] = 'ERROR! '.mysqli_error($GLOBALS['connect_db']);
@@ -242,8 +242,22 @@ class UserNarocilaPaypal{
         }
 
 
-        $response['status'] = $paypal_response->result->status;
-        
+        // Nastavimo narocilo na placano, aktiviramo paket in vrnemo racun
+        $narocilo = new UserNarocila();
+        $payment_response = $narocilo->payNarocilo($this->narocilo['id']);
+
+        if($payment_response['success'] == true){
+            $response['racun'] = $payment_response['racun'];
+            $response['success'] = true;
+        }
+        else{
+            $response['error'] = $payment_response['error'];
+            $response['success'] = false;
+        }
+
+        $response['narocilo_id'] = $this->narocilo['id'];
+
+
         $response['success'] = true;
 
         return $response;
@@ -257,7 +271,7 @@ class UserNarocilaPaypal{
 
         // Posodobimo status narocila
         $sqlNarocilo = sisplet_query("UPDATE user_access_paypal_transaction 
-                                        SET status='CANCELED'
+                                        SET status='CANCELLED'
                                         WHERE narocilo_id='".$this->narocilo['id']."'
                                     ");
         if (!$sqlNarocilo){
@@ -267,6 +281,15 @@ class UserNarocilaPaypal{
             return $response;
         }
 
+        // Nastavimo status narocila na storniran
+        $sqlNarociloStatus = sisplet_query("UPDATE user_access_narocilo SET status='2' WHERE id='".$this->narocilo['id']."'");
+        if (!$sqlNarociloStatus){
+            $response['error'] = 'ERROR! '.mysqli_error($GLOBALS['connect_db']);
+            $response['success'] = false;
+            
+            return $response;
+        }
+
         $response['success'] = true;
 
         return $response;
diff --git a/sql/update2.sql b/sql/update2.sql
index 9bd384b8d..1f9f1fa0b 100644
--- a/sql/update2.sql
+++ b/sql/update2.sql
@@ -9331,3 +9331,7 @@ ALTER TABLE srv_anketa ADD subsequent_answers ENUM('0', '1') NOT NULL DEFAULT '1
 INSERT INTO srv_help (help, what) VALUES ('Uporabnik ne more nikoli naknadno urejati svojih odgovorov (npr. s klikom nazaj)', 'srv_subsequent_answers');
 
 UPDATE misc SET value='20.10.20' WHERE what="version";
+
+ALTER TABLE user_access_paypal_transaction CHANGE transaction_id transaction_id VARCHAR(100) NOT NULL DEFAULT '';
+
+UPDATE misc SET value='20.10.25' WHERE what="version";