From 285dbe4861ac21a95968bf30c89f5abd0704857e Mon Sep 17 00:00:00 2001 From: pero1203 Date: Wed, 2 Dec 2020 10:49:04 +0100 Subject: [PATCH] Popravek api klica za preverjanje ddv - vracamo ddv - true/false in pri preverjanju pocistimo crke iz davcne stevilke --- frontend/payments/classes/class.ApiNarocilaController.php | 2 ++ frontend/payments/classes/class.UserNarocila.php | 6 +++++- 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/frontend/payments/classes/class.ApiNarocilaController.php b/frontend/payments/classes/class.ApiNarocilaController.php index ff5d769dd..679ea3f1e 100644 --- a/frontend/payments/classes/class.ApiNarocilaController.php +++ b/frontend/payments/classes/class.ApiNarocilaController.php @@ -295,10 +295,12 @@ class ApiNarocilaController{ // Mora placati ddv - cena ostane ista if(UserNarocila::checkPayDDV($podjetje_davcna, $podjetje_drzava)){ $this->response['cena'] = $cena; + $this->response['ddv'] = true; } // Ne placa ddv - placa samo osnovo else{ $this->response['cena'] = number_format(floatval($cena) / 1.22, 2, '.', ''); + $this->response['ddv'] = false; } $this->response['success'] = true; diff --git a/frontend/payments/classes/class.UserNarocila.php b/frontend/payments/classes/class.UserNarocila.php index a3deb4de4..71060af7e 100644 --- a/frontend/payments/classes/class.UserNarocila.php +++ b/frontend/payments/classes/class.UserNarocila.php @@ -1267,7 +1267,11 @@ class UserNarocila{ if(!isset($countries_eu[$drzava])) return false; - // Drugace gre za tujca iz EU - preverimo ce je zavezanec + // Drugace gre za tujca iz EU + // Pocistimo davcno stevilko - ohranimo samo stevilke ce je vnesel v obliki "DE12345678" -> "12345678" + $davcna_stevilka = preg_replace('[\D]', '', $davcna_stevilka); + + // Preverimo, ce je zavezanec $client = new SoapClient("http://ec.europa.eu/taxation_customs/vies/checkVatService.wsdl"); try{ $response = $client->checkVat( array('countryCode' => $countries_eu[$drzava], 'vatNumber' => $davcna_stevilka) );