This commit is contained in:
KANE LAZENI 2026-06-24 10:33:26 +00:00
parent 5ac1414c93
commit fc799421ae
5 changed files with 24 additions and 10 deletions

View File

@ -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);
}
}

View File

@ -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/");
}
});
}

View File

@ -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));
}
}

View File

@ -381,7 +381,7 @@
<?php if($livre == "0") : ?>
<?php if($codeMedicamentSubstitut>""): ?>
<td align='center'> <input type="button" value=" ... " onClick="javascript:substituer_medicament('<?= $idMedicament ?>','<?= $posologie ?>', '<?= $idDemandeSubstitution ?>','<?= $quantite ?>','<?= $codeMedicamentSubstitut ?>','<?= $idDetail ?>');"></td>
<td align='center'> <input type="button" value=" .-. " onClick="javascript:annuler_substitution_medicament_new('<?= $idDetail ?>');"></td>
<td align='center'> <input type="button" value=" --- " onClick="javascript:annuler_substitution_medicament_new('<?= $idDetail ?>');"></td>
<?php else: ?>
<td align='center'> <input type="button" value=" ... " onClick="javascript:substituer_medicament('<?= $idMedicament ?>','<?= $posologie ?>', '<?= $idDemandeSubstitution ?>','<?= $quantite ?>','<?= $codeMedicamentSubstitut ?>','<?= $idDetail ?>');"></td>
<td align='center'> </td>

View File

@ -892,7 +892,7 @@
<link rel="stylesheet" href="https://cdn.jsdelivr.net/npm/toastr@2.1.4/build/toastr.min.css" crossorigin="anonymous">
<script src="https://cdn.jsdelivr.net/npm/toastr@2.1.4/build/toastr.min.js" crossorigin="anonymous"></script>
<script src="Js/fonctions.js?ver=2026.06.24.00"></script>
<script src="Js/fonctions.js?ver=2026.06.24.01"></script>
<script src="Bootstrap/js/bootstrap.min.js"></script>
<script src="https://cdn.jsdelivr.net/npm/vue@3/dist/vue.global.prod.js"></script>