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

7304 Commits

Author SHA1 Message Date
Guillermo Bonet c3eaab44ed Merge branch '7893-wasteRecalc' of https://gitea.verdnatura.es/verdnatura/salix-front into 7893-wasteRecalc 2024-10-07 11:31:18 +02:00
Guillermo Bonet 178fa8cd21 feat: refs #7893 Requested changes 2024-10-07 11:31:16 +02:00
Alex Moreno b1385cf08a Merge pull request 'refactor(ticketNotes): translations' (!807) from fix_ticketNotes_translations into dev 
Reviewed-on: verdnatura/salix-front#807
Reviewed-by: Jon Elias <jon@verdnatura.es>
 2024-10-07 08:09:12 +00:00
Guillermo Bonet f98739f0ed Merge branch 'dev' into 7893-wasteRecalc 2024-10-07 08:03:26 +00:00
Guillermo Bonet 4f3e7e2630 feat: refs #7893 Added waste recalc section 2024-10-07 10:03:05 +02:00
Carlos Satorres f22809d609 Merge pull request 'refs #6898 hotfix agency' (!808) from 6898-hotfixSupplierAgency into master 
Reviewed-on: verdnatura/salix-front#808
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-07 07:54:07 +00:00
Carlos Satorres 27e6dd5bf1 Merge branch 'master' into 6898-hotfixSupplierAgency 2024-10-07 07:51:02 +00:00
Carlos Satorres 5d65d3e20c refs #6898 hotfix agency 2024-10-07 09:48:57 +02:00
Jorge Penadés 5c5a359986 refactor: refs #8019 create VnTime 2024-10-07 09:38:39 +02:00
Jorge Penadés 947f913679 refactor: refs #8019 create VnDate 2024-10-07 09:25:06 +02:00
Alex Moreno 5af6c89c1a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into hotFix_VnPaginate_offset 2024-10-07 09:17:19 +02:00
Alex Moreno ef5ae0f723 refactor(ticketNotes): translations 2024-10-07 09:16:07 +02:00
Jon Elias 33d6d529c5 Merge branch 'dev' into Fix-TicketsModule 2024-10-07 07:11:52 +00:00
Jon Elias bd3de77cbd fix: changes in list and filter to fix section 2024-10-07 09:10:20 +02:00
Alex Moreno b8407140f9 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-07 09:02:01 +02:00
Alex Moreno 426b7254d6 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-10-07 09:01:57 +02:00
Jorge Penadés 120f96fedc Merge pull request '#7323 workerList' (!719) from 7323-fineTunningWorker into dev 
Reviewed-on: verdnatura/salix-front#719
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-07 06:41:35 +00:00
Jorge Penadés 355c84ad06 Merge branch 'dev' into 7323-fineTunningWorker 2024-10-07 06:39:07 +00:00
Alex Moreno 9df5857b21 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-10-07 08:35:13 +02:00
Alex Moreno 34a40dd87c fix(VnPaginate): use default value 2024-10-07 08:24:53 +02:00
Javier Segarra c9467b5286 Merge pull request 'Hotfix: zones and order filters, ticket transfer' (!799) from Hotfix-ZoneOrderFilters into master 
Reviewed-on: verdnatura/salix-front#799
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-05 09:02:46 +00:00
Javier Segarra 04b2a4d9ce perf: clean warnings 2024-10-05 00:31:41 +02:00
Javier Segarra c3c2528342 feat: #7356 improve NotesSummary 2024-10-05 00:31:32 +02:00
Javier Segarra a69a4577a3 Merge pull request 'Fix:: order module' (!802) from Fix-OrderCatalog into dev 
Reviewed-on: verdnatura/salix-front#802
Reviewed-by: Javier Segarra <jsegarra@verdnatura.es>
 2024-10-04 17:48:47 +00:00
Pako Natek 355b1357b7 Merge branch 'dev' into Fix-OrderCatalog 2024-10-04 16:08:12 +00:00
Jorge Penadés 9383a71adb Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7207-showPbx 2024-10-04 16:38:27 +02:00
Jorge Penadés 055b1b0a88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-04 16:12:31 +02:00
Jon Elias aee23c75e8 fix: order module 2024-10-04 14:31:39 +02:00
Jon Elias e4e60abe0e Merge branch 'master' into Hotfix-ZoneOrderFilters 2024-10-04 12:25:49 +00:00
Jon Elias 3a21f6aadb fix: order catalog 2024-10-04 14:22:00 +02:00
Pablo Natek d325459beb Merge pull request '4988-fixE2e' (!801) from 4988-fixE2e into dev 
Reviewed-on: verdnatura/salix-front#801
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-04 12:18:52 +00:00
Jorge Penadés 9c5ce6dbfd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7874-addObservationType 2024-10-04 13:50:31 +02:00
Jorge Penadés 905841e0d6 Merge branch 'dev' into 7207-showPbx 2024-10-04 11:45:28 +00:00
Jorge Penadés 9fe3de22ac Merge branch '7323-fineTunningWorker' of https://gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-10-04 13:37:57 +02:00
Jorge Penadés b735ccb3a0 Merge branch 'dev' of https: refs #7323//gitea.verdnatura.es/verdnatura/salix-front into 7323-fineTunningWorker 2024-10-04 13:37:55 +02:00
Pablo Natek efe5208d30 Merge branch 'dev' into 4988-fixE2e 2024-10-04 11:32:40 +00:00
Jorge Penadés 9f433afb51 Merge pull request '#7702 - FIX Change password error' (!542) from 7702_fix_setPassword into dev 
Reviewed-on: verdnatura/salix-front#542
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-04 11:15:42 +00:00
Pablo Natek 1869e3315a fix: refs #4988 remove id 2024-10-04 13:14:14 +02:00
Pablo Natek 7dc019cfbb fix: refs #4988 selector on e2e 2024-10-04 13:13:57 +02:00
Jorge Penadés a311cf00d2 Merge branch 'master' into 7353-hotfix-fixScopeDays 2024-10-04 11:12:19 +00:00
Jon Elias 195747b5a0 feat: added click and transfer tickets and deleted useless code 2024-10-04 12:34:37 +02:00
Carlos Satorres 45c8f6f4c5 Merge pull request 'refs #7355 fix searchbar' (!797) from hotfix-AccountSearchbar into master 
Reviewed-on: verdnatura/salix-front#797
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-04 10:09:53 +00:00
Jorge Penadés ae8e4ba4b9 chore: refs #7702 fix tests 2024-10-04 11:54:40 +02:00
Jorge Penadés 67c2e284ba feat: refs #7702 ask old pass 2024-10-04 11:45:10 +02:00
Carlos Satorres 0d31adaa4b refs #7767 check holiday 2024-10-04 11:29:21 +02:00
Jorge Penadés e43ba9b58a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7702_fix_setPassword 2024-10-04 10:11:38 +02:00
Jon Elias 7874db1647 fix: zone delivery postcodes filter and order catalog type filter 2024-10-04 09:58:23 +02:00
Jorge Penadés cebb3b2b16 Merge branch 'dev' into 7323-fineTunningWorker 2024-10-04 07:47:46 +00:00
Pablo Natek 222e83cad8 Merge pull request 'feat: refs #7404 change travel name and remove buyer filter' (!796) from 7404-addSomeLogisticPreferences into dev 
Reviewed-on: verdnatura/salix-front#796
Reviewed-by: Alex Moreno <alexm@verdnatura.es>
 2024-10-04 06:59:12 +00:00
Jon Elias 4b9588c189 refactor: refs #7825 modified worker list form to fill the field when a bank entity is created 2024-10-04 08:55:48 +02:00