From 24b410f338319b9b34663a446da6ef2f28c3a0d5 Mon Sep 17 00:00:00 2001
From: pero1203 <peter.hrvatin@gmail.com>
Date: Wed, 18 Nov 2020 10:15:59 +0100
Subject: [PATCH] Sprememba cen paketov

---
 .../payments/classes/class.UserNarocila.php   | 48 ++++++++++++++-----
 sql/update2.sql                               |  6 +++
 2 files changed, 42 insertions(+), 12 deletions(-)

diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php
index b91b1db97..570e69899 100644
--- a/frontend/payments/classes/class.UserNarocila.php
+++ b/frontend/payments/classes/class.UserNarocila.php
@@ -66,15 +66,29 @@ class UserNarocila{
         $package_price = $this->packages[$package_name]['price'];
 
         // Mesecno ceno zmanjsamo glede na trajanje
-        if((int)$trajanje >= 12){
-            $cena['monthly'] = number_format($package_price - 2, 2, '.', '');
+        if($package_name == '2ka'){
+            if((int)$trajanje >= 12){
+                $cena['monthly'] = number_format($package_price - 4, 2, '.', '');
+            }
+            elseif((int)$trajanje >= 3){
+                $cena['monthly'] = number_format($package_price - 2, 2, '.', '');
+            }
+            else{
+                $cena['monthly'] = number_format($package_price, 2, '.', '');
+            }
         }
-        elseif((int)$trajanje >= 3){
-            $cena['monthly'] = number_format($package_price - 1, 2, '.', '');
-        }
-        else{
-            $cena['monthly'] = number_format($package_price, 2, '.', '');
+        elseif($package_name == '3ka'){
+            if((int)$trajanje >= 12){
+                $cena['monthly'] = number_format($package_price - 3, 2, '.', '');
+            }
+            elseif((int)$trajanje >= 3){
+                $cena['monthly'] = number_format($package_price - 1.5, 2, '.', '');
+            }
+            else{
+                $cena['monthly'] = number_format($package_price, 2, '.', '');
+            }
         }
+        
 
         // Se brez davka za monthly
         $cena['monthly_without_tax'] = number_format(floatval($cena['monthly']) / 1.22, 2, '.', '');
@@ -133,7 +147,7 @@ class UserNarocila{
         if( isset($user_access['package_name']) && (($user_access['package_name'] == '2ka' && $package_name == '3ka') || ($user_access['package_name'] == '3ka' && $package_name == '2ka')) ){
 
             // Mesecna cena obstojecega paketa
-            $package_price = (int)$this->packages[$user_access['package_name']]['price'];
+            $package_price = floatval($this->packages[$user_access['package_name']]['price']);
 
             // Stevilo dni dokler je obstojeci paket se veljaven
             $now = time();
@@ -141,11 +155,21 @@ class UserNarocila{
             $expire_in_days = floor(($expire - $now) / (60 * 60 * 24));
 
             // Popravimo ceno, ce ima veljaven paket se za 3 mesece ali vec (pomeni, da je imel popust pri nakupu kar upostevamo)
-            if($expire_in_days > 92){
-                $package_price = number_format($package_price - 2, 2, '.', '');
+            if($package_name == '2ka'){
+                if($expire_in_days > 92){
+                    $package_price = number_format($package_price - 4, 2, '.', '');
+                }
+                elseif($expire_in_days > 31){
+                    $package_price = number_format($package_price - 2, 2, '.', '');
+                }
             }
-            elseif($expire_in_days > 31){
-                $package_price = number_format($package_price - 1, 2, '.', '');
+            elseif($package_name == '3ka'){
+                if($expire_in_days > 92){
+                    $package_price = number_format($package_price - 3, 2, '.', '');
+                }
+                elseif($expire_in_days > 31){
+                    $package_price = number_format($package_price - 1.5, 2, '.', '');
+                }
             }
 
             // Popust izracunamo kot delez cene paketa in 
diff --git a/sql/update2.sql b/sql/update2.sql
index 6b24b433b..7bcee3a1b 100644
--- a/sql/update2.sql
+++ b/sql/update2.sql
@@ -9396,3 +9396,9 @@ CREATE TABLE restrict_fk_srv_if (
 INSERT INTO restrict_fk_srv_if (if_id) VALUES (0);
 
 UPDATE misc SET value='20.11.16' WHERE what="version";
+
+## Spremenba cen paketov
+UPDATE user_access_paket SET price='13.90' WHERE name='2ka';
+UPDATE user_access_paket SET price='19.90' WHERE name='3ka';
+
+UPDATE misc SET value='20.11.16' WHERE what="version";
\ No newline at end of file