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 (file)
--- a/public_html/qubeshop/lib/modules/Profile.php
+++ b/public_html/qubeshop/lib/modules/Profile.php
@@ -73,8 +73,7 @@ class Profile{
   }\r
 \r
   function getUserCompanies($uid){\r
-    $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."'));\r
-    ");\r
+    $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."'));");\r
     return $userdata;\r
   }\r
 }\r

diff --git a/public_html/qubeshop/log/logintest.log b/public_html/qubeshop/log/logintest.log
index 2720233..a4019f9 100644 (file)
--- 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 (file)
--- a/public_html/qubeshop/tmpl/index.html
+++ b/public_html/qubeshop/tmpl/index.html
@@ -56,7 +56,7 @@
 <link rel="stylesheet" href="{{ abspath }}vendor/slimselect/slimselect.css?v={{ version }}">\r
 <link rel="stylesheet" href="{{ abspath }}vendor/flatpickr/flatpickr.min.css?v={{version}}">\r
 <link rel="stylesheet" href="{{ abspath }}vendor/flatpickr/themes/airbnb.css?v={{version}}">\r
-<link rel="stylesheet" href="{{ abspath }}vendor/mediabox/mediabox.css?v={{version}}">\r
+\r
 </head>\r
 <body>\r
   {# <div class="top"> #}\r
@@ -73,7 +73,6 @@
   <script type="text/javascript" src="{{ abspath }}vendor/flatpickr/flatpickr.min.js?v={{version}}"></script> \r
   <script type="text/javascript" src="{{ abspath }}vendor/flatpickr/l10n/de.js?v={{version}}" ></script> \r
   <script type="text/javascript" src="{{ abspath }}vendor/flatpickr/l10n/fr.js?v={{version}}" ></script> \r
-  <script type="text/javascript" src="{{ abspath }}vendor/mediabox/mediabox.js?v={{version}}" ></script> \r
   <script type="text/javascript" src="{{ abspath }}js/request.js?v={{ version }}"></script>\r
   <script type="text/javascript" src="{{ abspath }}js/myapp.js?v={{ version }}"></script>\r
   <script type="text/javascript" src="{{ abspath }}js/dataform.js?v={{ version }}"></script>\r

diff --git a/public_html/qubeshop/tmpl/js/contratcadre.js b/public_html/qubeshop/tmpl/js/contratcadre.js
index 1e9a2fd..18d824d 100644 (file)
--- 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 (file)
--- 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]});\r
       }\r
     }\r
+    //console.log("sellist to set",sellist);\r
     obj.setData(sellist);\r
     if (obj.select.element.dataset.selected && obj.select.element.dataset.selected != ""){\r
        obj.set(obj.select.element.dataset.selected);\r

diff --git a/public_html/qubeshop/tmpl/js/myapp.js b/public_html/qubeshop/tmpl/js/myapp.js
index 28fbebf..d505c1c 100644 (file)
--- a/public_html/qubeshop/tmpl/js/myapp.js
+++ b/public_html/qubeshop/tmpl/js/myapp.js
@@ -29,7 +29,7 @@ let myapp = {
     },\r
     viewpanel: function(idpanel){\r
       var mypanels = document.getElementsByClassName("panel");\r
-      console.log("Panel",idpanel,mypanels);\r
+      //console.log("Panel",idpanel,mypanels);\r
       for (let i=0;i<mypanels.length;i++){\r
         mypanels[i].style.display = 'none';\r
       }\r

diff --git a/public_html/qubeshop/tmpl/js/orders.js b/public_html/qubeshop/tmpl/js/orders.js
index 26af442..1576a8d 100644 (file)
--- a/public_html/qubeshop/tmpl/js/orders.js
+++ b/public_html/qubeshop/tmpl/js/orders.js
@@ -1,9 +1,55 @@
 let orders ={\r
   tbl: null,\r
+  selects: {},\r
+  editors: {},\r
   init: function(){\r
-    \r
+    flatpickr("#basket_prefereddeliverydate",{altInput: true,\r
+      altFormat: "d.m.Y",\r
+      dateFormat: "Y-m-d",\r
+      "locale": "{{lang}}",\r
+    });\r
+    orders.selects["askprice_type"] = new SlimSelect({\r
+      select: "#askprice_type",\r
+      showSearch: false\r
+    });\r
+    orders.selects["ccaddress"] = new SlimSelect({\r
+      select: "#ccaddress",\r
+      showSearch: false,\r
+      afterClose: function(){\r
+        orders.setOrderAddress();\r
+      }\r
+    });\r
+    orders.selects["aaaddress"] = new SlimSelect({\r
+      select: "#aaaddress",\r
+      showSearch: false,\r
+      afterClose: function(){\r
+        orders.setAskPriceAddress();\r
+      }\r
+    });\r
+    orders.getAddresses();\r
   },\r
   getorders: function(){\r
 \r
+  },\r
+  setOrderAddress: function(){\r
+    let clid = orders.selects["ccaddress"].selected();\r
+    document.getElementById("basket_invoiceaddress").innerHTML = orders.addresses[clid].adresse_client;\r
+  },\r
+  setAskPriceAddress: function(){\r
+    let clid = orders.selects["aaaddress"].selected();\r
+    document.getElementById("askprice_clientaddress").innerHTML = orders.addresses[clid].adresse_client;\r
+  },\r
+  getAddresses: function(){\r
+    postData({"cl":"Profile","fn":"getUserCompanies","uid":"{{ session.id_user }}"}).then(data => {\r
+      console.log("User addresses",JSON.stringify(data.data));\r
+      //profile.companies = data.data;\r
+      dataform.fillselectlist(orders.selects["ccaddress"],data.data,'client','dspname');\r
+      dataform.fillselectlist(orders.selects["aaaddress"],data.data,'client','dspname');\r
+      orders.addresses = {};\r
+      for(var p=0;p<data.data.length;p++){\r
+        orders.addresses[data.data[p].client] = data.data[p];\r
+      }\r
+      \r
+    });\r
   }\r
 }
\ No newline at end of file

diff --git a/public_html/qubeshop/tmpl/js/profile.js b/public_html/qubeshop/tmpl/js/profile.js
index c0bec22..5b81c44 100644 (file)
--- a/public_html/qubeshop/tmpl/js/profile.js
+++ b/public_html/qubeshop/tmpl/js/profile.js
@@ -121,7 +121,7 @@ let profile ={
       profile.companies = data.data;\r
       for(var p=0;p<profile.companies.length;p++){\r
         let xcmp = "<div class=\"margin\">No Client: "+profile.companies[p].client+"<br/><p style=\"text-align: left;\">"+ profile.companies[p].adresse_client +"</p></div>"\r
-        secdata.insertAdjacentHTML('before end',xcmp);\r
+        secdata.insertAdjacentHTML('beforeend',xcmp);\r
       }\r
     });\r
     \r

diff --git a/public_html/qubeshop/tmpl/js/shop.js b/public_html/qubeshop/tmpl/js/shop.js
index 6739207..7bb408e 100644 (file)
--- 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",\r
       "locale": "{{lang}}",\r
     });\r
-    shop.selects["askprice_type"] = new SlimSelect({\r
-      select: "#askprice_type",\r
-      showSearch: false\r
-    });\r
-    shop.selects["ccaddress"] = new SlimSelect({\r
-      select: "#ccaddress",\r
-      showSearch: false,\r
-      afterClose: function(){\r
-        shop.setAddress();\r
-      }\r
-    });\r
+    // shop.selects["askprice_type"] = new SlimSelect({\r
+    //   select: "#askprice_type",\r
+    //   showSearch: false\r
+    // });\r
+    // shop.selects["ccaddress"] = new SlimSelect({\r
+    //   select: "#ccaddress",\r
+    //   showSearch: false,\r
+    //   afterClose: function(){\r
+    //     shop.setAddress();\r
+    //   }\r
+    // });\r
+    // shop.selects["aaaddress"] = new SlimSelect({\r
+    //   select: "#aaaddress",\r
+    //   showSearch: false,\r
+    //   afterClose: function(){\r
+    //     shop.setAddress();\r
+    //   }\r
+    // });\r
     shop.tblgroups = new Tabulator("#tbl_groups", {\r
       height: "calc(100vh - 158px)",\r
       layout: "fitDataStretch",\r

diff --git a/public_html/qubeshop/tmpl/panels/pnl_askprice.html b/public_html/qubeshop/tmpl/panels/pnl_askprice.html
index f91401a..f3235cb 100644 (file)
--- a/public_html/qubeshop/tmpl/panels/pnl_askprice.html
+++ b/public_html/qubeshop/tmpl/panels/pnl_askprice.html
@@ -8,9 +8,15 @@
   <div  id="lst_askprice" style="height: calc(100vh - 218px); overflow-y: auto;">\r
     <form id="frm_askprice">\r
     <div class="row">\r
-      <div class="container quarter">\r
+      <div class="quarter">\r
+        <div class="container" >\r
+          <label class="label" for="aaaddress">Selection Adresse</label>\r
+          <select class="select border data_admin" id="aaaddress"></select>\r
+        </div>\r
+        <div class="container">\r
         <label class="label" for="askprice_clientaddress">{{ lbl.clientaddress }}</label>\r
         <textarea class="input border data_askprice readonly" rows="5"  data-id="" data-column="clientaddress" data-table="askprice"  id="askprice_clientaddress" readonly></textarea>\r
+        </div>\r
       </div>\r
       <div class="row threequarter">\r
         <div class="container">\r