From: Kilian Saffran Date: Fri, 3 Sep 2021 18:24:58 +0000 (+0200) Subject: address selection orders and askprice X-Git-Url: http://cloud.dks.lu/git/?a=commitdiff_plain;h=69f6b0da53297774543ef6560550edea36b14c09;p=qube.git address selection orders and askprice --- diff --git a/public_html/qubeshop/lib/modules/Profile.php b/public_html/qubeshop/lib/modules/Profile.php index 026284b..30c1f38 100644 --- a/public_html/qubeshop/lib/modules/Profile.php +++ b/public_html/qubeshop/lib/modules/Profile.php @@ -73,8 +73,7 @@ class Profile{ } function getUserCompanies($uid){ - $userdata = $this->dbh->query("select client,adresse_client from clients where client in (select id_client from clients_contacts cc where useremail in (select useremail from users where id='".$uid."')); - "); + $userdata = $this->dbh->queryarray("select client,CONCAT(client,' | ', nom_1) as dspname,adresse_client from clients where client in (select id_client from clients_contacts cc where useremail in (select useremail from users where id='".$uid."'));"); return $userdata; } } diff --git a/public_html/qubeshop/log/logintest.log b/public_html/qubeshop/log/logintest.log index 2720233..a4019f9 100644 --- a/public_html/qubeshop/log/logintest.log +++ b/public_html/qubeshop/log/logintest.log @@ -108,3 +108,514 @@ 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 = '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 +) +USER: select id,usertype from users where lower(useremail)=lower('pascale.blang@qube-group.eu') and userpassword = 'cd03a563673ffe9acac15617cb6ba430db3a1914eb9aee76817d741951d2917e' and userpassword is not null and userpassword != '' and isenabled='1'; - Array +( + [id] => 235z7aa1-cd5d-494c-8e03-92ef7695902f + [usertype] => user +) +in API cfgArray +( + [cookie] => qubeshop + [lang] => fr + [debug] => 0 + [mail] => Array + ( + [from] => newsletter@qube-concretec.eu + [server] => mail.mbox.lu + [login] => newsletter@qube-concretec.eu + [password] => Bicrodunit721 + [port] => 587 + [encrpytion] => tls + [debug] => 0 + ) + + [db] => Array + ( + [type] => mysql + [host] => dedi1781.your-server.de + [dbname] => qube_db4 + [user] => qube_user4 + [password] => xevt4b99cNRHPEjF + [prefix] => wiges + [debug] => 0 + ) + + [api] => Array + ( + [useragent] => Qube Wiges WebSync + [user] => point + [password] => poco941 + [api-app-key] => l9345y3e-4b56-3fb4-91ca-404f62d52jfs + [api-device-key] => webdev + [url] => https://pointcomm.api.qube.wiges.lu/api/%%TABLE%%/search + [sqlpath] => ../api/bin/sql + [logpath] => ../api/bin/log + ) + + [datapath] => data/ + [templatepath] => tmpl/ + [basepath] => /qube/qubeshop/ + [version] => 20210903160932 + [cdate] => 20210903 +) +API cfg ENDafter is valid0USER: select id,usertype from users where lower(useremail)=lower('pascale.blang@qube-group.eu') and userpassword = 'cd03a563673ffe9acac15617cb6ba430db3a1914eb9aee76817d741951d2917e' and userpassword is not null and userpassword != '' and isenabled='1'; - Array +( + [id] => 235z7aa1-cd5d-494c-8e03-92ef7695902f + [usertype] => user +) +in API cfgArray +( + [cookie] => qubeshop + [lang] => fr + [debug] => 0 + [mail] => Array + ( + [from] => newsletter@qube-concretec.eu + [server] => mail.mbox.lu + [login] => newsletter@qube-concretec.eu + [password] => Bicrodunit721 + [port] => 587 + [encrpytion] => tls + [debug] => 0 + ) + + [db] => Array + ( + [type] => mysql + [host] => dedi1781.your-server.de + [dbname] => qube_db4 + [user] => qube_user4 + [password] => xevt4b99cNRHPEjF + [prefix] => wiges + [debug] => 0 + ) + + [api] => Array + ( + [useragent] => Qube Wiges WebSync + [user] => point + [password] => poco941 + [api-app-key] => l9345y3e-4b56-3fb4-91ca-404f62d52jfs + [api-device-key] => webdev + [url] => https://pointcomm.api.qube.wiges.lu/api/%%TABLE%%/search + [sqlpath] => ../api/bin/sql + [logpath] => ../api/bin/log + ) + + [datapath] => data/ + [templatepath] => tmpl/ + [basepath] => /qube/qubeshop/ + [version] => 20210903161205 + [cdate] => 20210903 +) +API cfg ENDafter is valid0USER: select id,usertype from users where lower(useremail)=lower('pascale.blang@qube-group.eu') and userpassword = 'cd03a563673ffe9acac15617cb6ba430db3a1914eb9aee76817d741951d2917e' and userpassword is not null and userpassword != '' and isenabled='1'; - Array +( + [id] => 235z7aa1-cd5d-494c-8e03-92ef7695902f + [usertype] => user +) +in API cfgArray +( + [cookie] => qubeshop + [lang] => fr + [debug] => 0 + [mail] => Array + ( + [from] => newsletter@qube-concretec.eu + [server] => mail.mbox.lu + [login] => newsletter@qube-concretec.eu + [password] => Bicrodunit721 + [port] => 587 + [encrpytion] => tls + [debug] => 0 + ) + + [db] => Array + ( + [type] => mysql + [host] => dedi1781.your-server.de + [dbname] => qube_db4 + [user] => qube_user4 + [password] => xevt4b99cNRHPEjF + [prefix] => wiges + [debug] => 0 + ) + + [api] => Array + ( + [useragent] => Qube Wiges WebSync + [user] => point + [password] => poco941 + [api-app-key] => l9345y3e-4b56-3fb4-91ca-404f62d52jfs + [api-device-key] => webdev + [url] => https://pointcomm.api.qube.wiges.lu/api/%%TABLE%%/search + [sqlpath] => ../api/bin/sql + [logpath] => ../api/bin/log + ) + + [datapath] => data/ + [templatepath] => tmpl/ + [basepath] => /qube/qubeshop/ + [version] => 20210903161226 + [cdate] => 20210903 +) +API cfg ENDafter is valid0USER: select id,usertype from users where lower(useremail)=lower('pascale.blang@qube-group.eu') and userpassword = 'cd03a563673ffe9acac15617cb6ba430db3a1914eb9aee76817d741951d2917e' and userpassword is not null and userpassword != '' and isenabled='1'; - Array +( + [id] => 235z7aa1-cd5d-494c-8e03-92ef7695902f + [usertype] => user +) +in API cfgArray +( + [cookie] => qubeshop + [lang] => fr + [debug] => 0 + [mail] => Array + ( + [from] => newsletter@qube-concretec.eu + [server] => mail.mbox.lu + [login] => newsletter@qube-concretec.eu + [password] => Bicrodunit721 + [port] => 587 + [encrpytion] => tls + [debug] => 0 + ) + + [db] => Array + ( + [type] => mysql + [host] => dedi1781.your-server.de + [dbname] => qube_db4 + [user] => qube_user4 + [password] => xevt4b99cNRHPEjF + [prefix] => wiges + [debug] => 0 + ) + + [api] => Array + ( + [useragent] => Qube Wiges WebSync + [user] => point + [password] => poco941 + [api-app-key] => l9345y3e-4b56-3fb4-91ca-404f62d52jfs + [api-device-key] => webdev + [url] => https://pointcomm.api.qube.wiges.lu/api/%%TABLE%%/search + [sqlpath] => ../api/bin/sql + [logpath] => ../api/bin/log + ) + + [datapath] => data/ + [templatepath] => tmpl/ + [basepath] => /qube/qubeshop/ + [version] => 20210903161353 + [cdate] => 20210903 +) +API cfg ENDafter is valid0USER: select id,usertype from users where lower(useremail)=lower('pascale.blang@qube-group.eu') and userpassword = 'cd03a563673ffe9acac15617cb6ba430db3a1914eb9aee76817d741951d2917e' and userpassword is not null and userpassword != '' and isenabled='1'; - Array +( + [id] => 235z7aa1-cd5d-494c-8e03-92ef7695902f + [usertype] => user +) +in API cfgArray +( + [cookie] => qubeshop + [lang] => fr + [debug] => 0 + [mail] => Array + ( + [from] => newsletter@qube-concretec.eu + [server] => mail.mbox.lu + [login] => newsletter@qube-concretec.eu + [password] => Bicrodunit721 + [port] => 587 + [encrpytion] => tls + [debug] => 0 + ) + + [db] => Array + ( + [type] => mysql + [host] => dedi1781.your-server.de + [dbname] => qube_db4 + [user] => qube_user4 + [password] => xevt4b99cNRHPEjF + [prefix] => wiges + [debug] => 0 + ) + + [api] => Array + ( + [useragent] => Qube Wiges WebSync + [user] => point + [password] => poco941 + [api-app-key] => l9345y3e-4b56-3fb4-91ca-404f62d52jfs + [api-device-key] => webdev + [url] => https://pointcomm.api.qube.wiges.lu/api/%%TABLE%%/search + [sqlpath] => ../api/bin/sql + [logpath] => ../api/bin/log + ) + + [datapath] => data/ + [templatepath] => tmpl/ + [basepath] => /qube/qubeshop/ + [version] => 20210903161509 + [cdate] => 20210903 +) +API cfg ENDafter is valid0USER: select id,usertype from users where lower(useremail)=lower('pascale.blang@qube-group.eu') and userpassword = 'cd03a563673ffe9acac15617cb6ba430db3a1914eb9aee76817d741951d2917e' and userpassword is not null and userpassword != '' and isenabled='1'; - Array +( + [id] => 235z7aa1-cd5d-494c-8e03-92ef7695902f + [usertype] => user +) +in API cfgArray +( + [cookie] => qubeshop + [lang] => fr + [debug] => 0 + [mail] => Array + ( + [from] => newsletter@qube-concretec.eu + [server] => mail.mbox.lu + [login] => newsletter@qube-concretec.eu + [password] => Bicrodunit721 + [port] => 587 + [encrpytion] => tls + [debug] => 0 + ) + + [db] => Array + ( + [type] => mysql + [host] => dedi1781.your-server.de + [dbname] => qube_db4 + [user] => qube_user4 + [password] => xevt4b99cNRHPEjF + [prefix] => wiges + [debug] => 0 + ) + + [api] => Array + ( + [useragent] => Qube Wiges WebSync + [user] => point + [password] => poco941 + [api-app-key] => l9345y3e-4b56-3fb4-91ca-404f62d52jfs + [api-device-key] => webdev + [url] => https://pointcomm.api.qube.wiges.lu/api/%%TABLE%%/search + [sqlpath] => ../api/bin/sql + [logpath] => ../api/bin/log + ) + + [datapath] => data/ + [templatepath] => tmpl/ + [basepath] => /qube/qubeshop/ + [version] => 20210903161516 + [cdate] => 20210903 +) +API cfg ENDafter is valid0USER: select id,usertype from users where lower(useremail)=lower('pascale.blang@qube-group.eu') and userpassword = 'cd03a563673ffe9acac15617cb6ba430db3a1914eb9aee76817d741951d2917e' and userpassword is not null and userpassword != '' and isenabled='1'; - Array +( + [id] => 235z7aa1-cd5d-494c-8e03-92ef7695902f + [usertype] => user +) +in API cfgArray +( + [cookie] => qubeshop + [lang] => fr + [debug] => 0 + [mail] => Array + ( + [from] => newsletter@qube-concretec.eu + [server] => mail.mbox.lu + [login] => newsletter@qube-concretec.eu + [password] => Bicrodunit721 + [port] => 587 + [encrpytion] => tls + [debug] => 0 + ) + + [db] => Array + ( + [type] => mysql + [host] => dedi1781.your-server.de + [dbname] => qube_db4 + [user] => qube_user4 + [password] => xevt4b99cNRHPEjF + [prefix] => wiges + [debug] => 0 + ) + + [api] => Array + ( + [useragent] => Qube Wiges WebSync + [user] => point + [password] => poco941 + [api-app-key] => l9345y3e-4b56-3fb4-91ca-404f62d52jfs + [api-device-key] => webdev + [url] => https://pointcomm.api.qube.wiges.lu/api/%%TABLE%%/search + [sqlpath] => ../api/bin/sql + [logpath] => ../api/bin/log + ) + + [datapath] => data/ + [templatepath] => tmpl/ + [basepath] => /qube/qubeshop/ + [version] => 20210903161611 + [cdate] => 20210903 +) +API cfg ENDafter is valid0USER: select id,usertype from users where lower(useremail)=lower('pascale.blang@qube-group.eu') and userpassword = 'cd03a563673ffe9acac15617cb6ba430db3a1914eb9aee76817d741951d2917e' and userpassword is not null and userpassword != '' and isenabled='1'; - Array +( + [id] => 235z7aa1-cd5d-494c-8e03-92ef7695902f + [usertype] => user +) +in API cfgArray +( + [cookie] => qubeshop + [lang] => fr + [debug] => 0 + [mail] => Array + ( + [from] => newsletter@qube-concretec.eu + [server] => mail.mbox.lu + [login] => newsletter@qube-concretec.eu + [password] => Bicrodunit721 + [port] => 587 + [encrpytion] => tls + [debug] => 0 + ) + + [db] => Array + ( + [type] => mysql + [host] => dedi1781.your-server.de + [dbname] => qube_db4 + [user] => qube_user4 + [password] => xevt4b99cNRHPEjF + [prefix] => wiges + [debug] => 0 + ) + + [api] => Array + ( + [useragent] => Qube Wiges WebSync + [user] => point + [password] => poco941 + [api-app-key] => l9345y3e-4b56-3fb4-91ca-404f62d52jfs + [api-device-key] => webdev + [url] => https://pointcomm.api.qube.wiges.lu/api/%%TABLE%%/search + [sqlpath] => ../api/bin/sql + [logpath] => ../api/bin/log + ) + + [datapath] => data/ + [templatepath] => tmpl/ + [basepath] => /qube/qubeshop/ + [version] => 20210903162117 + [cdate] => 20210903 +) +API cfg ENDafter is valid0USER: select id,usertype from users where lower(useremail)=lower('pascale.blang@qube-group.eu') and userpassword = 'cd03a563673ffe9acac15617cb6ba430db3a1914eb9aee76817d741951d2917e' and userpassword is not null and userpassword != '' and isenabled='1'; - Array +( + [id] => 235z7aa1-cd5d-494c-8e03-92ef7695902f + [usertype] => user +) +in API cfgArray +( + [cookie] => qubeshop + [lang] => fr + [debug] => 0 + [mail] => Array + ( + [from] => newsletter@qube-concretec.eu + [server] => mail.mbox.lu + [login] => newsletter@qube-concretec.eu + [password] => Bicrodunit721 + [port] => 587 + [encrpytion] => tls + [debug] => 0 + ) + + [db] => Array + ( + [type] => mysql + [host] => dedi1781.your-server.de + [dbname] => qube_db4 + [user] => qube_user4 + [password] => xevt4b99cNRHPEjF + [prefix] => wiges + [debug] => 0 + ) + + [api] => Array + ( + [useragent] => Qube Wiges WebSync + [user] => point + [password] => poco941 + [api-app-key] => l9345y3e-4b56-3fb4-91ca-404f62d52jfs + [api-device-key] => webdev + [url] => https://pointcomm.api.qube.wiges.lu/api/%%TABLE%%/search + [sqlpath] => ../api/bin/sql + [logpath] => ../api/bin/log + ) + + [datapath] => data/ + [templatepath] => tmpl/ + [basepath] => /qube/qubeshop/ + [version] => 20210903162218 + [cdate] => 20210903 +) +API cfg ENDafter is valid0USER: select id,usertype from users where lower(useremail)=lower('pascale.blang@qube-group.eu') and userpassword = 'cd03a563673ffe9acac15617cb6ba430db3a1914eb9aee76817d741951d2917e' and userpassword is not null and userpassword != '' and isenabled='1'; - Array +( + [id] => 235z7aa1-cd5d-494c-8e03-92ef7695902f + [usertype] => user +) +in API cfgArray +( + [cookie] => qubeshop + [lang] => fr + [debug] => 0 + [mail] => Array + ( + [from] => newsletter@qube-concretec.eu + [server] => mail.mbox.lu + [login] => newsletter@qube-concretec.eu + [password] => Bicrodunit721 + [port] => 587 + [encrpytion] => tls + [debug] => 0 + ) + + [db] => Array + ( + [type] => mysql + [host] => dedi1781.your-server.de + [dbname] => qube_db4 + [user] => qube_user4 + [password] => xevt4b99cNRHPEjF + [prefix] => wiges + [debug] => 0 + ) + + [api] => Array + ( + [useragent] => Qube Wiges WebSync + [user] => point + [password] => poco941 + [api-app-key] => l9345y3e-4b56-3fb4-91ca-404f62d52jfs + [api-device-key] => webdev + [url] => https://pointcomm.api.qube.wiges.lu/api/%%TABLE%%/search + [sqlpath] => ../api/bin/sql + [logpath] => ../api/bin/log + ) + + [datapath] => data/ + [templatepath] => tmpl/ + [basepath] => /qube/qubeshop/ + [version] => 20210903162241 + [cdate] => 20210903 +) +API cfg ENDafter is valid0 \ No newline at end of file diff --git a/public_html/qubeshop/tmpl/index.html b/public_html/qubeshop/tmpl/index.html index d5400bb..5c83503 100644 --- a/public_html/qubeshop/tmpl/index.html +++ b/public_html/qubeshop/tmpl/index.html @@ -56,7 +56,7 @@ - + {#
#} @@ -73,7 +73,6 @@ - diff --git a/public_html/qubeshop/tmpl/js/contratcadre.js b/public_html/qubeshop/tmpl/js/contratcadre.js index 1e9a2fd..18d824d 100644 --- a/public_html/qubeshop/tmpl/js/contratcadre.js +++ b/public_html/qubeshop/tmpl/js/contratcadre.js @@ -29,7 +29,7 @@ let contratcadre ={ //{% endif %} postData(pdata).then(data => { - console.log("CC list",data.data); + //console.log("CC list",data.data); contratcadre.ccnum = data.data.length; if (data.data.length < 2){ document.getElementById("sec_contratcadre").style.display = 'none'; @@ -51,7 +51,7 @@ let contratcadre ={ } else if (contratcadre.ccnum == 0){ return; } - console.log("CC:",contratcadre.idclient); + //console.log("CC:",contratcadre.idclient); if (contratcadre.idclient){ postData({"cl":"ContratCadre","fn":"getArticleGroups","idclient":contratcadre.idclient,"lang":"{{lang}}"}).then(agrps => { contratcadre.article_groups = agrps.data; diff --git a/public_html/qubeshop/tmpl/js/dataform.js b/public_html/qubeshop/tmpl/js/dataform.js index 1af0181..418f21a 100644 --- a/public_html/qubeshop/tmpl/js/dataform.js +++ b/public_html/qubeshop/tmpl/js/dataform.js @@ -189,6 +189,7 @@ let dataform = { sellist.push({value:listdata[i][vidcol],text:listdata[i][vvalcol]}); } } + //console.log("sellist to set",sellist); obj.setData(sellist); if (obj.select.element.dataset.selected && obj.select.element.dataset.selected != ""){ obj.set(obj.select.element.dataset.selected); diff --git a/public_html/qubeshop/tmpl/js/myapp.js b/public_html/qubeshop/tmpl/js/myapp.js index 28fbebf..d505c1c 100644 --- a/public_html/qubeshop/tmpl/js/myapp.js +++ b/public_html/qubeshop/tmpl/js/myapp.js @@ -29,7 +29,7 @@ let myapp = { }, viewpanel: function(idpanel){ var mypanels = document.getElementsByClassName("panel"); - console.log("Panel",idpanel,mypanels); + //console.log("Panel",idpanel,mypanels); for (let i=0;i { + console.log("User addresses",JSON.stringify(data.data)); + //profile.companies = data.data; + dataform.fillselectlist(orders.selects["ccaddress"],data.data,'client','dspname'); + dataform.fillselectlist(orders.selects["aaaddress"],data.data,'client','dspname'); + orders.addresses = {}; + for(var p=0;pNo Client: "+profile.companies[p].client+"

"+ profile.companies[p].adresse_client +"

" - secdata.insertAdjacentHTML('before end',xcmp); + secdata.insertAdjacentHTML('beforeend',xcmp); } }); diff --git a/public_html/qubeshop/tmpl/js/shop.js b/public_html/qubeshop/tmpl/js/shop.js index 6739207..7bb408e 100644 --- a/public_html/qubeshop/tmpl/js/shop.js +++ b/public_html/qubeshop/tmpl/js/shop.js @@ -21,17 +21,24 @@ let shop= { dateFormat: "Y-m-d", "locale": "{{lang}}", }); - shop.selects["askprice_type"] = new SlimSelect({ - select: "#askprice_type", - showSearch: false - }); - shop.selects["ccaddress"] = new SlimSelect({ - select: "#ccaddress", - showSearch: false, - afterClose: function(){ - shop.setAddress(); - } - }); + // shop.selects["askprice_type"] = new SlimSelect({ + // select: "#askprice_type", + // showSearch: false + // }); + // shop.selects["ccaddress"] = new SlimSelect({ + // select: "#ccaddress", + // showSearch: false, + // afterClose: function(){ + // shop.setAddress(); + // } + // }); + // shop.selects["aaaddress"] = new SlimSelect({ + // select: "#aaaddress", + // showSearch: false, + // afterClose: function(){ + // shop.setAddress(); + // } + // }); shop.tblgroups = new Tabulator("#tbl_groups", { height: "calc(100vh - 158px)", layout: "fitDataStretch", diff --git a/public_html/qubeshop/tmpl/panels/pnl_askprice.html b/public_html/qubeshop/tmpl/panels/pnl_askprice.html index f91401a..f3235cb 100644 --- a/public_html/qubeshop/tmpl/panels/pnl_askprice.html +++ b/public_html/qubeshop/tmpl/panels/pnl_askprice.html @@ -8,9 +8,15 @@
-
+
+
+ + +
+
+