From: Kilian Saffran <ksaffran@dks.lu>
Date: Thu, 26 Aug 2021 12:37:04 +0000 (+0200)
Subject: v20210826 02
X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=e200cbd5a151051cab2bdf9e14873eff5ad943f2;p=qube.git

v20210826 02
---

diff --git a/public_html/qubeshop/lib/modules/ArticleGroups.php b/public_html/qubeshop/lib/modules/ArticleGroups.php
index 5fe9f14..4a93d91 100644
--- a/public_html/qubeshop/lib/modules/ArticleGroups.php
+++ b/public_html/qubeshop/lib/modules/ArticleGroups.php
@@ -24,7 +24,7 @@ class ArticleGroups{
 
   public function getArticleGroupsByFamille($famille,$lang){
     if (!$lang){ $lang=$this->cfg["lang"];}
-    return $this->dbh->queryarray("select ag.id,ag.article,ag.gp_art,ag.famille_art,coalesce(ag.titre_".$lang.",ag.titre_".$this->cfg["lang"].") as titre,replace(ag.image,' ','%20') as image from article_groups ag left join groupes grp on (ag.gp_art=grp.gp_art) where famille_art='".$famille."' order by grp.titre_".$lang.",ag.gp_art,ag.titre_".$lang.",ag.article;");
+    return $this->dbh->queryarray("select ag.id,ag.article,ag.gp_art,ag.famille_art,coalesce(ag.titre_".$lang.",ag.titre_".$this->cfg["lang"].") as titre,replace(ag.image,' ','%20') as image from article_groups ag left join groupes grp on (ag.gp_art=grp.gp_art) where ag.famille_art='".$famille."' order by grp.titre_".$lang.",ag.gp_art,ag.titre_".$lang.",ag.article;");
   }
 }
 ?>
\ No newline at end of file
diff --git a/public_html/qubeshop/log/logintest.log b/public_html/qubeshop/log/logintest.log
index 59ed8d4..9429c72 100644
--- a/public_html/qubeshop/log/logintest.log
+++ b/public_html/qubeshop/log/logintest.log
@@ -3,3 +3,13 @@ USER: select id,usertype from users where lower(useremail)=lower('ksaffran@dks.l
     [id] => ef3b63ab-24a5-4972-86fb-8c3a4f36e75c
     [usertype] => admin
 )
+USER: select id,usertype from users where lower(useremail)=lower('ksaffran@dks.lu') and userpassword = 'a1b496fa520a1c52edd076ca7a59e56667e7ebeb5ba5ba966d2d01628e165359' and userpassword is not null and userpassword != '' and isenabled='1'; - USER: select id,usertype from users where lower(useremail)=lower('ksaffran@dks.lu') and userpassword = 'a1b496fa520a1c52edd076ca7a59e56667e7ebeb5ba5ba966d2d01628e165359' and userpassword is not null and userpassword != '' and isenabled='1'; - USER: select id,usertype from users where lower(useremail)=lower('ksaffran@dks.lu') and userpassword = '0ecf731e2426a8a469f06e9f4a3bcbed6f8071d9d3e3ef7ef5fd9165021e27ec' and userpassword is not null and userpassword != '' and isenabled='1'; - Array
+(
+    [id] => ef3b63ab-24a5-4972-86fb-8c3a4f36e75c
+    [usertype] => admin
+)
+USER: select id,usertype from users where lower(useremail)=lower('ksaffran@dks.lu') and userpassword = '0ecf731e2426a8a469f06e9f4a3bcbed6f8071d9d3e3ef7ef5fd9165021e27ec' and userpassword is not null and userpassword != '' and isenabled='1'; - Array
+(
+    [id] => ef3b63ab-24a5-4972-86fb-8c3a4f36e75c
+    [usertype] => admin
+)
diff --git a/public_html/qubeshop/tmpl/js/shop.js b/public_html/qubeshop/tmpl/js/shop.js
index f1c85bb..2d13e64 100644
--- a/public_html/qubeshop/tmpl/js/shop.js
+++ b/public_html/qubeshop/tmpl/js/shop.js
@@ -63,6 +63,7 @@ let shop= {
     lst.innerHTML ="";
     postData({"cl":"ArticleGroups","fn":"getArticleGroupsByFamille","famille":fart,"lang":"{{lang}}"}).then(data => {
      let rowx=0;
+     //console.log("Groups".data.data);
       for (var d=0;d<data.data.length;d++){
         //console.log("row " + d);
         if ((d != 0) && (d%5==0)){
@@ -145,7 +146,7 @@ let shop= {
               '<th style="width: 105px;">'+((grpdata.c04_label != null)?grpdata.c04_label:'&nbsp;')+'</th>'+
               '<th style="width: 105px;">'+((grpdata.c05_label != null)?grpdata.c05_label:'&nbsp;')+'</th>'+
               '<th style="width: 50px;">Stock</th>'+
-              '<th style="' + ((type=='cc')?'width: 320px;min-width: 320px;':'width: 400px;min-width: 400px;') + '">{{ lbl.quantity }}</th>';
+              '<th style="' + ((type=='cc')?'width: 350px;min-width: 350px;':'width: 400px;min-width: 400px;') + '">{{ lbl.quantity }}</th>';
               if (type != 'cc'){
                 strartgrp +=  '<th style="width: 120px;">{{ lbl.unitprice }}<br/>(hTVA)</th>';
               }