Commit Graph

10573 Commits

Author SHA1 Message Date
Joan Sanchez 19b1190480 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2423-hide_leftMenu
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 08:38:03 +02:00
Joan Sanchez 776f16641e Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 08:28:13 +02:00
Joan Sanchez da5be333d9 fix(osticket): don't show resolved tickets by other deparments
gitea/salix/pipeline/head This commit looks good Details
2021-10-18 08:22:14 +02:00
Carlos Jimenez Ruiz 1ba2a924e6 refactor(print): chrimoum is now a single process on each instance with no child processes
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 16:15:00 +02:00
Joan Sanchez e26eed5d30 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 16:07:56 +02:00
Carlos Jimenez Ruiz ace1c9c84b fix(transaction): priceDifference now commits its created transaction
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 16:02:50 +02:00
Carlos Jimenez Ruiz c4c1aa929a refactor(endpoints): corrected indentation and removed unused code
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 16:00:50 +02:00
Carlos Jimenez Ruiz de7af0fee2 fix(transaction): priceDifference now commits its created transaction 2021-10-15 15:59:59 +02:00
Carlos Jimenez Ruiz 270b2802c8 refactor(transactions): added transaction to sendChechingPresence and corrected a typo
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 15:31:13 +02:00
Carlos Jimenez Ruiz 05df98939b Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 14:47:34 +02:00
Carlos Jimenez Ruiz 580ba36357 refactor(jasmine): usage of done on async functions is deprecated 2021-10-15 14:45:41 +02:00
Carlos Jimenez Ruiz f1611f8fe0 fix(e2e): many e2e using descriptor more menu need a wait before using the options 2021-10-15 14:42:27 +02:00
Carlos Jimenez Ruiz 2a20a9194a fix(puppeteer): chrimium now limited to single process with no child processes to avoid ram overload 2021-10-15 14:40:48 +02:00
Carlos Jimenez Ruiz 5e8c216cd2 fix(dependencies): jasmine and it's reporters upgraded 2021-10-15 14:39:45 +02:00
Joan Sanchez e9539c7675 Restored SQL version
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 14:09:07 +02:00
Joan Sanchez d5cf57fbb1 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2021-10-15 14:07:48 +02:00
Joan Sanchez 8fabd378e7 Removed version folder
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 14:00:15 +02:00
Joan Sanchez 629a8d25b7 Updated pagination styles
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 13:49:41 +02:00
Joan Sanchez b6a9896cba Fixed monitor problems filter
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 12:10:28 +02:00
Joan Sanchez 85b4730c6c feat(monitor): show client risk to future on tickets
gitea/salix/pipeline/head This commit looks good Details
Refs: 2624
2021-10-15 10:49:23 +02:00
Vicent Llopis 6d05b046e8 feat(last-entries): add dateTo & delete style.scss
gitea/salix/pipeline/head This commit looks good Details
2021-10-15 10:34:32 +02:00
Carlos Jimenez Ruiz 99043bd94e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-10-14 16:21:55 +02:00
Carlos Jimenez Ruiz 946151c966 refactor(e2e): waitForTimeouts needed for descriptors more menu 2021-10-14 16:20:49 +02:00
Carlos Jimenez Ruiz b81d6b022c refactor(buy): removed width limit for a column that was breaking e2e behavior 2021-10-14 16:18:04 +02:00
Carlos Jimenez Ruiz 9644c6b9c1 refactor(puppeteer): left comments with paths to firefox and chrome binaries for future references 2021-10-14 16:16:49 +02:00
Carlos Jimenez Ruiz 35a2a71602 refactor(sales): transaction correctly passed to findById 2021-10-14 16:16:00 +02:00
Joan Sanchez e278491ad2 refactor(order): index filter optimization
gitea/salix/pipeline/head This commit looks good Details
2021-10-14 08:48:57 +02:00
Joan Sanchez d06385fc73 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 15:09:34 +02:00
Joan Sanchez c0e1f2f0dc Changed column order
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 14:55:53 +02:00
Carlos Jimenez Ruiz b09e3ad72b Merge pull request 'now sorts correctly by practical and theorical hour' (#748) from 3219-salesMonitor_sort into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #748
Reviewed-by: Carlos Jimenez Ruiz <carlosjr@verdnatura.es>
2021-10-13 12:50:02 +00:00
Joan Sanchez 1b9b918812 Fixed format
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 14:29:11 +02:00
Joan Sanchez b2cdfd9785 Removed empty spaces 2021-10-13 14:29:01 +02:00
Joan Sanchez 31e160559b fix(salesMonitor): now sorts correctly by practical and theorical hour
Refs: 3219
2021-10-13 14:28:50 +02:00
Joan Sanchez d951ca02f0 Fixed format
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 14:21:42 +02:00
Joan Sanchez 491cca2bd6 Removed empty spaces
gitea/salix/pipeline/head Build queued... Details
2021-10-13 14:19:29 +02:00
Joan Sanchez a0a01de937 fix(salesMonitor): now sorts correctly by practical and theorical hour
gitea/salix/pipeline/head This commit looks good Details
Refs: 3219
2021-10-13 14:17:45 +02:00
Alex Moreno 1684c1bf87 feat(diary): modify sql item_getBalance
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 14:03:06 +02:00
Alex Moreno a8f8248c41 feat(diary): Add column claim
gitea/salix/pipeline/head This commit looks good Details
2021-10-13 12:33:48 +02:00
Carlos Jimenez Ruiz ce5a29496e refactor(puppeteer): default timeout setted back to 5 from 4 secs
gitea/salix/pipeline/head This commit looks good Details
2021-10-11 11:20:15 +02:00
Carlos Jimenez Ruiz 25e0e67c00 refactor(extensions): removed awaits from returned promises 2021-10-11 11:19:20 +02:00
Carlos Jimenez Ruiz 440f4d270c refactor(launchBackTest): setted default timeout back to 5 secs 2021-10-11 11:18:11 +02:00
Joan Sanchez e59acf2080 feat(uploadPhoto: Upload photo with vertical orientation & added remote file upload handler
gitea/salix/pipeline/head This commit looks good Details
Refs: 3111
2021-10-11 08:03:24 +02:00
Carlos Jimenez Ruiz 1e93f221d8 refactor(readme): removed a dupe
gitea/salix/pipeline/head This commit looks good Details
2021-10-08 15:41:02 +02:00
Joan Sanchez e641a947b3 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-08 09:51:42 +02:00
Joan Sanchez e6b60d73f1 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-10-07 13:36:23 +02:00
Joan Sanchez 4610ed83d9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3094-invoice_csv
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-07 10:28:06 +02:00
Joan Sanchez 82a14088d0 Added options to invoiceOut
gitea/salix/pipeline/head There was a failure building this commit Details
2021-10-07 10:04:50 +02:00
Carlos Jimenez Ruiz 8e05301792 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3092-module_transactions
gitea/salix/pipeline/head This commit looks good Details
2021-10-07 09:58:32 +02:00
Carlos Jimenez Ruiz cb7d1b24e8 refactor(ticket): all ticket endpoints are using transactions now
gitea/salix/pipeline/head This commit looks good Details
2021-10-07 09:57:07 +02:00
Carlos Jimenez Ruiz 55a2ec83da fix(jasmine): changed backend unit tests default timeout to 6 from 5 secs to avoid initial queries to timeout 2021-10-07 09:25:35 +02:00