From 0c8cc2981c241b16b8000ac6d25a68a37a92f1b6 Mon Sep 17 00:00:00 2001
From: "vincent@cubedesigners.com"
 <vincent@cubedesigners.com@f5622870-0f3c-0410-866d-9cb505b7a8ef>
Date: Fri, 21 Jan 2011 11:53:55 +0000
Subject: [PATCH]

---
 inc/commons/class.common.core.php    | 10 +++++++++-
 inc/ws/Controlleur/class.ws.ajax.php | 19 ++++++++++---------
 2 files changed, 19 insertions(+), 10 deletions(-)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index de7a018d1..0e3a4d1a9 100644
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -36,6 +36,14 @@ class commonCore extends cubeCore {
 			2 => __('Payée'), 3 => __('Annulée'), 4 => __('Avoir'));
 		$this->books_status = array(-1 => __('Brouillon'), 0 => __('Prêt'), 1 => __('Téléchargé'), 2 => __('Facturé'));
 		$this->agences = array('Paris', 'Montpellier');
+		$this->demandes_type = array(0 => __('Non défini'),
+			1 => __('Catalogue'),
+			2 => __('Magazine / Presse'),
+			3 => __('Rapport annuel'),
+			4 => __('Plaquette de société'),
+			5 => __('Brochure touristique'),
+			6 => __("Manuel d'utilisation"),
+			7 => __('Livre'));
 		$this->ws_grades = array(0 => __("Pas d'accès"), 1 => __('Client'), 2 => __('Client (droits de création)'), 3 => __('Revendeur'), 4 => __('Revendeur (droits de création)'), 5 => __('Administrateur'));
 	}
 
@@ -399,7 +407,7 @@ class commonCore extends cubeCore {
 		$db->ws_users_tree->primary('pk_utilisateur_id', 'utilisateur_id');
 		// Table des demandes de devis
 		$db->demandes->demande_id('integer', 0, false);
-		$db->demandes->type('varchar', 128, false);
+		$db->demandes->type('integer', 0, false);
 		$db->demandes->pages('varchar', 128, false);
 		$db->demandes->liens('varchar', 128, false);
 		$db->demandes->langues('varchar', 128, false);
diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index ed4128d17..0e668412b 100644
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -234,10 +234,10 @@ class wsAjax extends cubeAjax {
 			$datas['code_postal'] = $_POST['code_postal'];
 			$datas['ville'] = $_POST['ville'];
 			$datas['pays'] = $_POST['pays'];
-			if ($_POST['societe'] == '') {
+			if ($_POST['rs'] == '') {
 				$datas['nom'] = $_POST['prenom'] . ' ' . $_POST['nom'];
 			} else {
-				$datas['nom'] = $_POST['societe'];
+				$datas['nom'] = $_POST['rs'];
 			}
 			$datas['site'] = $_POST['site'];
 			$datas['ws_grade'] = 1;
@@ -265,11 +265,11 @@ class wsAjax extends cubeAjax {
 
 		$datas = array();
 		$datas['demande_id'] = 'new';
-		$datas['type'] = $_POST['type'];
-		$datas['pages'] = $_POST['pages'];
-		$datas['liens'] = $_POST['liens'];
-		$datas['langues'] = $_POST['langues'];
-		$datas['details'] = $_POST['details'];
+		$datas['type'] = $_POST['produits'];
+		$datas['pages'] = $_POST['nombre_pages'];
+		$datas['liens'] = $_POST['nombre_liens'];
+		$datas['langues'] = $_POST['nombre_langues'];
+		$datas['details'] = $_POST['detail'];
 		$datas['utilisateur'] = $utilisateur_id;
 		$datas['revendeur'] = 0;
 		$datas['status'] = 0;
@@ -281,13 +281,14 @@ class wsAjax extends cubeAjax {
 
 	public static function valideDemandeDevis(&$x)
 	{
-		$d = array_unique($_POST);
+		$d = unserialize(base64_decode($_GET['devis_form']));
+		$d = cubeArray::array_flatten($d);
 		foreach($d as $k => $v) {
 			$_POST[$k] = trim($v);
 		}
 		// Validation des champs de formulaires
 		$ok = true;
-		$non_vides = array('pages', 'nom', 'adresse', 'code_postal', 'ville', 'pays');
+		$non_vides = array('nombre_pages', 'nom', 'adresse', 'code_postal', 'ville', 'pays');
 		foreach($non_vides as $nv) {
 			if (!isset($_POST[$nv]) || $_POST[$nv] == '') {
 				$x->addError($nv);
-- 
2.39.5