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

7094 Commits

Author SHA1 Message Date
William Buezas 28bfda869a refactor: refs #8162 remove comment 2024-11-18 10:47:57 -03:00
Javier Segarra 73072794ee test: refs #8162 #8162 fix TicketList spec 2024-11-18 14:41:27 +01:00
Javier Segarra 2f06eea8ea Merge branch 'dev' into 8162-E2ETickets 2024-11-18 12:03:10 +00:00
Jon Elias 3c5472ad4a Merge pull request 'Fix: changed route.query' (!959) from Fix-OrderCatalogCategoryFilter into dev 
Reviewed-on: verdnatura/salix-front#959
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-18 11:28:25 +00:00
Jon Elias 0c0b9ca648 fix: changed route.query 2024-11-18 12:27:07 +01:00
Alex Moreno dd490888cf merge test in dev 2024-11-18 11:23:36 +01:00
Alex Moreno 09be2d4d41 Merge pull request 'solveConflicts_test_to_dev' (!957) from solveConflicts_test_to_dev into dev 
Reviewed-on: verdnatura/salix-front#957
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-18 10:21:50 +00:00
Alex Moreno 1e7f2b3f4d Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-18 11:14:29 +01:00
Alex Moreno 009a6b09d6 Merge pull request 'feat(TicketSummary): add ticketDescritporMenu' (!956) from hotFix_ticketSummary_add_ticketDescriptorMenu into master 
Reviewed-on: verdnatura/salix-front#956
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-11-18 10:11:42 +00:00
Alex Moreno 5b4299114b Merge branch 'master' into hotFix_ticketSummary_add_ticketDescriptorMenu 2024-11-18 10:00:54 +00:00
Javier Segarra 5ab28c13d0 Merge pull request 'HOTFIX: CustomerSummary BalanceDue' (!955) from hotFix_customerSumamry_balanceDue into master 
Reviewed-on: verdnatura/salix-front#955
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-18 10:00:08 +00:00
Javier Segarra f52095a2fc Merge branch 'test' into solveConflicts_test_to_dev 2024-11-18 10:57:49 +01:00
Alex Moreno 383f51c1b2 refactor(TicketDescritporMenu): url isEditable 2024-11-18 10:57:26 +01:00
Javier Segarra 0c36d385ec Merge branch 'test' into solveConflicts_test_to_dev 2024-11-18 10:50:42 +01:00
Alex Moreno 09aad5914f feat(TicketSummary): add ticketDescritporMenu 2024-11-18 10:49:30 +01:00
Javier Segarra 9ea9239250 fix: customerSummary balanceDue label value 2024-11-18 10:41:25 +01:00
Alex Moreno 29239ef2cd Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-18 10:13:27 +01:00
Alex Moreno 03490b7f3a Merge pull request 'hotFix(TicketBasicData): getShipped, getLanded & bad try catch' (!953) from hotFix_ticketBasicData_getLanded_getShipped into master 
Reviewed-on: verdnatura/salix-front#953
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-11-18 09:13:14 +00:00
Alex Moreno b74c1d1823 Merge branch 'master' into hotFix_ticketBasicData_getLanded_getShipped 2024-11-18 09:12:28 +00:00
Alex Moreno 27a1d7460d Merge pull request 'hotFix_arrayData_store_data' (!929) from hotFix_arrayData_store_data into master 
Reviewed-on: verdnatura/salix-front#929
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
Reviewed-by: Carlos Satorres <carlossa@verdnatura.es>
 2024-11-18 09:12:21 +00:00
Alex Moreno 149f92bc93 Merge branch 'master' into hotFix_arrayData_store_data 2024-11-18 09:08:37 +00:00
Alex Moreno a50b22bb2a Merge branch 'master' into hotFix_ticketBasicData_getLanded_getShipped 2024-11-18 09:08:29 +00:00
Javier Segarra ff9d793378 Merge pull request 'HOTFIX: #7671 apply sort-by itemFk and name' (!949) from hotfix_itemFixedPrice_sortBy into master 
Reviewed-on: verdnatura/salix-front#949
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-18 09:08:05 +00:00
Alex Moreno 48513868b1 Merge branch 'master' into hotFix_arrayData_store_data 2024-11-18 09:04:21 +00:00
Alex Moreno e230cc61a0 fix(TicketBasicData): getShipped, getLanded & bad try catch 2024-11-18 09:18:06 +01:00
Jon Elias 80770b1165 Merge pull request '#8185 Fix LeftMenu to avoid duplicates' (!952) from 8185-DuplicateLeftMenu into dev 
Reviewed-on: verdnatura/salix-front#952
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-18 06:33:54 +00:00
Jon Elias 3d8aa3cff9 Merge branch 'dev' into 8185-DuplicateLeftMenu 2024-11-18 06:21:42 +00:00
Alex Moreno 34ccbccf20 Merge pull request 'Down changes from master to test' (!950) from master into test 
Reviewed-on: verdnatura/salix-front#950
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-18 06:15:13 +00:00
Jon Elias 2bc219a09b refactor: refs #8185 modified LeftMenu to avoid duplicates 2024-11-18 06:59:09 +01:00
William Buezas d8c1bd5b16 test: refs #8162 more tests 2024-11-17 15:24:46 -03:00
Javier Segarra 5e5d2f3c42 fix: #7671 apply sort-by itemFk and name 2024-11-17 13:44:44 +00:00
Jon Elias 6de5864dd6 Merge pull request 'Hotix: deleted duplicate VnUsesMana' (!940) from Hotfix-SalesMana into master 
Reviewed-on: verdnatura/salix-front#940
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-15 13:32:42 +00:00
Jon Elias 1dc2f54f61 Merge branch 'master' into Hotfix-SalesMana 2024-11-15 13:31:53 +00:00
Javier Segarra b8293d91e8 Merge pull request 'HOTFIX: #6943 hotFix_AddressObservation_crud' (!945) from hotFix_AddressObservation_crud into master 
Reviewed-on: verdnatura/salix-front#945
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-15 13:14:26 +00:00
Javier Segarra 2e2a118627 Merge branch 'master' into hotFix_AddressObservation_crud 2024-11-15 12:55:08 +00:00
Javier Segarra 94873f7771 Merge pull request 'fix: Redirect to catalog when create new order' (!947) from hotfix_OrderNew_redirectTo into master 
Reviewed-on: verdnatura/salix-front#947
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-11-15 12:52:17 +00:00
Javier Segarra 5916923521 fix: Redirect to catalog when create new order 2024-11-15 12:51:25 +00:00
Javier Segarra acaf7f2930 Merge pull request 'fix: Redirect to catalog when create new order' (!946) from hotfix_OrderNew_redirectTo_catalog into master 
Reviewed-on: verdnatura/salix-front#946
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-15 12:38:39 +00:00
Javier Segarra 54a34e8034 fix: Redirect to catalog when create new order 2024-11-15 12:33:56 +00:00
Javier Segarra 064dbfc432 fix: #6943 Update AddressObservations 2024-11-15 12:20:50 +00:00
Jon Elias f03e5dc412 Merge pull request 'Hotfix: fixed state column in TicketList and translation' (!944) from Hotfix-TicketList into master 
Reviewed-on: verdnatura/salix-front#944
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-15 11:11:14 +00:00
Carlos Satorres 3f486f6514 Merge pull request 'fix: refs #7310 clean warning' (!840) from 7310-warningTravelTermographs into dev 
Reviewed-on: verdnatura/salix-front#840
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-15 11:10:28 +00:00
Jon Elias 89661397fb Merge branch 'master' into Hotfix-TicketList 2024-11-15 11:09:20 +00:00
Carlos Satorres 95291d4d4e Merge branch 'dev' into 7310-warningTravelTermographs 2024-11-15 11:06:03 +00:00
Javier Segarra d0427c17be Merge pull request 'HOTFIX: #6943 CustomerDescriptor actions' (!943) from hotfix-customerDescriptor_actions into master 
Reviewed-on: verdnatura/salix-front#943
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-11-15 11:04:34 +00:00
Jon Elias 1fc2ae0689 Merge branch 'master' into Hotfix-TicketList 2024-11-15 10:53:53 +00:00
Jon Elias eb287696fa fix: fixed state column in ticket list 2024-11-15 11:49:46 +01:00
Javier Segarra e64ea2db19 feat: #6943 CustomerList salesPerson 2024-11-15 11:48:19 +01:00
Javier Segarra 4d8432feb5 revert: #6943 address star feature 2024-11-15 11:46:55 +01:00
Javier Segarra bdd36f6ba1 Merge branch 'master' into hotfix-customerDescriptor_actions 2024-11-15 11:44:41 +01:00