wbuezas
/
salix-front-mindshore-fork2
forked from verdnatura/salix-front
0
0
Fork 0
Code Pull Requests Activity
9,117 Commits 155 Branches 0 Tags 30 MiB
Commit Graph

9117 Commits

Author SHA1 Message Date
Javier Segarra 805e56b9d3 feat: refs #6321 changes 2025-01-27 12:04:14 +01:00
Javier Segarra 36a67e4c73 perf: refs #6321 clean pr 2025-01-26 03:06:57 +01:00
Javier Segarra 100a380f95 test: refs #6321 itemProposal 2025-01-26 02:36:10 +01:00
Javier Segarra dea3535ad4 feat: refs #6321 itemProposal tags 2025-01-26 02:35:59 +01:00
Javier Segarra 0a4da26d3d feat: refs #6321 remove checkbox isFree 2025-01-26 02:35:13 +01:00
Javier Segarra fa83c2d49c test: refs #6321 improve 2025-01-26 00:37:30 +01:00
Javier Segarra c88be1c6a8 perf: refs #6321 clean code vntable detail 2025-01-26 00:35:27 +01:00
Javier Segarra ebca833d73 test: refs #6321 intercept 2025-01-25 20:24:10 +01:00
Javier Segarra db777bec72 feat: refs #6321 replace ItemProposal by dialog 2025-01-25 14:23:52 +01:00
Javier Segarra 3d18d2d652 feat: refs #6321 merge icon column 2025-01-25 14:23:38 +01:00
Javier Segarra d9237c4a38 feat: refs #6321 lactTable icons 2025-01-25 13:47:31 +01:00
Javier Segarra 85a0e328e3 feat: refs #6321 lackDetail actions 2025-01-25 13:27:29 +01:00
Javier Segarra 21ea6a278d feat: refs #6321 clean ticket lack list 2025-01-25 09:41:19 +01:00
Javier Segarra 266c3d26ad Merge branch 'dev' into 6321_negative_tickets 2025-01-25 09:23:16 +01:00
Jose Antonio Tubau 22ed652b9e Merge pull request 'feat: refs #7322 add address selection for ticket transfer' (!1224) from 7322-addSelectAddressOnTicketTransfer into dev 
Reviewed-on: verdnatura/salix-front#1224
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2025-01-24 14:48:05 +00:00
Jose Antonio Tubau 023a3b541a Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer 2025-01-24 14:47:15 +00:00
Robert Ferrús c465286718 Merge pull request 'feat: refs #8077 sumDefaulter' (!1239) from 8077-sumDefaulterFrontFix into dev 
Reviewed-on: verdnatura/salix-front#1239
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-24 10:55:37 +00:00
Robert Ferrús fb18d5eace Merge branch 'dev' into 8077-sumDefaulterFrontFix 2025-01-24 10:47:56 +00:00
Alex Moreno 3ef82599ce Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-24 11:47:24 +01:00
Alex Moreno f7b1d7bd37 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2025-01-24 11:47:13 +01:00
Robert Ferrús 9269d17e85 Merge branch 'dev' into 8077-sumDefaulterFrontFix 2025-01-24 10:46:14 +00:00
Alex Moreno 658747d479 fix: empty store.order 2025-01-24 11:45:03 +01:00
Alex Moreno 16ca18c945 Merge pull request 'fix: refs #8347 remove skip, fix unpaid' (!1273) from 8347-fixCustomerUnpaidTest into dev 
Reviewed-on: verdnatura/salix-front#1273
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-24 10:28:57 +00:00
Alex Moreno 4476df4608 Merge branch 'dev' into 8347-fixCustomerUnpaidTest 2025-01-24 10:28:04 +00:00
Alex Moreno a8a74cdb48 Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1146) from 8316-invoiceOutCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1146
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-24 09:35:18 +00:00
Alex Moreno 28905063b2 fix: refs #8316 filter 2025-01-24 10:34:01 +01:00
Alex Moreno 661f7bacd6 Merge branch 'dev' of https: refs #8316//gitea.verdnatura.es/verdnatura/salix-front into 8316-invoiceOutCardWithVnCardBeta 2025-01-24 10:28:20 +01:00
Alex Moreno cfcbb8bce5 Merge pull request 'refactor: #8322 changed Travel component to use VnSection/VnCardBeta' (!1220) from 8322-travel into dev 
Reviewed-on: verdnatura/salix-front#1220
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-24 09:14:18 +00:00
Alex Moreno 1dc19a6eaa fix: refs #8322 filter and params 2025-01-24 10:11:30 +01:00
Alex Moreno 6ff1ae96d5 Merge branch 'dev' into 8322-travel 2025-01-24 09:04:53 +00:00
Alex Moreno cbf7ef7ccf Merge pull request 'refactor: refs #8316 used VnSection and VnCardBeta' (!1150) from 8316-parkingCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1150
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-24 09:04:05 +00:00
Alex Moreno c6f613c5e5 fix: refs #8316 redirections 2025-01-24 10:02:23 +01:00
Alex Moreno 221dda174a Merge branch 'dev' into 8316-parkingCardWithVnCardBeta 2025-01-24 08:08:25 +00:00
Alex Moreno 10448b9d77 Merge pull request 'refactor: refs #8316 used VnSection and VnBetaCard' (!1147) from 8316-itemCardWithVnCardBeta into dev 
Reviewed-on: verdnatura/salix-front#1147
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2025-01-24 08:06:47 +00:00
Alex Moreno 6e588278d8 Merge branch 'dev' into 8316-itemCardWithVnCardBeta 2025-01-24 08:05:49 +00:00
Alex Moreno 1455d8ce02 fix: refs #8316 filter 2025-01-24 09:04:01 +01:00
Alex Moreno e38e9b1dd7 fix: refs #8316 filter 2025-01-24 09:01:54 +01:00
Alex Moreno 8e3fad60c0 fix: refs #8316 icon 2025-01-24 08:59:47 +01:00
Jon Elias 26bc5401f1 Merge pull request '#8339 - fix_preview' (!1277) from 8339_fix_preview into dev 
Reviewed-on: verdnatura/salix-front#1277
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2025-01-24 07:55:19 +00:00
Javier Segarra a3acb3b190 Merge branch 'dev' into 8339_fix_preview 2025-01-24 07:51:20 +00:00
Alex Moreno 55d86d3153 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2025-01-24 08:40:50 +01:00
Alex Moreno e6279ff261 build: merge master in test 2025-01-24 08:38:24 +01:00
Alex Moreno d0176303da Merge pull request 'fix: order when is string' (!1279) from hotFix_fixOrderStringArray into master 
Reviewed-on: verdnatura/salix-front#1279
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2025-01-24 07:32:58 +00:00
Javier Segarra 2c6d3de784 Merge branch 'master' into hotFix_fixOrderStringArray 2025-01-24 07:25:46 +00:00
Javier Segarra c61e4d30f6 Merge pull request 'Replace GoToUser by NewOrder from CustomerDescriptor' (!1276) from hotfix_customerDescriptor_orderBtn into master 
Reviewed-on: verdnatura/salix-front#1276
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2025-01-24 07:24:59 +00:00
Alex Moreno 5b448e5bb3 fix: order when is string 2025-01-24 08:24:12 +01:00
Jose Antonio Tubau 878845627a Merge branch 'dev' into 7322-addSelectAddressOnTicketTransfer 2025-01-24 07:20:31 +00:00
Javier Segarra f0dc7b4a41 fix: import component 2025-01-24 08:19:53 +01:00
Javier Segarra bddfd91de1 perf: refs #8339 minor changes 2025-01-24 08:09:48 +01:00
Javier Segarra d9cc35280b feat: refs #8339 define global.spreview 2025-01-24 08:09:31 +01:00