diff --git a/frontend/payments/api_test.php b/frontend/payments/api_test.php index 60aff0b41..ba15099a4 100644 --- a/frontend/payments/api_test.php +++ b/frontend/payments/api_test.php @@ -14,7 +14,8 @@ $private_key = 'NLFYb67/[pUE%W-s'; // Nastavimo parametre -$action = 'create_narocilo'; +//$action = 'create_narocilo'; +$action = 'get_last_narocilo'; //$action = 'stripe_checkout_success'; //$action = 'check_ddv'; //$action = 'get_predracun'; @@ -91,7 +92,7 @@ function executePOST(){ $params = 'action='.$action; // Funkcija, ki jo želimo izvesti // POST data - $post_data = array( + /*$post_data = array( "email" => 'peter.hrvatin@gmail.com', "status" => '0', "package_id" => '3', @@ -106,10 +107,13 @@ function executePOST(){ "podjetje_postna" => '1000', "podjetje_posta" => 'Ljubljanačšžćčxxx', "podjetje_davcna" => '11122233', - ); + );*/ /*$post_data = array( "narocilo_id" => '33' );*/ + $post_data = array( + "email" => 'peter@1ka.si' + ); /*$post_data = array( "podjetje_drzava" => 'Germany', "podjetje_davcna" => '115235681', diff --git a/frontend/payments/classes/class.ApiNarocilaController.php b/frontend/payments/classes/class.ApiNarocilaController.php index f858801e3..a4c970c07 100644 --- a/frontend/payments/classes/class.ApiNarocilaController.php +++ b/frontend/payments/classes/class.ApiNarocilaController.php @@ -128,6 +128,7 @@ class ApiNarocilaController{ switch ($this->params['action']) { + // Ustvari novo narocilo case 'create_narocilo': $narocilo = new UserNarocila(); @@ -135,6 +136,7 @@ class ApiNarocilaController{ break; + // Posodobi obstoječe narocilo (npr. nastavi nacin placila) case 'update_narocilo': $narocilo = new UserNarocila(); @@ -142,6 +144,36 @@ class ApiNarocilaController{ break; + + // Dobi podatke zadnjega narocila za uporabnika + case 'get_last_narocilo': + + $usr_id = 0; + + // Dobimo user id iz emaila + if(isset($this->data['email'])){ + $sqlU = sisplet_query("SELECT id FROM users WHERE email='".$this->data['email']."'"); + $rowU = mysqli_fetch_array($sqlU); + + $usr_id = $rowU['id']; + } + + if($usr_id == '' || $usr_id == 0){ + $this->response['error'] = 'ERROR! Missing user ID.'; + $this->response['success'] = false; + + break; + } + + // Dobimo podatke zadnjega narocila + $narocilo = new UserNarocila(); + $last_narocilo = $narocilo->getLastNarocilo($usr_id); + + $this->response = $last_narocilo; + + break; + + // Dobimo pdf predracun (ce ne obstaja ga ustvarimo) case 'get_predracun': @@ -156,6 +188,7 @@ class ApiNarocilaController{ break; + // Dobimo pdf racun case 'get_racun': @@ -170,6 +203,7 @@ class ApiNarocilaController{ break; + // Placamo narocilo - aktiviramo uporabniku paket za uporabo, zgeneriramo in vrnemo url do pdf racuna in ga tudi posljemo po mailu case 'placaj_narocilo': diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php index abdc0d95e..19d9efaa1 100644 --- a/frontend/payments/classes/class.UserNarocila.php +++ b/frontend/payments/classes/class.UserNarocila.php @@ -77,6 +77,30 @@ class UserNarocila{ return $narocila; } + // Dobimo podatke zadnjega narocila za dolocenega uporabnika + public function getLastNarocilo($usr_id){ + global $admin_type; + + $return = array(); + + // Dobimo zadnje narocilo uporabnika + $sqlNarocilo = sisplet_query("SELECT un.*, up.name AS package_name, up.description AS package_description, up.price AS package_price + FROM user_access_narocilo un, user_access_paket up + WHERE un.usr_id='".$usr_id."' AND un.package_id=up.id + ORDER BY un.time DESC + "); + + // Uporabnik nima se nobenega narocila + if(mysqli_num_rows($sqlNarocilo) == 0){ + $return['id'] = '0'; + } + else{ + $return = mysqli_fetch_array($sqlNarocilo); + } + + return $return; + } + // Izracunamo koncno ceno glede na paket, trajanje in popust (v eur) public function getPrice($package_name, $trajanje, $discount=0){