v20210826 01

diff --git a/public_html/qubeshop/tmpl/elements/shoptoolbar.html b/public_html/qubeshop/tmpl/elements/shoptoolbar.html
index c366995..35147eb 100644 (file)
--- a/public_html/qubeshop/tmpl/elements/shoptoolbar.html
+++ b/public_html/qubeshop/tmpl/elements/shoptoolbar.html
@@ -6,15 +6,6 @@
   <button class="bar-item toolbarbtn right green" onclick="myapp.viewpanel('basket');"><span id="basketitems">0</span>&nbsp;<span class="icon icon-shop"></span>Mon panier</button>\r
   <button class="bar-item toolbarbtn right" onclick="myapp.viewpanel('profile');"><span class="icon icon-user"></span>Mon Compte</button>\r
   <button class="bar-item toolbarbtn right" onclick="myapp.viewpanel('shop');"><span class="icon icon-box"></span>Produits</button>\r
-  <button class="bar-item toolbarbtn right" onclick="myapp.viewpanel('contratcadre');"><span class="icon icon-contrat-cadre"></span>Contrat Cadre</button>\r
+  <button class="bar-item toolbarbtn right" onclick="contratcadre.view(); return false;"><span class="icon icon-contrat-cadre"></span>Contrat Cadre</button>\r
   <button class="bar-item toolbarbtn right orange" onclick="myapp.viewpanel('favorites');"><span class="icon icon-star"></span>Favorites</button>\r
-  {% if (session.usertype == 'admin') %}\r
-  {# <div class="bar-item dropdown-hover right" style="padding: 0px!important;">\r
-    \r
-    <button class="toolbarbtn" style="margin: 2px; padding: 6px;"><span class="icon icon-contrat-cadre"></span>Contrat Cadre</button>\r
-    <div class="dropdown-content bar-block border moduletoolbar text-white" id="cmb_contratcadre">\r
-      \r
-    </div>\r
-  </div> #}\r
-  {% endif %}\r
 </div>
\ No newline at end of file

diff --git a/public_html/qubeshop/tmpl/js/contratcadre.js b/public_html/qubeshop/tmpl/js/contratcadre.js
index 454ad48..1e9a2fd 100644 (file)
--- a/public_html/qubeshop/tmpl/js/contratcadre.js
+++ b/public_html/qubeshop/tmpl/js/contratcadre.js
@@ -1,6 +1,10 @@
 let contratcadre ={
   idclient: "{{ session.id_client }}",
   selects: {"ccclient":null},
+  view: function(){
+    contratcadre.getClientList();
+    myapp.viewpanel("contratcadre");
+  },
   init: function(){
     contratcadre.selects["ccclient"] = new SlimSelect({
       select: "#ccclient",
@@ -58,7 +62,7 @@ let contratcadre ={
             let agrp = shop.setArticleGroup(g,contratcadre.article_groups[g],contratcadre.articles,'cc');
             lst.insertAdjacentHTML('beforeend',agrp);
           }
-          myapp.viewpanel("contratcadre");
+          
         
       });
     }).catch(e => { console.log(e)});