diff --git a/Controleur/ControleurConnexion.php b/Controleur/ControleurConnexion.php index 60e1962..e746882 100755 --- a/Controleur/ControleurConnexion.php +++ b/Controleur/ControleurConnexion.php @@ -551,8 +551,9 @@ class ControleurConnexion extends Controleur $this->requete->getSession()->setAttribut("p_ageMaxBeneficiaireAtteint_C", "0"); $this->requete->getSession()->setAttribut("p_faceRegistered_C", "0"); - $this->requete->getSession()->setAttribut("p_activerOtpPrestations_C", "0"); - + // $this->requete->getSession()->setAttribut("p_activerOtpPrestations_C", "0"); + $this->requete->getSession()->setAttribut("p_activerOtpPrestations_C", -1); + $this->requete->getSession()->setAttribut("p_activerOtpFacturePrestations_C", -1); /* FIN variable de session context */ diff --git a/Controleur/ControleurConnexiondecompte.php b/Controleur/ControleurConnexiondecompte.php index 094155b..b4b11be 100755 --- a/Controleur/ControleurConnexiondecompte.php +++ b/Controleur/ControleurConnexiondecompte.php @@ -470,15 +470,15 @@ require_once 'Modele/Societeuser.php'; $this->requete->getSession()->setAttribut("p_codeActeConsultationGratuite", $utilisateur['codeActeConsultationGratuite']); - $_SESSION['p_url_search'] = $_SESSION['p_baseUrlFace']; $_SESSION['p_url_register'] = $_SESSION['p_baseUrlFace']; $_SESSION['p_url_confirm'] = $_SESSION['p_baseUrlFace']; $_SESSION['p_url_remove'] = $_SESSION['p_baseUrlFace']; $this->requete->getSession()->setAttribut("p_faceRegistered_C", "0"); - $this->requete->getSession()->setAttribut("p_activerOtpPrestations_C", "0"); - + // $this->requete->getSession()->setAttribut("p_activerOtpPrestations_C", "0"); + $this->requete->getSession()->setAttribut("p_activerOtpPrestations_C", -1); + $this->requete->getSession()->setAttribut("p_activerOtpFacturePrestations_C", -1); $_SESSION['p_idLogapiface'] = "0"; diff --git a/Modele/Feuillemaladie.php b/Modele/Feuillemaladie.php index afabae0..ea08d18 100755 --- a/Modele/Feuillemaladie.php +++ b/Modele/Feuillemaladie.php @@ -86,6 +86,7 @@ class Feuillemaladie extends Modele { $_SESSION['p_codeMedecin_C'] = $ligne['codeMedecin']; $_SESSION['p_medecinConsultation_C'] = $ligne['medecinConsultation']; $_SESSION['codeAffection'] = $ligne['codeAffection']; + $_SESSION['p_activerOtpFacturePrestations_C'] = $ligne['activerOtpFacturePrestations']; return $ligne; } diff --git a/Vue/Feuillemaladie/index.php b/Vue/Feuillemaladie/index.php index 4eed7f5..96a694e 100755 --- a/Vue/Feuillemaladie/index.php +++ b/Vue/Feuillemaladie/index.php @@ -88,6 +88,22 @@ { $specialite = $this->nettoyer($feuillemaladie['specialiteEng']); } + + $activerOtp = $_SESSION['p_activerOtpFacturePrestations_C']; + $otpStatus = $this->nettoyer($feuillemaladie['otpStatus']); + + if($modeSaisieFacture=="1") // Pas OTP en mode Décompte + { + $otpStatus = -1; + } + + var_dump( + array( + "activerOtp" => $activerOtp, + "otpStatus" => $otpStatus, + ) + ); + ?> diff --git a/Vue/Fichebeneficiaire/index.php b/Vue/Fichebeneficiaire/index.php index 4753afd..354e2ef 100755 --- a/Vue/Fichebeneficiaire/index.php +++ b/Vue/Fichebeneficiaire/index.php @@ -130,6 +130,7 @@ { $otpStatus = -1; } + $prestationPossible = $_SESSION['prestationPossible']; $prestationPossibleEncaissement = $this->nettoyer($beneficiaire['prestationPossibleEncaissement']);