Merge remote-tracking branch 'refs/remotes/origin/master'

master
Maxence LANONE 2 years ago
commit 06c1f14595

@ -1,13 +1,15 @@
kind: pipeline kind: pipeline
name: JTT_CRM_Pipeline type: docker
name: default
trigger: trigger:
event: event:
- push - push
steps: steps:
- name: start - name: build
image: node image: node:alpine
commands: commands:
- npm install - cd src/
- find -name "*.js"| grep -v "node_modules" | xargs node -c - npm run build

@ -30,15 +30,26 @@ function Dashboard() {
const apiString = '/Contact/LastAdd3/' + Session.get("idUser"); const apiString = '/Contact/LastAdd3/' + Session.get("idUser");
api.get(apiString).then((response) => { api.get(apiString).then((response) => {
if (response.data.length > 0) const data = response.data;
setInfoContactRecent(response.data); if (data.length > 0){
setInfoContactRecent(response.data[0]);
}
else{
setInfoContactRecent("");
}
}); });
const apiStringKey = '/Sale/KeyNumber/' + Session.get("idUser") + "/" + month + "/" + year; const apiStringKey = '/Sale/KeyNumber/' + Session.get("idUser") + "/" + month + "/" + year;
api.get(apiStringKey).then((response) => { api.get(apiStringKey).then((response) => {
if (response.data.length > 0) const data = response.data;
if (data.length > 0){
setDataKey(response.data[0]); setDataKey(response.data[0]);
}); }
else{
setDataKey("");
}
});
const apiStringBestCustomer = '/Sale/BestCustomer/' + Session.get("idUser"); const apiStringBestCustomer = '/Sale/BestCustomer/' + Session.get("idUser");
api.get(apiStringBestCustomer).then((response) => { api.get(apiStringBestCustomer).then((response) => {
if (response.data.length > 0) if (response.data.length > 0)

Loading…
Cancel
Save