Commit Graph

382 Commits

Author SHA1 Message Date
Carlos Jimenez Ruiz ba86693891 minor refactor 2020-11-11 15:14:05 +01:00
Carlos Jimenez Ruiz 3a0ff3be38 summary title amended + clientDescriptor for alias 2020-11-11 12:45:45 +01:00
Carlos Jimenez Ruiz c2f92cb127 small refactor 2020-11-11 12:02:40 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations 2020-11-10 16:47:39 +01:00
Joan Sanchez 16b774d585 Catalog tag selection 2020-11-04 13:19:43 +01:00
Javi Gallego 3fdc9c315d Merge branch 'dev' into 2510-client-address-create-test 2020-10-30 08:40:47 +01:00
Bernat Exposito Domenech 58168e78ab test, translate and supplier searpanel, summary 2020-10-26 08:38:43 +01:00
Javi Gallego 4aea284703 WIP: a falta de e2e 2020-10-20 14:42:23 +02:00
Carlos Jimenez Ruiz 0dbdb5103e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random 2020-10-06 10:16:08 +02:00
Carlos Jimenez Ruiz 89fb980f14 some tests fixed 2020-10-06 10:15:27 +02:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar 2020-10-06 08:17:12 +02:00
Carlos Jimenez Ruiz 9c139b49aa enabled jasme random + indentations 2020-10-05 10:04:00 +02:00
Juan Ferrer 2d1cf566f8 All tests fixed 2020-09-21 22:54:36 +02:00
Carlos Jimenez Ruiz ea077e8d4a added auto-load to some combos 2020-09-17 20:12:52 +02:00
Joan Sanchez b6499370e1 Merge branch 'dev' into 2430-catalog_multi_tag 2020-09-16 09:06:08 +00:00
Joan Sanchez f8ea14ecab Updated unit test 2020-09-16 10:11:09 +02:00
Joan Sanchez 312faeb3b0 Changes to lag list 2020-09-16 09:54:04 +02:00
Carlos Jimenez Ruiz 5b69ce983c salesPersonUser replaces salesPerson relation 2020-09-15 19:43:07 +02:00
Joan Sanchez b5b7172b72 Updated test 2020-09-15 14:26:23 +02:00
Joan Sanchez 1f1b09d456 Updated unit tests 2020-09-15 14:14:13 +02:00
Joan Sanchez 538c217b59 Store tagGroups on catalog url 2020-09-15 10:48:34 +02:00
Joan Sanchez f94728845e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2430-catalog_multi_tag 2020-09-14 10:32:34 +02:00
Joan Sanchez 9bbe50c62b Changes to catalog filters 2020-09-14 07:42:43 +02:00
Carlos Jimenez Ruiz de184c163e color var 2020-09-10 17:17:46 +02:00
Carlos Jimenez Ruiz 42abeecede hex color now displayed on catalog 2020-09-10 16:35:32 +02:00
Carlos Jimenez Ruiz 270e665291 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2404-catalog_color 2020-09-10 14:38:48 +02:00
Joan Sanchez d0ac1b621c Merge branch 'dev' into 2385-worker_descriptor_refactor 2020-09-09 09:06:11 +00:00
Joan Sanchez f56b0607ee Filter changes 2020-09-08 14:19:21 +02:00
Joan Sanchez 8daa3ae89c html changes 2020-09-08 10:11:22 +02:00
Carlos Jimenez Ruiz c3c7ef901a version pre-hex in vn.ink table 2020-09-04 12:40:23 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname 2020-09-03 15:11:16 +02:00
Joan Sanchez e6790f6120 #2406 - Sort by occurrences 2020-09-02 10:06:25 +02:00
Joan Sanchez 95601f5d55 Updated translations 2020-08-31 10:15:02 +02:00
Joan Sanchez a343d5eb9a 2394 - Removed call to order_total() 2020-08-26 11:27:36 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working 2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused 2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +02:00
Bernat Exposito Domenech b2e3ebc262 cr changes 2020-07-09 11:21:06 +02:00
Bernat Exposito Domenech ee704b302c update order filter 2020-07-06 10:20:45 +02:00
Bernat Exposito Domenech c42c6c19d6 changes in order index 2020-07-02 07:46:55 +02:00
Bernat Exposito Domenech d414db73de order index add buton and columns 2020-06-30 08:32:04 +02:00
Bernat Exposito Domenech f1b26133cf refactor order index 2020-06-17 13:25:12 +02:00
Javi Gallego 552828a1ba hasta precio 2020-06-16 10:47:01 +02:00
Carlos Jimenez Ruiz 2345a922c8 now we can create thermographs for travelThermograph 2020-05-27 13:11:41 +02:00
Joan Sanchez 9a43dff1fd Removed console.log() 2020-05-21 14:22:22 +02:00
Joan Sanchez 9a0c9d3da2 2262 Remove filter by id from searchbar 2020-05-21 14:18:24 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech a0f5f073a5 fix order traduction 2020-05-20 10:26:29 +02:00
Bernat Exposito Domenech 4133021e5c fix translate on plural 2020-05-20 08:52:20 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates 2020-05-19 10:27:22 +02:00
Juan Ferrer b14d2f9455 Small fixes in vnOrderCatalog and vnZoneEvents 2020-05-08 13:23:06 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed 2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks 2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed 2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed 2020-04-25 11:50:04 +02:00
Juan Ferrer 2249f68d6e SCSS px to em: rem for font-size 2020-04-02 15:11:42 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Juan Ferrer 734c86c5f5 SCSS px to em - First step 2020-04-02 14:20:57 +02:00
Joan Sanchez 64718b5977 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar 2020-03-27 10:01:03 +01:00
Joan Sanchez e71ace6da7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section 2020-03-25 15:59:41 +01:00
Joan Sanchez 2b7ff6fec0 Removed state vars 2020-03-25 14:08:45 +01:00
Joan Sanchez 90b437c7ad Updated unit tests 2020-03-25 14:06:13 +01:00
Joan Sanchez c8b6c3f7f3 Fixed conflicts 2020-03-25 13:44:51 +01:00
Joan Sanchez 5b5d7787ee Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2139-oder_catalog_searchbar 2020-03-25 09:25:26 +01:00
Joan Sanchez 61c85cfb9e Updated tests 2020-03-25 09:20:26 +01:00
Carlos Jimenez Ruiz 12c2b577e6 minor refactor 2020-03-24 17:01:11 +01:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section 2020-03-20 12:00:53 +01:00
Joan Sanchez b998ed200c Fixes 2020-03-20 09:01:14 +01:00
Joan Sanchez 526a92fd32 Order refactor 2020-03-17 15:18:02 +01:00
Juan Ferrer 56a21edeca Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1992-goWhenOneResult 2020-03-16 18:33:39 +01:00
Juan Ferrer 9d1bc8eb54 First functional version (No tests) 2020-03-13 20:33:12 +01:00
Joan Sanchez 7987603d7b Updated filter 2020-03-13 17:22:59 +01:00
Joan Sanchez 36ad778a59 Removed default filter 2020-03-13 15:02:51 +01:00
Joan Sanchez 2d24417078 Added translation 2020-03-13 14:40:00 +01:00
Joan Sanchez 55ff624394 2191 - Added showEmpty filter 2020-03-13 14:39:51 +01:00
Carlos Jimenez Ruiz 8688ecc810 eliminado el campo id en advanced search 2020-03-10 07:38:21 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Joan Sanchez 9e435e9553 Some changes 2020-02-19 12:34:33 +01:00
Joan Sanchez c9fd48b0cd 2112 - Catalog improvements 2020-02-19 11:57:39 +01:00
Joan Sanchez 30e3880299 Removed comments 2020-02-18 07:50:18 +01:00
Joan Sanchez c78c154ab0 Added datalist 2020-02-11 14:41:59 +01:00
Joan Sanchez b647379443 removed line 2020-02-06 13:42:28 +01:00
Joan Sanchez 20f9f7af24 2084 - Keep categoryId selected on item confirmation 2020-02-06 12:46:44 +01:00
Joan Sanchez 43693c35ad removed fdescribe 2020-01-30 14:35:21 +01:00
Joan Sanchez 8f851d5c15 refactor 2020-01-30 13:53:14 +01:00
Carlos Jimenez Ruiz a1fd5a01a7 #1976 Implementar Puppeteer 2020-01-27 00:48:00 +01:00
Joan Sanchez 7df41fc63c solved bug ordering by tag 2020-01-09 11:21:54 +01:00
Joan Sanchez c830bc6e8a fixed order by tag 2020-01-09 09:23:59 +01:00
Joan Sanchez 436673986c removed focus 2020-01-09 08:43:33 +01:00
Joan Sanchez a2e6719e1e updated unit tests 2020-01-09 08:42:58 +01:00
Joan Sanchez 5a7bd4e18f filters refactor 2020-01-08 12:27:18 +01:00
Joan Sanchez f2e9dbd597 added category name to item type autocompletes 2019-12-26 11:27:44 +01:00
Joan Sanchez ef95244d07 stowaway refactor 2019-12-17 08:38:36 +01:00
Javi Gallego c736e4de29 #1850 descomentar test back 2019-11-18 12:32:50 +01:00
Juan Ferrer 1c035ca045 All tests fixed 2019-11-12 14:18:46 +01:00
Juan Ferrer 95d943e515 E2E fixes 2019-11-11 16:32:03 +01:00
Juan Ferrer 515234187a First working version 2019-11-10 11:08:44 +01:00
Juan Ferrer 4fcaa2e507 Jest fixes 2019-10-31 15:38:20 +01:00
Juan Ferrer f759c1e11a vnDialog bug fixes & front tests, workerTimeControl date fixes 2019-10-31 15:24:28 +01:00
Juan Ferrer 38b4483edf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-31 13:43:15 +01:00
Javi Gallego 03a4da307d Tarea #1848 test back arreglados/comentados 2019-10-31 12:54:16 +01:00
Juan Ferrer c41fb1d0f4 #1847 vnDialog refactor 2019-10-30 16:57:14 +01:00
Juan Ferrer 1b2c383502 vnDialog opens in body, nightmare extensions with detailed errors 2019-10-28 17:31:33 +01:00
Juan Ferrer 47998aaa97 vnDialog opens in body 2019-10-27 01:30:01 +02:00
Juan Ferrer c7384bb3ac API path prefix, repeated code removed from tests 2019-10-25 00:53:53 +02:00
Juan Ferrer 72017a64ac Date timezone offset properly handled from backend DB connector 2019-10-19 01:18:25 +02:00
Juan Ferrer 17a150370c Style fixes 2019-10-18 21:54:13 +02:00
Juan Ferrer 457034daad Tests fixed 2019-10-18 21:36:30 +02:00
Juan Ferrer a2881e5b1a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-10-15 16:19:38 +02:00
Juan Ferrer 3bf44d08de vnDatePicker refactor 2019-10-15 16:19:35 +02:00
Joan Sanchez cd2b02b0c6 Bug/Test #1753 - Added dateTime filter 2019-10-14 08:52:48 +02:00
Juan Ferrer a72c12e1c9 Tests passed 2019-10-11 17:38:04 +02:00
Juan Ferrer a9d5e87078 vnField alpha with ngModel 2019-10-10 00:47:29 +02:00
Juan Ferrer fc09d76422 Merge 2019-10-08 23:57:54 +02:00
Juan Ferrer 757fc6fe23 vnField stable & applied to all field except vnTextfield 2019-10-08 23:57:02 +02:00
Carlos Jimenez Ruiz 7449f288b3 #1751 order.summary mostrar campo sourceapp 2019-10-07 10:35:34 +02:00
Juan Ferrer b12a666653 CSS padding/margin refactor, glob styles in core 2019-10-05 00:16:57 +02:00
Juan Ferrer c6e8498281 ModelProxy.status, Paging removed, locale fixes 2019-10-03 19:34:24 +02:00
Juan Ferrer ec9797a4b3 vnDataViewer applied to all module indexes 2019-10-02 21:02:49 +02:00
Juan Ferrer 4e4919c1e2 Agency fixes & exclusion with left calendar 2019-10-01 13:45:43 +02:00
Bernat 7384fabec0 Tarea #1724 order/index buscar por alias 2019-09-24 12:10:03 +02:00
Joan Sanchez e55b8b7b6b precio por kilo #1690 2019-09-23 14:41:54 +02:00
Juan Ferrer afb06dd4a5 #1167 Fixed 2019-09-19 12:32:34 +02:00
Carlos Jimenez Ruiz 4c33f07e42 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-18 09:42:45 +02:00
Carlos Jimenez Ruiz b12d0388c9 #1074 Undo changes button for forms 2019-09-18 09:41:25 +02:00
Bernat cbbce91def #1693 export structure, data and fix back test 2019-09-17 13:52:29 +02:00
Carlos Jimenez Ruiz 206dec59a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-09-13 16:09:27 +02:00
Carlos Jimenez Ruiz 2251fb65ad #1615 migrar karma a jest 2019-09-13 16:09:14 +02:00
Joan Sanchez e16d43b2fc Allow disable log on model properties 2019-09-12 09:49:02 +02:00
Joan Sanchez 9bf54f34dd Added fruit translation 2019-09-12 07:26:15 +02:00
Joan Sanchez 176750046a Scroll component #643 2019-09-05 13:06:40 +02:00
Carlos Jimenez Ruiz b9234fc1a8 #1642 order.summary en el descriptor 2019-08-29 13:16:38 +02:00
Bernat b749cb80df Bug/Test #1634 cesta.catalogo 2019-08-13 07:45:29 +02:00
Bernat f05f3a3df7 Bug/Test #1634 cesta.catalogo 2019-08-12 14:58:46 +02:00
Joan Sanchez a5486ec694 Get allowed content-types from model #1598 2019-08-08 08:37:03 +02:00
Bernat fa4fd15450 Tarea #1573 order.catalog No deben de mostrar familias vacias 2019-08-07 07:27:00 +02:00
Joan Sanchez 85049c126b catalogFilter show items without color 2019-07-19 09:25:59 +02:00
Carlos Jimenez Ruiz fc80848506 merge 2019-07-03 14:40:53 +02:00
Carlos Jimenez Ruiz ea5cbf634b #1392 order.catalog 2019-07-03 14:39:08 +02:00
Bernat 82a1d00b0c Tarea #1516 order.index buscador avanzado añadir mi equipo 2019-07-03 14:06:27 +02:00
Joan Sanchez bddfbc4b34 add new item from ticket.sale #1414, checkedLines fixed 2019-07-02 12:12:15 +02:00
Bernat e945967762 Refactor #1563 fixtures item,sale,saleComponent 2019-06-27 09:03:03 +02:00
Carlos Jimenez Ruiz 5270693bdd #1387 e2e Ticket Edit sale path 2019-06-26 15:27:58 +02:00
Carlos Jimenez Ruiz fcc0ad6098 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev 2019-06-14 12:27:54 +02:00
Carlos Jimenez Ruiz b8a4861f01 #1526 refactor fixtures 2019-06-14 12:27:41 +02:00
Juan Ferrer ced4578f75 Merge branch 'test' into dev 2019-06-14 08:33:44 +02:00
Juan Ferrer 91174d1c8e fdescribe removed, SQL refactor 2019-06-13 11:47:32 +02:00
Carlos Jimenez Ruiz 921af523f8 #1526 refactor fixtures 2019-06-12 11:38:31 +02:00
Joan Sanchez 4545d1f649 merge from test to dev - no structure 2019-06-07 13:06:54 +02:00