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

4689 Commits

Author SHA1 Message Date
Robert Ferrús d360200e98 fix: refs #8263 itemTags order 2024-12-02 12:43:18 +01:00
Jorge Penadés b00a3d7acf Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into performance_mixins 2024-12-02 11:55:54 +01:00
Jorge Penadés f6ebc3f10d Merge branch 'master' into 6818-hotfix-refactorParsePhone 2024-12-02 10:20:17 +00:00
Carlos Satorres 392cc66030 Merge branch 'dev' into 7304-warningCustomerBasicData 2024-12-02 09:34:31 +00:00
Carlos Satorres fd0c8fc694 Merge branch 'master' into hotfix-7366TravelSearch 2024-12-02 09:32:00 +00:00
Jorge Penadés 68b11295bb Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-hotfix-refactorParsePhone 2024-12-02 09:51:03 +01:00
Javier Segarra 6622135271 perf: #6896 change path import 2024-11-30 01:38:12 +01:00
Javier Segarra 0f0d906e08 fix: #6896 OrderCatalogItem actions 2024-11-30 01:35:25 +01:00
Javier Segarra 0e1552f962 fix: scrollInto Item 2024-11-30 01:33:18 +01:00
Javier Segarra 1b975193f0 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_itemFixedPrice 2024-11-29 23:23:52 +01:00
Javier Segarra 0c7be99ecb fix: input sage required 2024-11-29 22:46:15 +01:00
Javier Segarra 2e1a5ecdd9 fix: #6943 CustomerAddressCreate 2024-11-29 13:29:15 +01:00
Javier Segarra f834178f7b Merge branch 'master' into hotfix-6943CustomerWebAccess 2024-11-29 13:27:45 +01:00
Javier Segarra 51460c1138 fix: #6943 use v-model 2024-11-29 13:27:36 +01:00
Javier Segarra 940fe5c2b9 fix: #6943 CustomerAddressCreate 2024-11-29 13:21:19 +01:00
Alex Moreno 4480b58551 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-29 12:23:26 +01:00
Carlos Satorres 514d54b222 fix: hotfix-accountWeb 2024-11-29 12:20:53 +01:00
Alex Moreno 89a13e8886 Merge branch 'master' into hotFix_supplier_autoBic 2024-11-29 09:27:23 +00:00
Carlos Andrés 658551e085 Merge pull request 'fix: translations travel' (!1021) from Hotfix--translationsTravel into master 
Reviewed-on: verdnatura/salix-front#1021
Reviewed-by: Javi Gallego <jgallego@verdnatura.es>
 2024-11-29 09:13:29 +00:00
Carlos Satorres 67d6d4ef45 fix: hotfix webAccess 2024-11-29 10:05:09 +01:00
Guillermo Bonet bf8b9e4283 Merge branch 'test' into dev 2024-11-29 09:48:43 +01:00
Guillermo Bonet 8428c7a205 fix: refs #7920 Changed shelving option value 2024-11-29 09:48:09 +01:00
Alex Moreno d364e30cf0 feat(SupplierAccount): add autoBic when change bankEntity 2024-11-29 09:38:58 +01:00
Javier Segarra af92b06eca Merge branch 'master' into hotfix_itemFixedPrice 2024-11-29 09:24:25 +01:00
Javier Segarra 870f07d335 Merge branch 'master' into hotfix_itemFixedPrice 2024-11-29 08:20:24 +00:00
Robert Ferrús bedf7d8a3a Merge branch 'master' into 245362-hotFixItemTags 2024-11-29 07:39:40 +00:00
Javier Segarra ed41bb6ecb Merge branch 'master' into hotfix_itemFixedPrice 2024-11-29 07:51:54 +01:00
Alex Moreno 50796df06a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-29 07:28:06 +01:00
Alex Moreno 36de1ad400 fix(MailForwarding): add try catch 2024-11-29 07:27:14 +01:00
Robert Ferrús 650acccbee Merge branch 'master' into 245362-hotFixItemTags 2024-11-29 04:53:09 +00:00
Carlos Andrés 67c257ce0e fix: translations travel 2024-11-28 19:24:13 +01:00
Carlos Satorres bc535ff0a1 Merge branch 'master' into hotfix-7366TravelSearch 2024-11-28 13:07:55 +00:00
Javier Segarra 280a70a145 fix: remove message when setWeigth ticket 2024-11-28 14:05:04 +01:00
Jon Elias 4193710123 Merge branch 'master' into Hotfix-ZoneEventsExclusion 2024-11-28 12:43:41 +00:00
Jon Elias 6263481a3e refactor: exclusionCreate function and translations 2024-11-28 13:42:22 +01:00
Javier Segarra 07274002cf Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-28 12:33:07 +00:00
Jon Elias 61d0d71538 fix: fixed functionality like Salix 2024-11-28 12:26:33 +01:00
Robert Ferrús 547455d976 Merge branch 'master' into 245362-hotFixItemTags 2024-11-28 10:38:00 +00:00
Robert Ferrús 97c12bced3 feat: refs #245362 change request 2024-11-28 11:36:59 +01:00
Carlos Satorres aaeabefdfe fix: refs #8114 fix removeAddress 2024-11-28 11:11:45 +01:00
Javier Segarra 8bc3c1610b Merge branch 'master' into hotfix_ticketSale_enter 2024-11-28 08:39:18 +00:00
Jorge Penadés ad45d612ee Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 6818-hotfix-refactorParsePhone 2024-11-28 09:38:56 +01:00
Robert Ferrús 5c79c6bfef feat: refs #245362 itemTags 2024-11-28 09:38:28 +01:00
Guillermo Bonet 7315d117c0 Merge branch 'test' into dev 2024-11-28 09:01:17 +01:00
Guillermo Bonet 41fb880c0e fix: refs #7266 Minor fixes 2024-11-28 08:59:13 +01:00
Alex Moreno a251e348a8 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-28 08:41:56 +01:00
Javier Segarra 8daa08b99c Merge branch 'master' into hotfix_ticketSale_enter 2024-11-28 07:35:46 +00:00
Guillermo Bonet 55b9e3ddcd fix: refs #7266 Bad report 2024-11-28 08:21:09 +01:00
Jon Elias aaab41fe97 fix: translations 2024-11-28 07:37:50 +01:00
Jon Elias b2e99230b3 Merge branch 'Hotfix-ZoneEventsExclusion' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneEventsExclusion 2024-11-28 07:21:04 +01:00
Jon Elias 1a0406b5b1 fix: fixed exclusionCreate when excluding an event already excluded 2024-11-28 07:21:02 +01:00
Javier Segarra 38d8dbab8e Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-27 18:28:20 +00:00
Javier Segarra e23c6bc144 Merge branch 'master' into hotfix_ticketSale_enter 2024-11-27 18:19:59 +00:00
Javier Segarra a7f5c13acf Merge branch 'master' into Hotfix-ZoneEventsExclusion 2024-11-27 18:15:05 +00:00
Jon Elias d2cee10141 Merge branch 'master' into Hotfix-InvoiceOutRefFilter 2024-11-27 13:13:57 +00:00
Jon Elias 7d28037c29 fix: fixed ref filter in InvoiceOutList 2024-11-27 14:09:37 +01:00
Jorge Penadés 25b8535f19 refactor: refs #6818 check prefix 2024-11-27 12:54:11 +01:00
Carlos Satorres 8b69940d41 Merge branch 'dev' into 7304-warningCustomerBasicData 2024-11-27 11:54:05 +00:00
Jon Elias e94c99662d Merge branch 'Hotfix-ZoneEventsExclusion' of https://gitea.verdnatura.es/verdnatura/salix-front into Hotfix-ZoneEventsExclusion 2024-11-27 12:53:08 +01:00
Jon Elias e764f4066f fix: ticket notes translation and deleted useless code 2024-11-27 12:53:07 +01:00
Carlos Satorres 954a777182 Merge branch 'dev' of https: refs #6389//gitea.verdnatura.es/verdnatura/salix-front into 6389-changesMonitor 2024-11-27 11:28:31 +01:00
Carlos Satorres a531973421 fix: hotfix search 2024-11-27 10:18:32 +01:00
Javier Segarra dc156e44b6 Merge branch 'master' into hotfix_ticketSale_enter 2024-11-27 07:40:24 +00:00
Jon Elias 6b95df0202 Merge branch 'master' into Hotfix-ZoneEventsExclusion 2024-11-27 07:13:18 +00:00
Jon Elias 07ba02aec8 fix: fixed delete event and dated value when excluding a day 2024-11-27 08:02:18 +01:00
Javier Segarra 13ee4625be Merge branch 'master' into hotfix_remove_moreOptions 2024-11-27 06:57:23 +00:00
Carlos Satorres 59648d14f0 fix: refs #8114 orderList 2024-11-27 06:18:41 +01:00
Javier Segarra b61d6e6cbe Merge branch 'dev' into feature/CatalogTests 2024-11-27 01:22:45 +01:00
Javier Segarra e3bdea2197 fix: ticketSale keyup.enter 2024-11-27 01:15:16 +01:00
William Buezas a2d84c48c0 refactor: remove unnecesary things 2024-11-26 21:05:47 -03:00
Javier Segarra ff91ca2dfe feat: remove More options separator 2024-11-26 23:57:10 +01:00
Javier Segarra bc0d7f110d fix: apply dataByOrder 2024-11-26 23:48:47 +01:00
Javier Segarra cf34204f82 Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-26 23:21:05 +01:00
Alex Moreno 9086b7d48d Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-26 14:20:08 +01:00
Javier Segarra 1af90f695e Merge branch 'master' into hotfix_addressSelect_optionFormat 2024-11-26 12:42:41 +00:00
Carlos Andrés b20803e6b9 Actualizar src/pages/Travel/Card/TravelBasicData.vue 2024-11-26 12:31:23 +00:00
Carlos Satorres c5f2be688c fix: fix true 2024-11-26 13:12:53 +01:00
Carlos Satorres 4008f50781 fix: remove 2024-11-26 13:08:28 +01:00
Carlos Satorres 728055352d fix: fix raidDays 2024-11-26 13:06:55 +01:00
Carlos Satorres ad8d5b5e9a fix: hotfix travel 2024-11-26 13:00:38 +01:00
Javier Segarra ac1153b14c feat: add Options style in AddressList from OrderCreate 2024-11-26 12:26:18 +01:00
Javier Segarra 0e9fe82d3d Merge branch 'master' into hotfix_addressSelect_optionFormat 2024-11-26 12:23:39 +01:00
Javier Segarra 63536ea0f5 feat: add Options style in AddressList from OrderCreate 2024-11-26 12:17:33 +01:00
Jorge Penadés 15c1898044 feat: refs #8232 hide only if it is null 2024-11-26 10:42:14 +01:00
Jorge Penadés a33f801543 refactor: refs #8232 use composable 2024-11-26 10:19:54 +01:00
Jorge Penadés 84adc40c18 feat: refs #8232 change default scopeDays 2024-11-26 10:16:53 +01:00
Alex Moreno 7feea110a6 fix(CustomerSummary): fixed CustomerSummaryTable max width 2024-11-26 09:29:09 +01:00
Alex Moreno 2076072eeb fix(TicketSale): set old quantity when error 2024-11-26 09:21:51 +01:00
Alex Moreno 8fbf7fed43 fix(TicketSale): throw error when it should 2024-11-26 09:05:46 +01:00
Alex Moreno 1e4cda6c6a fix(OrderCatalogFilter): remove limit 2024-11-26 07:39:37 +01:00
Javier Segarra c3510aea60 feat: add Options Style in AddressList from TicketCrete 2024-11-26 00:18:42 +01:00
Javier Segarra 1974fd4663 Merge branch 'dev' into 8163-VnInputFunctionality 2024-11-25 14:27:44 +01:00
Carlos Satorres 5dd508c559 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-11-25 13:31:02 +01:00
Javier Segarra 60590f6c97 Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-25 12:28:23 +00:00
William Buezas 0e55f7abdc test: order catalog tests 2024-11-25 09:18:11 -03:00
Alex Moreno 655a76ff62 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-25 13:03:11 +01:00
Alex Moreno fbd57dc96b Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-25 13:02:58 +01:00
Alex Moreno 8e7cb9c46e fix: zoneLocationsTree check selected sons 2024-11-25 12:54:15 +01:00
Jon Elias f3429297cf Merge branch 'master' into Fix-ZoneLocationsTree2 2024-11-25 11:20:17 +00:00
Jon Elias d191d88e81 refactor: modified button to prevent submit 2024-11-25 12:19:20 +01:00
Javier Segarra 424dfc0a5c Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-25 11:18:18 +00:00
Jorge Penadés a1284cefc2 refactor: refs #8207 add update fn 2024-11-25 12:01:28 +01:00
Jon Elias c558636799 refactor: requested changes 2024-11-25 11:12:11 +01:00
Jorge Penadés a3f56aaf24 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into 8207-hotfix-tableActions 2024-11-25 10:27:00 +01:00
Jon Elias 1dedf00fef Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into Fix-ZoneLocationsTree2 2024-11-25 09:24:58 +01:00
Jon Elias a1aa9337c8 fix: show data and fixed search button when excluding a location 2024-11-25 09:21:20 +01:00
Alex Moreno e10e0d01e6 fix: zoneEventExclusion form dated 2024-11-24 11:53:40 +01:00
Javier Segarra a45bf4c83b perf: remove comments 2024-11-24 08:49:03 +01:00
Javier Segarra 8d59cfa9c3 perf: use FetchData instead VnPAginate 2024-11-24 08:48:56 +01:00
Javier Segarra 7f87df1225 feat: refs #8163 use VnAccountNumber in VnAccountNumber 2024-11-23 16:49:32 +01:00
Javier Segarra 083706885c Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_itemFixedPrice 2024-11-23 01:15:36 +01:00
Javier Segarra 4fa5d47481 test: more e2e customer tests 2024-11-23 01:12:59 +01:00
Javier Segarra 8a1a748c92 test: add data-cy 2024-11-23 00:51:33 +01:00
Javier Segarra 4233385267 Merge branch 'hotfix_8217_updateCustomerCredit' of https://gitea.verdnatura.es/verdnatura/salix-front into hotfix_8217_updateCustomerCredit 2024-11-23 00:33:36 +01:00
Javier Segarra 276dc233c1 perf: remove almost fonseca code 2024-11-23 00:33:30 +01:00
Javier Segarra 12dcb51fbe fix: problem from CustomerDescriptor 2024-11-23 00:33:11 +01:00
Javier Segarra 148e255665 Merge branch 'master' into hotfix_8217_updateCustomerCredit 2024-11-22 14:49:36 +00:00
Javier Segarra 87d3dd6fa8 feat: use mapper 2024-11-22 15:49:01 +01:00
Alex Moreno 01ffb663f1 fix(ClaimList): stateCode orderBy priority 2024-11-22 15:14:03 +01:00
Jorge Penadés 0eeb22d40a chore: refs #8207 drop useless code 2024-11-22 13:56:30 +01:00
Jorge Penadés 7048f96565 refactor: refs #8207 imrove logic 2024-11-22 13:55:22 +01:00
Jorge Penadés 50fbf64cf9 fix: refs #8207 update btn wip 2024-11-22 13:33:35 +01:00
Alex Moreno 6276843613 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-22 12:40:27 +01:00
Alex Moreno 14d2ddfa83 fix: merge errors 2024-11-22 12:40:07 +01:00
Alex Moreno ef426dc579 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-22 12:10:34 +01:00
Alex Moreno 4913cf2c29 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 12:10:04 +01:00
Alex Moreno 2db0369b74 fix: resetCategory 2024-11-22 11:05:48 +01:00
Alex Moreno 1709795cf9 Merge branch 'master' into hotFix_orderCatalogFilter_refactor_fix 2024-11-22 09:56:04 +00:00
Alex Moreno 26c1394321 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-22 10:52:51 +01:00
Alex Moreno 367f660508 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-22 10:52:30 +01:00
Alex Moreno 522f32aa9a fix: orderCatalogFilter and fix useArrayData 2024-11-22 10:40:49 +01:00
Javier Segarra 8a4a6061e7 test: add e2e 2024-11-22 10:16:56 +01:00
Javier Segarra aae475bf4c feat: refs #8163 maxLength SupplierFD account 2024-11-22 08:54:41 +01:00
Alex Moreno bf29be1c5f fix: remove all try catch(err) (error) console.error 2024-11-22 08:39:46 +01:00
Alex Moreno 8cbf40f465 fix(TicketSummary): observationTypes use .description 2024-11-22 07:45:49 +01:00
Alex Moreno 3b03f0dfee fix(TicketNotes): observationTypes use .description 2024-11-22 07:43:59 +01:00
Carlos Satorres 3352cea0e7 fix: refs #7529 fix e2e 2024-11-22 06:08:11 +01:00
William Buezas 86d19218de feat: refs #8163 add prop 2024-11-21 16:54:22 -03:00
Carlos Andrés 6c866e48a0 Merge branch 'test' into dev 2024-11-21 16:02:41 +01:00
Carlos Andrés 5268140d8b feat: refs#8087 Redadas en travel 2024-11-21 15:51:27 +01:00
William Buezas ec40ef9351 feat: refs #8163 add VnInput insert functionality and e2e test 2024-11-21 10:49:19 -03:00
Carlos Andrés 242bf6f318 Merge branch 'dev' into 8087-nuevosCamposTravel 2024-11-21 11:45:20 +00:00
Carlos Satorres a0f804ab78 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix-front into 7529-workerPIT 2024-11-21 12:19:30 +01:00
Pablo Natek 104348b94b Merge branch 'dev' into 7301-itemLastEntries 2024-11-21 09:30:42 +00:00
Carlos Satorres 518ed40c91 Merge branch 'master' into hotfix-clientAddress 2024-11-21 09:26:45 +00:00
Alex Moreno fdc71a13ff Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix-front into dev 2024-11-21 10:26:38 +01:00
Alex Moreno bf0bda0e27 Merge branch 'master' of https://gitea.verdnatura.es/verdnatura/salix-front into test 2024-11-21 10:26:29 +01:00
Pablo Natek c006b4cb37 Merge branch 'dev' into 7301-itemLastEntries 2024-11-21 09:20:54 +00:00
Carlos Satorres 8a972507a4 fix: remove s 2024-11-21 10:20:42 +01:00
Pablo Natek 46cb18b5ef feat: refs #7301 add exclude inventory supplier from list 2024-11-21 10:19:30 +01:00