verdnatura/salix
verdnatura
/
salix
3
4
Fork 0
Code Issues Pull Requests 59 Releases Wiki Activity
11,144 Commits 272 Branches 0 Tags 113 MiB
Commit Graph

206 Commits

Author SHA1 Message Date
Joan Sanchez 355f95ae40 2473 - Added ticket restore option
gitea/salix/pipeline/head This commit looks good Details
2020-10-08 13:42:20 +02:00
Bernat Exposito Domenech 1bff4e3c4e fix test and refactor transferlines
gitea/salix/pipeline/head This commit looks good Details
2020-09-30 12:24:33 +02:00
Joan Sanchez 30a4bbfe1a Css changes
gitea/salix/pipeline/head This commit looks good Details
2020-08-26 12:41:38 +02:00
Carlos Jimenez Ruiz e974f638dd 2361 ticket sale multi check fix-ish +popover size
gitea/salix/pipeline/head This commit looks good Details
2020-07-30 16:05:48 +02:00
Carlos Jimenez Ruiz e2481366a2 removed on response if just accept
gitea/salix/pipeline/head This commit looks good Details
2020-07-29 10:47:48 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good Details
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
Joan Sanchez 23664dd3c5 Refresh total on sale changes
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 15:00:48 +02:00
Carlos Jimenez Ruiz c801d8a969 Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 14:45:53 +02:00
Carlos Jimenez Ruiz 354123dc86 e2e toolkit 2.0 + refactors 2020-07-01 14:45:48 +02:00
Joan Sanchez b40e09a6cb Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 14:28:05 +02:00
Joan Sanchez 78ee6f1aff Updated unit tests
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-01 12:53:56 +02:00
Joan Sanchez defe7e7a17 Added front unit tests 2020-07-01 11:57:01 +02:00
Carlos Jimenez Ruiz 1dfd0c26ef Merge branch '1368-ticket_sale_refactor' of https://gitea.verdnatura.es/verdnatura/salix into 1368-ticket_sale_refactor 2020-06-30 11:15:28 +02:00
Carlos Jimenez Ruiz b451b400bf e2e toolkit 2020-06-30 11:15:20 +02:00
Joan Sanchez a0f625d019 Changed methods order, minor fixes 2020-06-30 10:01:30 +02:00
Joan Sanchez c9d94ca814 Reset watcher changes if there's no new data to save
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-30 09:37:09 +02:00
Joan Sanchez 2c23f3417a Sale selection fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 11:43:53 +02:00
Joan Sanchez 789769ad7d Destroy edit prop fix
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 09:38:42 +02:00
Joan Sanchez a8377950f5 Fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 16:39:20 +02:00
Joan Sanchez d4c78b46c1 1368 - First sale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-23 13:40:49 +02:00
Joan Sanchez 4ad3334de6 Allow change to discount 0%
gitea/salix/pipeline/head This commit looks good Details
2020-06-22 11:49:44 +02:00
Joan Sanchez 43a48994e0 Image path fix
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 16:33:58 +02:00
Bernat Exposito Domenech 60d50afb2e fix traduction
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 12:20:06 +02:00
Bernat Exposito Domenech e7fc70a4b4 add column in ticket split
gitea/salix/pipeline/head This commit looks good Details
2020-05-26 10:43:53 +02:00
Carlos Jimenez Ruiz d02655d4d3 Merge pull request '2273 - Fixed transfer sales' (#273) from 2273-transfer_sales_fix into dev
gitea/salix/pipeline/head This commit looks good Details 
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
 2020-05-25 12:58:08 +00:00
Joan Sanchez 73a6148a77 2273 - Fixed transfer sales
gitea/salix/pipeline/head This commit looks good Details
2020-05-25 14:45:26 +02:00
Joan Sanchez d60f8721f1 1490 - Don't update with empty value
gitea/salix/pipeline/head This commit looks good Details
2020-05-25 13:49:24 +02:00
Juan Ferrer 7a1bb7e68d Merge branch 'dev' into 1882-descriptorRefactor 2020-05-08 14:01:49 +02:00
Javi Gallego 8453d25852 #2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 18:42:50 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
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
Juan Ferrer bf68d15264 E2E expeditions fixes, scss px/em fixes 2020-04-02 11:39:39 +02:00
Joan Sanchez f25c8bb644 Ticket refactor
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 08:35:59 +01:00
Joan Sanchez 2d755c9094 Updated unit test
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 08:47:41 +01:00
Joan Sanchez f8c69306f4 Updated unit test 2020-03-13 08:44:01 +01:00
Joan Sanchez d51356f11b Add line on change item
gitea/salix/pipeline/head This commit looks good Details
2020-03-13 08:20:30 +01:00
Joan Sanchez b9a482fc37 2181 - Ticket sale fix item search
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 15:56:02 +01:00
Joan Sanchez 1c8541376b Fixed removed letter
gitea/salix/pipeline/head This commit looks good Details
2020-03-11 12:54:28 +01:00
Joan Sanchez 8fe6c651e3 Updated translations
gitea/salix/pipeline/head There was a failure building this commit Details
2020-03-11 12:02:12 +01:00
Bernat Exposito Domenech bd46f6a302 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2092-ticket_isEditable_refactor 2020-03-02 09:28:43 +01:00
Bernat Exposito Domenech 4561b6eeef refactor ticket.isEditable
gitea/salix/2092-ticket_isEditable_refactor This commit looks good Details
2020-02-27 12:31:38 +01:00
Carlos Jimenez Ruiz 6c668131a4 replaced returnValur for returnThis
gitea/salix/2131_jest_spyOn This commit looks good Details
2020-02-27 07:19:42 +01:00
Carlos Jimenez Ruiz 794b20fc83 #2131 jest.spyOn 2020-02-26 13:22:52 +01:00
Joan Sanchez bf4e0d09c5 Get phone from address and client
gitea/salix/2130-ticket_sms This commit looks good Details
2020-02-21 08:37:37 +01:00
Joan Sanchez 91210c3a0d 1684 - Log old quantity value
gitea/salix/1684-ticket_transfer_salesLog This commit looks good Details
2020-02-11 08:19:03 +01:00
Joan Sanchez e1942875af 1684 - Log transfer old values
gitea/salix/1684-ticket_transfer_salesLog Something is wrong with the build of this commit Details
2020-02-10 14:32:52 +01:00
Bernat Exposito Domenech bafec3ce90 fix ticket.sale sms
gitea/salix/2091-ticket_sms This commit looks good Details
2020-02-10 09:36:40 +01:00
Joan Sanchez b27d514918 percentage hotfix
gitea/salix/2049-hotfix_percentage This commit looks good Details
2020-01-29 11:09:42 +01:00
Joan Sanchez 5cf8328476 added more rows to sms textarea
gitea/salix/1975-delivery_note_tags There was a failure building this commit Details
2020-01-09 13:58:50 +01:00
Joan Sanchez f42f46dc42 Merge branch '1913-stowaway_unboarding' of verdnatura/salix into master
gitea/salix/master This commit looks good Details
2019-12-17 12:53:06 +00:00
Juan Ferrer 4da83ef963 Hotfixes: vnTicketSale menu, vnItemDiary width 2019-12-17 12:23:31 +01:00
Joan Sanchez ef95244d07 stowaway refactor
gitea/salix/1913-stowaway_unboarding This commit looks good Details
2019-12-17 08:38:36 +01:00
Joan Sanchez fd72f206bc Recalculate ticket components #1770
gitea/salix/1770-calculate_components This commit looks good Details
2019-11-21 12:00:56 +01:00
Juan Ferrer 09a187ecfe Merge 2019-11-14 15:05:49 +01:00
Joan Sanchez c028233012 ticket.sale recalculate sale price #1768
gitea/salix/dev This commit looks good Details
2019-11-14 14:19:39 +01:00
Juan Ferrer f6050a6c65 Merge 2019-11-12 09:24:01 +01:00
Bernat 74a2c58954 Bug #1862 fix e2e and front test
gitea/salix/dev This commit looks good Details
2019-11-12 08:51:50 +01:00
Juan Ferrer 515234187a First working version
gitea/salix/1838-searchbar_refactor There was a failure building this commit Details
2019-11-10 11:08:44 +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
Joan Sanchez 58a763acf5 added quicklinks to worker descriptor
gitea/salix/dev There was a failure building this commit Details
2019-10-21 14:21:52 +02:00
Juan Ferrer 72017a64ac Date timezone offset properly handled from backend DB connector
gitea/salix/dev This commit has test failures Details
2019-10-19 01:18:25 +02:00
Juan Ferrer 457034daad Tests fixed 2019-10-18 21:36:30 +02:00
Joan Sanchez ecda659a8c Bug #1796 fixed edit discount dialog position
gitea/salix/dev This commit looks good Details
2019-10-14 14:17:18 +02:00
Joan Sanchez 81097287fa #1755 create claim only for non removed tickets
gitea/salix/dev This commit looks good Details
2019-10-14 11:44:54 +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 757fc6fe23 vnField stable & applied to all field except vnTextfield 2019-10-08 23:57:02 +02:00
Juan Ferrer b12a666653 CSS padding/margin refactor, glob styles in core 2019-10-05 00:16:57 +02:00
Juan Ferrer 2bcdcaa133 #1285 fixed, vnInputTime fixes 2019-09-30 11:30:54 +02:00
Joan Sanchez d0fc74cefd updated e2e and unit tests 2019-09-24 14:03:30 +02:00
Joan Sanchez 3af26900e3 watcher preventing claim creation
gitea/salix/dev This commit looks good Details
2019-09-24 11:55:36 +02:00
Joan Sanchez 5851784e41 Create new order now opens on new window
gitea/salix/dev This commit looks good Details
2019-09-24 11:41:00 +02:00
Juan Ferrer 52a6221b59 recover getLeaves 2019-09-24 10:38:05 +02:00
Carlos Jimenez Ruiz 206dec59a3 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/dev There was a failure building this commit Details
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 73f438c300 reset watcher on changes #1678 2019-09-09 12:35:59 +02:00
Joan Sanchez 1f5a75b285 fixed karma unit tests
gitea/salix/dev This commit looks good Details
2019-09-09 10:57:10 +02:00
Carlos Jimenez Ruiz 3c9fe334c9 #1655 e2e ticket.sale Añadir lineas
gitea/salix/dev This commit looks good Details
2019-09-06 14:56:56 +02:00
Carlos Jimenez Ruiz 56c291a160 merge
gitea/salix/dev There was a failure building this commit Details
2019-09-06 11:45:55 +02:00
Carlos Jimenez Ruiz ce9fb14b62 #1655 e2e ticket.sale Añadir lineas 2019-09-06 11:43:15 +02:00
Joan Sanchez 59c6952025 Implement watcher on ticket sales #1678
gitea/salix/dev This commit looks good Details
2019-09-05 09:00:55 +02:00
Joan Sanchez 0d21519523 updated transfer css
gitea/salix/dev This commit looks good Details
2019-09-04 14:37:29 +02:00
Joan Sanchez db1113ab0b added scrollbar to transfer popover
gitea/salix/dev This commit looks good Details
2019-09-04 14:08:08 +02:00
Carlos Jimenez Ruiz c1cca30a26 bug fix icon add ticket.sales enables/disables
gitea/salix/dev This commit looks good Details
2019-09-03 14:42:52 +02:00
Joan Sanchez 37b9c5c4ce Added zone inflation field #1641
gitea/salix/dev This commit looks good Details
2019-09-02 11:25:31 +02:00
Bernat 4032bde243 fix bug ticket.sale
gitea/salix/dev This commit looks good Details
2019-08-13 14:03:02 +02:00
Joan Sanchez 0918f154e9 transfer partially sale #1251
gitea/salix/dev This commit looks good Details
2019-08-09 08:04:44 +02:00
Bernat 2f1472b9ee Tarea #1574
gitea/salix/dev This commit looks good Details 
ticket.sale editableState
 2019-08-08 08:33:27 +02:00
Bernat 7571cd6e1b Bug/Test #1607 ticket.updateDiscount and fix test
gitea/salix/dev This commit has test failures Details
2019-07-31 07:46:24 +02:00