verdnatura/salix-front
verdnatura
/
salix-front
2
3
Fork 1
Code Issues Pull Requests 77 Releases Wiki Activity

#6943 - FIX Customer module #628

Merged
jsegarra merged 49 commits from 6943_fix_customerSummaryTable into dev 2024-09-12 05:28:19 +00:00
Conversation 0 Commits 49 Files Changed 50 +2 -16
1 changed files with 2 additions and 16 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files
Showing only changes of commit 2d8322c6da - Show all commits

18
src/composables/useArrayData.js
View File

@ -86,26 +86,12 @@ export function useArrayData(key = useRoute().meta.moduleName, userOptions) {
Object.assign(filter, store.userFilter, exprFilter);
let where;
//FIXME: ARRAY DATA FALLA AL JUNTAR WHERE'S
// console.log(
// 'userParams?.filter?.where: ',
// userParams?.filter?.where,
// filter?.where,
// store.filter?.where
// );
if ((userParams?.filter?.where, filter?.where || store.filter?.where))
where = Object.assign(
userParams?.filter?.where ?? {},
filter?.where ?? {},
store.filter?.where ?? {}
);
if (filter?.where || store.filter?.where)
jsegarra marked this conversation as resolved Outdated
jgallego commented 2024-09-06 05:02:59 +00:00
Outdated
Review
Copy Link

si se queda un fixme deja el numero del redmine asociado,

si se queda un fixme deja el numero del redmine asociado,
jsegarra commented 2024-09-11 07:15:43 +00:00
Outdated
Review
Copy Link

Se puso esta lógica para cuando querias ir al listado de tickets pero se ha modificado el componente TicketList.
Elimino este código que además estaba mal porque tenia una , en vez de operadores lógicos

Se puso esta lógica para cuando querias ir al listado de tickets pero se ha modificado el componente TicketList. Elimino este código que además estaba mal porque tenia una , en vez de operadores lógicos
jsegarra commented 2024-09-11 07:21:10 +00:00
Outdated
Review
Copy Link

2d8322c6da

2d8322c6da3f53e322fc0577889f42be32cf7a2f
where = Object.assign(filter?.where ?? {}, store.filter?.where ?? {});
Object.assign(filter, store.filter);
filter.where = where;
// console.log('where: ', where);
const params = { filter };
// console.log('params: ', params);
delete userParams?.filter;
Object.assign(params, userParams);
params.filter.skip = store.skip;
if (store.order && store.order.length) params.filter.order = store.order;