diff --git a/Controleur/ControleurAjaxsubstitutionmedicament.php b/Controleur/ControleurAjaxsubstitutionmedicament.php index b956ff7..195c06b 100755 --- a/Controleur/ControleurAjaxsubstitutionmedicament.php +++ b/Controleur/ControleurAjaxsubstitutionmedicament.php @@ -71,8 +71,6 @@ class ControleurAjaxsubstitutionmedicament extends Controleur { $idMedicament = $this->requete->getParametreFormulaire("idMedicament"); $this->prescription->annulersubstitutionmedicament($idMedicament); - - // $this->executerAction("index"); } public function prixsubstitut() @@ -102,4 +100,11 @@ class ControleurAjaxsubstitutionmedicament extends Controleur { echo $prixPublicSubstitut.'/'.$medoc['idMedicament'].'/'.$ententePrealableSubstitut; } + public function annulersubstitutionmedicamentnew() + { + $idDetail = $this->requete->getParametreFormulaire("idDetail"); + + $this->prescription->annulersubstitutionmedicamentnew($idDetail); + } + } \ No newline at end of file diff --git a/Js/fonctions.js b/Js/fonctions.js index 6c11f56..efef84f 100755 --- a/Js/fonctions.js +++ b/Js/fonctions.js @@ -29010,9 +29010,6 @@ function imprimer_prescription() } function annuler_substitution_medicament_new(idDetail) { - alert("idDetail => "+idDetail); - return; - // Messages de confirmation const v_msg = "Annuler cette substitution?"; const v_msgEng = "Cancel this substitution?"; @@ -29021,21 +29018,22 @@ function annuler_substitution_medicament_new(idDetail) { confirm_ebene_sweet(v_msg, v_msgEng).then(function(isConfirm) { if (isConfirm) { // Préparation des données pour la requête AJAX - const donnees = 'idMedicament=' + idMedicament; + const donnees = 'idDetail=' + idDetail; // Requête AJAX $.ajax({ - url: $("#racineWeb").val() + "Ajaxdetailpharmacien/annulersubstitutionmedicament/", + url: $("#racineWeb").val() + "Ajaxsubstitutionmedicament/annulersubstitutionmedicamentnew/", type: 'POST', data: donnees, success: function(data) { - $("#livraison").html(data); + // $("#livraison").html(data); }, error: function(data) { // Gestion d'erreur (peut être améliorée si nécessaire) }, complete: function() { alerter_depassement_limite(); + window.location.assign($("#racineWeb").val() + "Pharmacien/"); } }); } diff --git a/Modele/Prescription_temp.php b/Modele/Prescription_temp.php index 9dc48c4..ec16b09 100755 --- a/Modele/Prescription_temp.php +++ b/Modele/Prescription_temp.php @@ -677,5 +677,16 @@ class Prescription_temp extends Modele { return $resultat['prixZero']; } + + public function annulersubstitutionmedicamentnew($idDetail) + { + $idSaisie = $_SESSION['p_idSaisie']; + $user = $_SESSION['p_login']; + + $sql = 'call sp_p_annuler_substitution_medicament_temp_new(?,?,?)'; + + $this->executerRequete($sql, array($idDetail, $idSaisie, $user)); + } + } diff --git a/Vue/Pharmacien/index.php b/Vue/Pharmacien/index.php index 639738e..45816c8 100755 --- a/Vue/Pharmacien/index.php +++ b/Vue/Pharmacien/index.php @@ -381,7 +381,7 @@ ""): ?>