verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 57 Releases Wiki Activity
3,840 Commits 259 Branches 0 Tags 122 MiB
Commit Graph

1552 Commits

Author SHA1 Message Date
Gerard e55971a21a #794 item.regularize 2018-11-12 13:12:25 +01:00
Bernat 81eabac30b update model ticketRequest and update structure DB 2018-11-12 11:50:16 +01:00
Carlos Jimenez 247aa317af #779 ticket.ticketRequester 2018-11-12 11:17:47 +01:00
Javi Gallego 930c1d4eb1 Tarea #745 ticket.basic-data al step-two 2018-11-08 16:40:58 +01:00
Javi Gallego 4d0adb38ff Tarea #519 deprecar services/loopback/common/methods/client/activate.js 2018-11-08 15:55:48 +01:00
Joan 8db866339c fixed filter #800 2018-11-07 14:20:58 +01:00
Joan 0e1ae9b46b fixed tags sourceTable selection #764, ticket packaging fix 2018-11-07 13:32:09 +01:00
joan d2fc6b7b8b fixed client billing data bic validations 2018-11-07 09:17:07 +01:00
Bernat f7e269e72e fix test 2018-11-07 08:38:06 +01:00
Carlos Jimenez 1ad44f22b4 linter errors 2018-11-06 13:59:16 +01:00
Carlos Jimenez d85a4da1ab Bug #783 al abrir una reclamacion navegar a ella, no abrir nueva pestaña 2018-11-06 13:58:13 +01:00
Gerard e06798cf90 #762 refactor componente fetched tags 2018-11-06 10:49:38 +01:00
Gerard 35e6132b17 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-11-06 09:22:05 +01:00
Gerard 6addb2146d #762 refactor componente fetched tags 2018-11-06 09:21:53 +01:00
Carlos Jimenez 452363751c indentation 2018-11-06 08:56:06 +01:00
Juan a50a98668c VnModel.crud() bugs fixed (#784) and code refactor, VnMysql refactor 2018-11-02 15:44:27 +01:00
Bernat 96c00da809 update fixtures 2018-11-02 12:56:06 +01:00
Joan Sanchez bb50166e02 catalog order by tag #773 2018-10-31 14:56:54 +01:00
Gerard 9364594a57 excluded until I finish #739 2018-10-31 08:48:54 +01:00
Juan 31b86fce6d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-30 16:03:53 +01:00
Juan 74c00ef2f0 Ticket index fixes 2018-10-30 16:03:46 +01:00
Gerard a2db6201aa Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-30 15:04:04 +01:00
Gerard 74d72fddfb #760 ticket.ticketWeekly 2018-10-30 14:57:22 +01:00
Juan 260f548019 #599 Advanced ticket search, eslint rules fixed, e2e ticket_04 refactor 2018-10-30 13:58:02 +01:00
Bernat ddcd7baaf6 create new model ticketRequest 2018-10-30 12:17:22 +01:00
Bernat 82f58c8bc0 create new model morwerTeam 2018-10-30 09:43:17 +01:00
Bernat 1718952fcf update structure table ticketLog 2018-10-30 08:35:17 +01:00
Bernat b0c8ac7062 update acl 2018-10-29 11:53:32 +01:00
Bernat 5480c5bdbf update structure table logs 2018-10-29 11:35:17 +01:00
Gerard 36f048e4ef Bug #772 Ticket expeditions ha dejado de funcionar 2018-10-29 09:39:37 +01:00
Joan Sanchez d011b93a63 fieldAcl in production 2018-10-25 14:34:17 +02:00
Carlos Jimenez dd41733771 indentation and unused script removed 2018-10-25 14:09:32 +02:00
Joan Sanchez 7e31a83f52 Merge branch 'test' into dev 2018-10-25 13:04:59 +02:00
Joan Sanchez 145469126b package dependency 2018-10-25 12:16:55 +02:00
Gerard 8982819f7c #752 changeState.spec.js repairs 2018-10-25 11:50:18 +02:00
Gerard 4ff31fe930 #754 listSaleTracking.spec.js repairs 2018-10-25 11:49:38 +02:00
Bernat 1c81fa55ab export structure and data from production 2018-10-25 09:41:58 +02:00
Javi Gallego 5532dedcc3 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-24 14:11:28 +02:00
Javi Gallego 3b2466e121 Tarea #703 client.risk.new 2018-10-24 14:10:48 +02:00
Carlos Jimenez 7a6b2f19d3 #753 order - removes.spec.js repairs + refactors 2018-10-24 14:10:08 +02:00
Carlos Jimenez f4add0942c #751 removes.spec.js repairs 2018-10-24 13:45:59 +02:00
Carlos Jimenez 4ff2d0e6d3 back end unit test maintenance 2018-10-24 11:56:15 +02:00
Joan Sanchez 0fa8608d47 hide empty left-menu, swift validation error 2018-10-23 14:56:38 +02:00
Joan Sanchez 02355b4c20 fixed translations 2018-10-23 12:45:14 +02:00
Joan Sanchez f2d5e6afee Field ACL part one #689 (vn-model) beforeRemote() wrapper 2018-10-23 11:25:51 +02:00
Gerard a010871a7d fixed transactions 2018-10-22 14:35:46 +02:00
Gerard c512192052 #707 logs activated in all client module 2018-10-22 14:35:21 +02:00
Gerard fa8825d4d0 #636 item.index 2018-10-22 14:32:46 +02:00
Juan 6186900b02 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-22 13:30:01 +02:00
Juan 0034991251 Events on elements now are emitted after component linking 2018-10-22 13:29:52 +02:00
Javi Gallego 70b1e9921e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-22 11:13:52 +02:00
Javi Gallego d191156643 acl receipt 2018-10-22 11:13:49 +02:00
Juan 8025d84427 Test focus removed 2018-10-22 09:30:21 +02:00
Juan 79bb359051 VnModel.crud code impruved and bugs/tests fixed 2018-10-22 09:29:58 +02:00
Juan 181272086e Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-19 19:54:50 +02:00
Juan 4607bce91e E2E fixes, model bug fixes, Nightmare getProperty extensions 2018-10-19 19:54:46 +02:00
Gerard 7bbda50901 fixed typo 2018-10-19 14:54:45 +02:00
Gerard 1b504febb8 fixed ACLS 2018-10-19 14:50:15 +02:00
Javi Gallego c6c40de2fc # 702 Client.risk 2018-10-19 08:40:32 +02:00
Juan e32762acfe Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-18 20:48:30 +02:00
Juan c4b3296959 Unit tests fixed 2018-10-18 20:48:21 +02:00
Gerard 76a2eda6e0 Tarea #707 Loggable disabled due broken tests 2018-10-18 11:11:17 +02:00
Juan ecee07530a Merge 2018-10-18 09:26:05 +02:00
Juan ee73068e9e #659 - Unify model beta 2018-10-18 09:24:20 +02:00
Bernat 239e695ed5 update table clientLog 2018-10-18 08:08:31 +02:00
Bernat f61b969c6f update clientLog model and structure 2018-10-17 09:04:32 +02:00
Carlos Jimenez 6773e58cad restoreFixtures logic removed from the app as we use loopback models from now on. 2018-10-17 06:59:43 +02:00
Bernat 287caf24b1 new model receipt and update fixtures 2018-10-16 14:44:48 +02:00
Joan Sanchez f1e02587e3 fixed updateBillingData back unit test 2018-10-16 14:13:58 +02:00
Javi Gallego 67bd3d96d3 comentado test que Joan pone en redmine 2018-10-16 13:55:38 +02:00
Javi Gallego 33b9efc5b7 Tarea #696 2018-10-16 13:32:58 +02:00
Gerard 31fa66e052 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-16 13:18:32 +02:00
Gerard aaa9a0a1be Bug #635 item.data 2018-10-16 13:18:24 +02:00
Joan Sanchez 3826456a5a added bankEntity billing data #704 2018-10-16 13:06:58 +02:00
Bernat f9f1ae8c70 new model claimRatio 2018-10-16 11:17:02 +02:00
Bernat b6ac4ff900 add new model clientRisk 2018-10-16 08:36:25 +02:00
Gerard a78ffbdaa5 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-15 13:20:18 +02:00
Joan Sanchez 1773af841b hour fix 2018-10-15 11:48:03 +02:00
Joan Sanchez 589be52c6a Order filter & added model getSetValues() #722 2018-10-15 11:43:57 +02:00
Gerard 5729f19a52 Bug #730 test 2018-10-15 11:33:23 +02:00
Gerard f32f63f3c5 Bug #730 test 2018-10-15 11:29:17 +02:00
Gerard 7ed52d455d Bug #730 order.catalog no añade lineas 2018-10-15 10:48:06 +02:00
Carlos Jimenez 3151bca0bd #710 PROCEDURE vn.ticketComponentUpdateSale() unit test 2018-10-14 17:09:05 +02:00
Carlos Jimenez b6ba23282c Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-14 17:07:13 +02:00
Gerard a9d99fc16c Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-11 15:01:00 +02:00
Gerard 7f6a2bba79 xcluded test 2018-10-11 15:00:53 +02:00
Bernat f80c9134e1 update acl 2018-10-11 11:01:58 +02:00
Bernat 1607a340d2 new model defaulter 2018-10-11 10:56:28 +02:00
Bernat ba7a703ee7 update fixtures 2018-10-11 09:53:18 +02:00
Joan Sanchez 693a68ea26 vn-icon-button hide required acl buttons #708 2018-10-11 09:41:30 +02:00
Javi Gallego 377edd4f71 merge locale 2018-10-11 09:17:19 +02:00
Javi Gallego bf8ed25c06 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-11 09:15:14 +02:00
Javi Gallego 9beb4885a0 Test #691 los e2e ya no usan developer 2018-10-11 09:14:26 +02:00
Bernat 0d99b6926f update acl 2018-10-11 08:09:30 +02:00
Bernat ac1d9ddfcc update structure db 2018-10-11 07:45:51 +02:00
Gerard a016d4de31 Tarea #723 TESTS 2018-10-10 14:13:53 +02:00
Gerard 060ab04084 #723 order.summary 2018-10-10 12:55:04 +02:00
Gerard 5dabb5625c merge 2018-10-10 11:50:30 +02:00
Bernat d391d86f02 update fixtures table orderRow and rowcomponent, fix test 2018-10-10 11:17:55 +02:00
Joan Sanchez 31d655b130 Create ticket with transaction 2018-10-10 09:59:42 +02:00
Gerard 274e44368e #723 Added getTaxes to get the total taxes of an order 2018-10-08 15:21:06 +02:00
Javi Gallego 8c0e68313b Tarea #719 2018-10-08 14:56:34 +02:00
Gerard a4e72a0476 Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-08 14:35:44 +02:00
Gerard 3f7b9bea1c test commented 2018-10-08 14:35:36 +02:00
Carlos Jimenez 6283f31f5a params are now defined for future maintenance 2018-10-08 14:13:18 +02:00
Joan Sanchez 33c4ed73ca updated docker dump order #714 2018-10-08 13:37:57 +02:00
Carlos Jimenez 979660dac3 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-08 11:12:53 +02:00
Gerard 16902fab8f added getUserConfig test 2018-10-08 11:03:28 +02:00
Gerard 034cf526a6 Bug #701 Refactorizar los métodos de loopback que utilicen Self.update() 2018-10-08 11:02:56 +02:00
Carlos Jimenez fa385cd9d6 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-08 11:00:49 +02:00
Carlos Jimenez 7d5c325abe #709 PRECEDURE vn.buyUltimate() unit test 2018-10-08 10:59:19 +02:00
Carlos Jimenez 97c86efb84 #713 PROCEDURE vn.buyUltimateFromInterval() unit test 2018-10-08 10:59:05 +02:00
Joan Sanchez 300c7a3cfe userConfig fix 2018-10-08 08:14:25 +02:00
Bernat ec3a448396 update structure cau 8409 2018-10-08 07:42:05 +02:00
Joan Sanchez f7e042320d regularize claim #656 2018-10-08 07:31:55 +02:00
Bernat 427d702a8e update fixtures userConfig 2018-10-05 14:57:58 +02:00
Gerard c990877bda set userFk null in tests 2018-10-05 13:06:11 +02:00
Gerard ead7397bb3 console logs removed 2018-10-05 13:05:34 +02:00
Gerard d1ea2ddf25 Tarea #614 nueva sección cuenta 2018-10-05 13:04:41 +02:00
Gerard 0481cac14e Tarea #614 nueva sección cuenta 2018-10-05 13:01:46 +02:00
Bernat 47a50be560 updatefixtures userConfig 2018-10-05 12:21:52 +02:00
Bernat 708ca020a2 update ACL 2018-10-05 11:53:23 +02:00
Bernat 69961d5b00 update fixtures and fix test GetTaxes 2018-10-05 09:32:46 +02:00
Carlos Jimenez 1b1fcb0396 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-04 14:42:53 +02:00
Carlos Jimenez af2803deda #709 PROCEDURE vn.buyUltimate() unit test 2018-10-04 14:42:44 +02:00
Bernat ea017dde5c update ACL and table clientLog 2018-10-04 14:01:52 +02:00
Carlos Jimenez efc477f42d Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-04 13:32:38 +02:00
Carlos Jimenez ffd3dd3986 #686 PROCEDURE unit test vn.ticketCreateWithUser 2018-10-04 13:32:28 +02:00
Bernat 313ce8af6e add table userConfig 2018-10-04 11:20:17 +02:00
Bernat c2e1eaa005 update fixtures 2018-10-04 10:06:32 +02:00
Carlos Jimenez b6068e9150 #697 PROCEDURE ticketCalculateClon unit test 2018-10-04 08:46:56 +02:00
Carlos Jimenez 90831167a1 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-03 15:53:05 +02:00
Carlos Jimenez 57b9f8b359 #678 Tests importToNewRefundTicket 2018-10-03 15:46:57 +02:00
Gerard a7bd76a218 agencyMode now can be null 2018-10-03 14:05:25 +02:00
Gerard e53beea7cb Tarea #600 make it test friendly 2018-10-03 13:22:24 +02:00
Carlos Jimenez c1893be92a Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-03 12:55:10 +02:00
Gerard 6259d4611d Merge branch 'dev' of https://git.verdnatura.es/salix into dev 2018-10-03 12:54:31 +02:00
Gerard 1972a40c48 Tarea #600 make it test friendly 2018-10-03 12:54:13 +02:00
Gerard b74da9da84 Tarea #600 changed client.update for update attributes to make it compatible with logs 2018-10-03 12:53:30 +02:00
Carlos Jimenez d30b307bd3 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-03 12:36:19 +02:00
Bernat 0980c00451 update acl 2018-10-03 12:30:38 +02:00
Carlos Jimenez cba95e6c76 Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-03 11:46:54 +02:00
Carlos Jimenez 91237a87ef refactor on spec files 2018-10-03 11:40:51 +02:00
Gerard 5eb83ed01e Tarea #600 Refactor to make it compatible with logs 2018-10-03 11:27:55 +02:00
Carlos Jimenez 76da96cc48 fixtures restored 2018-10-03 10:50:09 +02:00
Gerard 43cbdefa22 Tarea #600 loggable 2018-10-03 09:37:34 +02:00
Bernat 316a7f8429 update fixtures new table orderticket 2018-10-03 08:26:05 +02:00
Bernat bbb221cc0c update fixtures orders and fix test 2018-10-03 08:12:34 +02:00
Carlos Jimenez 0537dad01d Merge branch 'dev' of http://git.verdnatura.es/salix into dev 2018-10-02 16:41:50 +02:00
Joan Sanchez 99d2ebb332 acl fix 2018-10-02 12:03:39 +02:00