Commit Graph

13272 Commits

Author SHA1 Message Date
Alex Moreno 4789005a2f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue
gitea/salix/pipeline/head Build queued... Details
2022-10-17 12:12:34 +02:00
Alex Moreno aef47d46b1 env test
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 12:12:10 +02:00
Pau 70c9c3d788 initial back test created, modified DB statetments
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 12:07:34 +02:00
Vicent Llopis 2d1b48280c fix: backTest 2022-10-17 11:53:29 +02:00
Alex Moreno 57b2ae770d fix(e2e)
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 11:44:29 +02:00
Vicent Llopis dd10b79441 delete: throw error 2022-10-17 11:43:26 +02:00
Vicent Llopis e5fd6adfe5 fix: delete throw error 2022-10-17 11:43:01 +02:00
Vicent Llopis 33092acee7 refactor: delete unnecessary code 2022-10-17 11:42:05 +02:00
Alex Moreno 79b970286c refactor(claim_claimPickupEmail): use text template and external form
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 11:22:27 +02:00
Pau cf50c4690a Merge branch 'dev' into 4153-supplier.fiscal-data
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:41:39 +00:00
Vicent Llopis 6924b05c8a feat: add radio button
gitea/salix/pipeline/head Build queued... Details
2022-10-17 10:19:07 +02:00
Pau c212dfed88 removed package-lock
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 10:18:43 +02:00
Pau a4243e14c5 Created Back test for newSupplier 2022-10-17 10:17:56 +02:00
Joan Sanchez cfdcf91be2 Merge branch 'dev' into 3505-closure_refund
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 08:15:16 +00:00
Vicent Llopis 15ba6681af refator: code unified
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 09:49:47 +02:00
Pau dc53aac163 Merge branch 'dev' into 2612-create-supplier
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:32:50 +00:00
Pau f0b1591b14 Remove debugging elements
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 09:22:50 +02:00
Pau 0cdee89ac3 Button removed when user does not have permissions
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 09:20:45 +02:00
Pau 42583a4a16 Merge pull request 'Added webp to the list of allowed images' (!1080) from 4124-webp-images into dev
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1080
Reviewed-by: Juan Ferrer <juan@verdnatura.es>
2022-10-17 06:59:32 +00:00
Pau d91814473e Merge branch 'dev' into 4124-webp-images
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 06:45:49 +00:00
Vicent Llopis 787d10aac6 fix: select one result only
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:29:09 +02:00
Vicent Llopis cdce628038 refactor: delete line break
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:11:50 +02:00
Vicent Llopis 06ecceb478 refactor: lines to long
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 08:02:19 +02:00
Vicent Llopis a11ef73dfb refactor: code repetead 2022-10-17 08:01:55 +02:00
Pau 1603619d81 removed debugging elements
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:38:54 +02:00
Pau 594cee12f3 add checks to the existence of object variables
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:35:02 +02:00
Alex Moreno 991893837c correct fixutures from dev
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:34:22 +02:00
Alex Moreno 2b060a1437 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4146-claim_pickup_order
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-17 07:32:32 +02:00
Pau dc6c8f924d feat: Create new Supplier
gitea/salix/pipeline/head This commit looks good Details
2022-10-17 07:25:25 +02:00
Alex Moreno 37d645c6de Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3569-refactor_isEditable-canEdit 2022-10-17 07:23:31 +02:00
Vicent Llopis a036578832 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4616-ticket.sale_mana
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:43:08 +02:00
Vicent Llopis 40075e7e21 fix: testFront
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:38:47 +02:00
Vicent Llopis 86b7e9cabe fix: only can exists 'mana' or 'manaClaim' discount. Never both
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 14:30:37 +02:00
Vicent Llopis 2455a11c26 feat: changeMultipleDiscount uses the same popover than changeDiscount 2022-10-14 14:29:21 +02:00
Alex Moreno 84d17f4d55 Merge branch 'dev' into 4159-tableQ_filter
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 11:28:39 +00:00
Alex Moreno c637f2c879 feat(send): use vn-print libary and adapt test
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 13:22:53 +02:00
Alex Moreno de44ce6bd4 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-14 12:44:42 +02:00
Joan Sanchez 9a0d98bbe4 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 09:55:22 +02:00
Vicent Llopis 5918b3e0df refactor: juan changes
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-14 09:30:09 +02:00
Alex Moreno c3d6eac4f8 Merge branch '4320-notificationQueue' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-14 08:05:48 +02:00
Alex Moreno c2d37dadf7 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4320-notificationQueue 2022-10-14 08:01:06 +02:00
Alex Moreno a1b6256c9b Merge branch '4159-tableQ_filter' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 07:40:12 +02:00
Alex Moreno 248572feb4 use variable 2022-10-14 07:40:11 +02:00
Alex Moreno cfc626494f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 4159-tableQ_filter 2022-10-14 07:39:23 +02:00
Joan Sanchez 390ee60e59 Get first element in array
gitea/salix/pipeline/head This commit looks good Details
2022-10-14 07:26:34 +02:00
Vicent Llopis 50ec41dece refator: cancel request
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 15:01:15 +02:00
Joan Sanchez 67097970ed Incoterms required param
gitea/salix/pipeline/head This commit looks good Details
2022-10-13 10:44:20 +02:00
Joan Sanchez b96af0ad4d Merge pull request 'MASTER-hotFix(monitor): use left join in ticketState' (#1085) from hotFix-monitor_leftJoin into master
gitea/salix/pipeline/head This commit looks good Details
Reviewed-on: #1085
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-10-13 07:37:49 +00:00
Joan Sanchez e81c39d8dc Send delivery note to refund tickets
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:30:31 +02:00
Alex Moreno 74383b61e7 hotFix(monitor): use left join in ticketState
gitea/salix/pipeline/head There was a failure building this commit Details
2022-10-13 09:22:53 +02:00