From 20790e762d6e903334bd6459ddc82418e7cf07ed Mon Sep 17 00:00:00 2001 From: Vincent Vanwaelscappel Date: Wed, 26 Mar 2025 19:44:45 +0100 Subject: [PATCH] wip #7378 @0.5 --- framework/application/controllers/AdminajaxController.php | 7 ++++--- framework/application/forms/Devis.php | 2 +- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/framework/application/controllers/AdminajaxController.php b/framework/application/controllers/AdminajaxController.php index 5f4b7e7..23ffde2 100644 --- a/framework/application/controllers/AdminajaxController.php +++ b/framework/application/controllers/AdminajaxController.php @@ -202,17 +202,18 @@ L\'équipe "De toutes les couleurs"'); public function devisConvertToStoreOrder($id) { + $r = Bootstrap::getInstance()->getDb()->select()->from('devis')->where('id = ?', $id)->query()->fetch(); + $db = $this->getDb(); $bind['type'] = 'MAG'; $bind['date_reponse'] = $bind['date_paiement'] = $_POST['date']; $bind['methode_paiement'] = $_POST['methode_paiement']; $bind['status'] = DTLC_Form_Devis::PAYE; + $bind['secret'] = $r->secret ?: md5(rand(100000000, 999999999)); $db->compliantUpdate('devis', $bind, $db->quoteInto('id = ?', $id)); - $r = Bootstrap::getInstance()->getDb()->select()->from('devis')->where('id = ?', $id)->query()->fetch(); - $this->_datas->addClosePopup(); - $this->_datas->addRedirection('/devis/index/' . $id . '/' . $r->secret); + $this->_datas->addRedirection('/devis/index/' . $id . '/' . $bind['secret']); } } diff --git a/framework/application/forms/Devis.php b/framework/application/forms/Devis.php index 1d5c215..a7535ad 100644 --- a/framework/application/forms/Devis.php +++ b/framework/application/forms/Devis.php @@ -160,7 +160,7 @@ class DTLC_Form_Devis extends CubeIT_Form_List protected function _actionStore($r, $view) { - if ($r['status'] > 1) { + if ($r['status'] != 1) { return; } return $view->linkPopup($view->imageSilk('cart'), '/admin/ajaxpopup/devisConvertToStoreOrder/' . $r['id'], array('title' => 'Convertir en facture magasin')); -- 2.39.5