(no commit message)

diff --git a/inc/commons/class.common.core.php b/inc/commons/class.common.core.php
index 43a8f6774f766b02dc1e73282b2da85a98f18514..b6c7b2bf3bc9bebb774800dbc577641abf1b8fcc 100644 (file)
--- a/inc/commons/class.common.core.php
+++ b/inc/commons/class.common.core.php
@@ -100,6 +100,11 @@ class commonCore extends cubeCore {
         *\r
         * @return\r
         */\r
+       /**\r
+        * commonCore::dbSync()\r
+        *\r
+        * @return\r
+        */\r
        public function dbSync()\r
        {\r
                $cache = ROOT . '/cache/DB_SYNC';\r
@@ -391,6 +396,19 @@ class commonCore extends cubeCore {
                $db->ws_users_tree->administrateur_id('integer', 0, false);\r
                // Clé\r
                $db->ws_users_tree->primary('pk_utilisateur_id', 'utilisateur_id');\r
+               // Table des demandes de devis\r
+               $db->demandes->demande_id('integer', 0, false);\r
+               $db->demandes->type('varchar', 128, false);\r
+               $db->demandes->pages('varchar', 128, false);\r
+               $db->demandes->liens('varchar', 128, false);\r
+               $db->demandes->langues('varchar', 128, false);\r
+               $db->demandes->details('text', 0, false);\r
+               $db->demandes->date('integer', 0, false);\r
+               $db->demandes->status('integer', 0, false);\r
+               $db->demandes->revendeur('integer', 0, false);\r
+               $db->demandes->utilisateur('integer', 0, false);\r
+               // Clés\r
+               $db->demandes->primary('demande_id');\r
 \r
                try {\r
                        $dbi = new CubeDbStruct($this->con);\r

diff --git a/inc/ws/Controlleur/class.ws.ajax.php b/inc/ws/Controlleur/class.ws.ajax.php
index 21cd6316a8c48b99a7cc90210fbd6c6b123747af..92b6a9c8233b2c1b94116c31a1ced134e80741a2 100644 (file)
--- a/inc/ws/Controlleur/class.ws.ajax.php
+++ b/inc/ws/Controlleur/class.ws.ajax.php
@@ -213,6 +213,54 @@ class wsAjax extends cubeAjax {
                $dao->sauve($data);\r
                $x->addAlert(__('Paramètres de la langue et traductions enregistrées'));\r
        }\r
+\r
+       public static function demandeDevis($args, &$x)\r
+       {\r
+               global $core;\r
+               if (!self::valideDemandeDevis()) {\r
+                       return;\r
+               }\r
+               // L'utilisateur est-il déjà dans la base ?\r
+               $daoUtilisateur = new commonDAOUtilisateur($core->con);\r
+               $utilisateur = $daoUtilisateur->selectByEmail($_POST['email']);\r
+               if ($utilisateur != null) {\r
+                       $utilisateur_id = $this->utilisateur_id;\r
+               }else{\r
+\r
+               }\r
+\r
+\r
+       }\r
+\r
+       public static function valideDemandeDevis()\r
+       {\r
+               foreach($_POST as $k => $v) {\r
+                       $_POST[$k] = trim($v);\r
+               }\r
+               // Validation des champs de formulaires\r
+               $ok = true;\r
+               $non_vides = array('pages', 'nom', 'adresse', 'code_postal', 'ville', 'pays');\r
+               foreach($non_vides as $nv) {\r
+                       if ($_POST[$nv] == '') {\r
+                               $x->addError($nv);\r
+                               $ok = false;\r
+                       } else {\r
+                               $x->addOk($nv);\r
+                       }\r
+               }\r
+\r
+               if (!cubeMail::isEmail($_POST['email'])) {\r
+                       $x->addError('email');\r
+                       $ok = false;\r
+               } else {\r
+                       $x->addOk('email');\r
+               }\r
+\r
+               if (!$ok) {\r
+                       $x->addAlert(__('Vous devez compléter les champs marqués en rouge'));\r
+               }\r
+               return $ok;\r
+       }\r
 }\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/DAO/_common.php b/inc/ws/DAO/_common.php
index aeb5f343fc27169d3cbc201a83b796bd35f7f2a4..7d9299858c3db837b54d7154e24bfe0fdd22f9f2 100644 (file)
--- a/inc/ws/DAO/_common.php
+++ b/inc/ws/DAO/_common.php
@@ -5,5 +5,6 @@ $__autoload['wsDAOTheme'] = dirname(__FILE__) . '/class.ws.dao.theme.php';
 $__autoload['wsDAOIcone'] = dirname(__FILE__) . '/class.ws.dao.icone.php';\r
 $__autoload['wsDAOLang'] = dirname(__FILE__) . '/class.ws.dao.lang.php';\r
 $__autoload['wsDAOSignature'] = dirname(__FILE__) . '/class.ws.dao.signature.php';\r
+$__autoload['wsDAODemande'] = dirname(__FILE__) . '/class.ws.dao.demande.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/DAO/class.ws.dao.demande.php b/inc/ws/DAO/class.ws.dao.demande.php
new file mode 100644 (file)
index 0000000..0af3cb8
--- /dev/null
+++ b/inc/ws/DAO/class.ws.dao.demande.php
@@ -0,0 +1,7 @@
+<?php\r
+\r
+class wsDAODemande extends commonDAO{\r
+\r
+}\r
+\r
+?>
\ No newline at end of file

diff --git a/inc/ws/Metier/_common.php b/inc/ws/Metier/_common.php
index ca1e445c8e945352b5154f54585e470cf4db6472..54c92156d957602086f042cea0c44b0a186e72d9 100644 (file)
--- a/inc/ws/Metier/_common.php
+++ b/inc/ws/Metier/_common.php
@@ -12,5 +12,6 @@ $__autoload['wsBox'] = dirname(__FILE__) . '/class.ws.box.php';
 $__autoload['wsIcone'] = dirname(__FILE__) . '/class.ws.icone.php';\r
 $__autoload['wsLang'] = dirname(__FILE__) . '/class.ws.lang.php';\r
 $__autoload['wsSignature'] = dirname(__FILE__) . '/class.ws.signature.php';\r
+$__autoload['wsDemande'] = dirname(__FILE__) . '/class.ws.demande.php';\r
 \r
 ?>
\ No newline at end of file

diff --git a/inc/ws/Metier/class.ws.demande.php b/inc/ws/Metier/class.ws.demande.php
new file mode 100644 (file)
index 0000000..ecbceb5
--- /dev/null
+++ b/inc/ws/Metier/class.ws.demande.php
@@ -0,0 +1,16 @@
+<?php\r
+class wsDemande extends cubeMetier {\r
+       protected $type;\r
+       protected $pages;\r
+       protected $liens;\r
+       protected $langues;\r
+       protected $details;\r
+\r
+       protected $date;\r
+       protected $status;\r
+\r
+       protected $revendeur;\r
+       protected $utilisateur;\r
+}\r
+\r
+?>
\ No newline at end of file