Commit Graph

557 Commits

Author SHA1 Message Date
Joan Sanchez 3b0f1efbf4 ACL's
gitea/salix/pipeline/head There was a failure building this commit Details
2022-09-30 13:54:20 +02:00
Joan Sanchez 68f3544477 Claim pickup order 2022-09-22 09:17:14 +02:00
Joan Sanchez 5cff983d4c Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-on: #1040
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2022-09-13 10:33:04 +00:00
Alex Moreno 6fcb1e54b4 refactor(claim_action): set translations
gitea/salix/pipeline/head This commit looks good Details
2022-09-06 09:35:01 +02:00
Javi Gallego 9fe32788fc regularizado
gitea/salix/pipeline/head This commit looks good Details
2022-08-24 14:38:05 +02:00
Alex Moreno 3fd34e0861 feat(claim_pickup_order): modify email
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-25 14:49:39 +02:00
Carlos Jimenez Ruiz d0e06a46d0 removed deprecated stowaway comp and usages
gitea/salix/pipeline/head There was a failure building this commit Details
2022-07-01 09:15:07 +02:00
Javi Gallego 4c5c51a319 claim basic-data minor bug
gitea/salix/pipeline/head This commit looks good Details
2022-06-27 18:20:26 +02:00
Carlos Jimenez Ruiz d183ccb843 feat(claim.notes): added the observations setction to claim plus refactors
gitea/salix/pipeline/head This commit is unstable Details
2022-06-25 15:22:47 +02:00
Carlos Jimenez Ruiz 3c963b5ab2 refactor(routes json): fixed indentation 2022-06-22 16:42:59 +02:00
Joan Sanchez 58a1eea642 Merge branch 'dev' into 4111-claim.summary
gitea/salix/pipeline/head This commit looks good Details
2022-06-07 12:27:12 +00:00
Joan Sanchez fab4705618 Rollback
gitea/salix/pipeline/head This commit looks good Details
2022-06-01 14:01:19 +02:00
Joan Sanchez 4ac26895ba fix(regularizeClaim): refound with negative quantity
gitea/salix/pipeline/head This commit looks good Details
Refs: #4148
2022-06-01 09:36:47 +02:00
Vicent Llopis 4baf1afb83 fix: show videos in claim.summary
gitea/salix/pipeline/head This commit looks good Details
2022-05-25 07:51:47 +02:00
Carlos Jimenez Ruiz d31f7f1b6b all type Dates replaced to date as per convention
gitea/salix/pipeline/head This commit looks good Details
2022-05-16 10:19:43 +02:00
Alex Moreno 5021315ed4 refactor(clientCredit): test and types
gitea/salix/pipeline/head This commit looks good Details
2022-05-12 09:47:47 +02:00
Vicent Llopis bb4dbb60b8 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-05-10 07:11:26 +02:00
Vicent Llopis 11a7f48bd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 08:32:02 +02:00
Vicent Llopis c10e4c04b6 refactor: delete file
gitea/salix/pipeline/head This commit looks good Details
2022-04-29 08:23:35 +02:00
Vicent Llopis 4a6873a0fd Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 09:34:37 +02:00
Vicent Llopis 0ec51202e0 pull request changed
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 09:34:13 +02:00
Vicent Llopis 579ff3aa4a Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo
gitea/salix/pipeline/head This commit looks good Details
2022-04-21 07:13:34 +02:00
Vicent Llopis 5db20ee3e2 refactor: deleteOldFiles in claim
gitea/salix/pipeline/head This commit looks good Details
2022-04-20 14:46:37 +02:00
Vicent Llopis c1edb8206e refactor
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:46:26 +02:00
Vicent Llopis 9a171d5202 refactor
gitea/salix/pipeline/head Build queued... Details
2022-04-12 12:45:07 +02:00
Vicent Llopis ad3b3c44d6 refactor: replace let for const
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:44:46 +02:00
Vicent Llopis 1e11191e79 fix: frontTest
gitea/salix/pipeline/head This commit looks good Details
2022-04-12 12:32:48 +02:00
Vicent Llopis 5921891161 refactor: updated css
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 12:20:36 +02:00
Vicent Llopis 4872407723 fix test
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 11:57:56 +02:00
Vicent Llopis e1de41f801 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 10:09:36 +02:00
Vicent Llopis 313e911940 fix(claim_action): smart-table
gitea/salix/pipeline/head There was a failure building this commit Details
2022-04-12 10:09:00 +02:00
Vicent Llopis 6e999302bf refactor: replace let for const
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 10:09:54 +02:00
Alex Moreno 786b7fa84f feat(descriptor): button open summary popup
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 08:02:05 +02:00
Vicent Llopis ddd6d61d9e fix(claim_photos): consider other image types in html
gitea/salix/pipeline/head This commit looks good Details
2022-04-11 07:58:23 +02:00
Vicent Llopis 5431dbdc3e refactor: resize vide0s
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 14:33:00 +02:00
Vicent Llopis c00be015ab feat(claim_photo): add fixtures and backTest 2022-04-08 13:53:25 +02:00
Vicent Llopis 90b079a0ac refactor: description back routes
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 12:25:06 +02:00
Vicent Llopis ea4266ef8c feat: add deleteOldFiles
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 12:20:39 +02:00
Vicent Llopis 5567e07773 feat(claim_photo): can upload videos
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 09:34:46 +02:00
Alex Moreno 238a9fd5da feat(client.defaulter&claim): change socialName to name
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 08:52:21 +02:00
Vicent Llopis 5ddce43dd1 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3750-claim_photo 2022-04-08 07:57:02 +02:00
Vicent Llopis df26a40e63 feat(claim_action): add smart-table and 'change destinantion' to all rows
gitea/salix/pipeline/head This commit looks good Details
2022-04-08 07:37:17 +02:00
Vicent Llopis 1915850a09 feat(claim_photo): added videos
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 14:12:56 +02:00
Joan Sanchez fa1fb37795 Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev 2022-04-07 12:24:41 +02:00
Alex Moreno c312eff12e fix(claim_search-panel): filter
gitea/salix/pipeline/head This commit looks good Details
2022-04-07 12:09:11 +02:00
Vicent Llopis 1056060957 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3721-claim_basic-data
gitea/salix/pipeline/head This commit looks good Details
2022-03-23 12:37:34 +01:00
Vicent Llopis e4eed95724 notify rocket when claimState change to canceled
gitea/salix/pipeline/head This commit looks good Details
2022-03-21 10:02:56 +01:00
Alex Moreno f337f82b35 feat(claim): add packages, and next button
gitea/salix/pipeline/head This commit looks good Details
2022-03-15 12:51:33 +01:00
Carlos Jimenez Ruiz 63fc58b6ba Merge branch 'dev' into 3649-claim_log
gitea/salix/pipeline/head This commit looks good Details
2022-03-03 12:00:02 +00:00
Alex Moreno 619baf2896 refactor claim_main controller
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 11:07:35 +01:00
Alex Moreno a05223681e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3620-claim_change_state 2022-03-02 10:43:06 +01:00
Carlos Jimenez Ruiz 2b0f54c3aa Merge branch 'dev' into 3646-claim-summary
gitea/salix/pipeline/head This commit looks good Details
2022-03-02 09:17:19 +00:00
Alex Moreno 44318903e7 feat(claim): add log section
gitea/salix/pipeline/head This commit looks good Details
2022-03-01 15:15:58 +01:00
Alex Moreno 60e908d82a feat(claim_summary): parentReload(), and test 2022-02-28 12:40:44 +01:00
Alex Moreno 5434dd3baf feat(claim_index): implemented smart-table and change state in summary
gitea/salix/pipeline/head There was a failure building this commit Details
2022-02-28 07:57:46 +01:00
Alex Moreno fc3a46eb26 refactor(claim): removed importTicketSales and fix tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-24 13:52:26 +01:00
Alex Moreno 52cf79516a refactor(claim_summary): move responsability and improve fixtures
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 12:23:47 +01:00
Joan Sanchez 9d298c2a5e Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2022-02-23 12:07:05 +01:00
Vicent Llopis 34730f48ed fix: add role salesBoss to filter
gitea/salix/pipeline/head This commit looks good Details
2022-02-16 12:51:45 +01:00
Carlos Jimenez Ruiz cb21d4db01 removed a typo 2022-02-07 17:59:40 +01:00
Alex Moreno 1250382209 missing zero
gitea/salix/pipeline/head This commit looks good Details
2022-02-03 09:52:17 +01:00
Alex Moreno 001aed3cb5 fix(claim): filter created 2022-02-02 14:32:16 +01:00
Carlos Jimenez Ruiz d86aa5535c refactor(createFromSales): now claimManager can claim any time
gitea/salix/pipeline/head This commit looks good Details
2022-01-04 16:16:39 +01:00
Joan Sanchez 46d7a6e765 Added unit tests
gitea/salix/pipeline/head This commit looks good Details
2021-11-19 09:24:49 +01:00
Joan Sanchez 8c5f0d3019 feat(createClaim): disallow claim creation for a ticket delivered more than seven days ago
Refs: 3278
2021-11-19 09:24:31 +01:00
Carlos Jimenez Ruiz 1d253fc53d definitions corrected for myOptions of endpoints 2021-11-18 11:17:30 +01:00
Alex Moreno bb0745532b fix(claim): salesPersonFk where add officeBoss
gitea/salix/pipeline/head This commit looks good Details
2021-11-02 11:24:52 +01:00
Carlos Jimenez Ruiz 7a7bbe2ba8 more module transactions
gitea/salix/pipeline/head This commit looks good Details
2021-08-13 16:46:44 +02:00
Carlos Jimenez Ruiz 9578895f95 backend unit tests adapted
gitea/salix/pipeline/head This commit looks good Details
2021-07-29 17:40:45 +02:00
Carlos Jimenez Ruiz 8d682f4e03 chat notifications for many sales modifications 2021-07-29 17:20:57 +02:00
Carlos Jimenez Ruiz dd3473b93d small refactors correcting constants and adding transactions 2021-07-12 12:50:15 +02:00
Carlos Jimenez Ruiz 3b2b4e3819 client module changes for transactions
gitea/salix/pipeline/head This commit looks good Details
2021-07-08 15:53:30 +02:00
Carlos Jimenez Ruiz 10c7aa70d6 claim module transactions for filter, summary and isEditable 2021-07-05 12:00:49 +02:00
Carlos Jimenez Ruiz 8344a58ab8 updated client/worker/user IDs on tests
gitea/salix/pipeline/head There was a failure building this commit Details
2021-06-23 13:24:23 +02:00
Carlos Jimenez Ruiz 9a1b6e4653 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2920-item_descriptor_user_warehouse
gitea/salix/pipeline/head This commit looks good Details
2021-05-21 15:33:23 +02:00
Carlos Jimenez Ruiz 1bfe537186 claim, client, entry, item and order modules descriptor now takes warehouseFk from vnConfig 2021-05-21 15:31:05 +02:00
Joan Sanchez a5c3ba3926 2921 - Changed the ticket url of rocket notifications
gitea/salix/pipeline/head This commit looks good Details
2021-05-19 10:26:58 +02:00
Carlos Jimenez Ruiz 5843140cf5 minor refactor for code usage instead of description
gitea/salix/pipeline/head This commit looks good Details
2021-05-17 12:27:26 +02:00
Joan Sanchez 6b8074e32f 2878 - Splitted method into activeWithRole and activeWithInheritedRole
gitea/salix/pipeline/head This commit looks good Details
2021-04-13 14:08:10 +02:00
Joan Sanchez d4c6695629 2631 - Notify status change to incomplete
gitea/salix/pipeline/head This commit looks good Details
2021-04-07 07:45:00 +02:00
Carlos Jimenez Ruiz e025368af1 updaloadFile transaction commit conditional
gitea/salix/pipeline/head This commit looks good Details
2021-03-30 10:17:16 +02:00
Carlos Jimenez Ruiz 8797444553 importTicketSales refactor + tests
gitea/salix/pipeline/head This commit looks good Details
2021-03-29 15:42:29 +02:00
Carlos Jimenez Ruiz c1f457c263 allowContentTypes and removeFile refactors 2021-03-29 15:42:14 +02:00
Carlos Jimenez Ruiz 740cc79bc0 uploadFile refactor 2021-03-29 15:19:43 +02:00
Carlos Jimenez Ruiz de2a17e840 removeFile and filter refactors 2021-03-29 15:18:49 +02:00
Carlos Jimenez Ruiz 8d8bdacd86 updateClaimAction refactor + tests 2021-03-29 15:18:14 +02:00
Carlos Jimenez Ruiz 3054cbcadb updateClaim refactor + tests 2021-03-29 15:17:10 +02:00
Carlos Jimenez Ruiz c4cbc064c9 regularice claim refactor + test 2021-03-29 15:15:58 +02:00
Carlos Jimenez Ruiz ee79f23185 createFromSales refactor + tests 2021-03-29 15:14:23 +02:00
Joan Sanchez 6da84e46c1 Added throw error
gitea/salix/pipeline/head This commit looks good Details
2021-03-22 10:20:04 +01:00
Joan Sanchez 6210e60896 2669 - Changes to the translate values function
gitea/salix/pipeline/head This commit looks good Details
2021-03-19 19:20:19 +01:00
Joan Sanchez 0ec6d273e6 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-15 13:49:16 +01:00
Joan Sanchez bd081f9fd6 2734 - Make invoice PDF refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2021-03-15 13:43:22 +01:00
Jorge Padawan aaf77677d1 Aligned title with column
gitea/salix/pipeline/head Build queued... Details
2021-02-16 15:50:48 +01:00
Jorge Padawan ac4a19841d Added shrink for date
gitea/salix/pipeline/head There was a failure building this commit Details
2021-02-16 15:40:20 +01:00
Joan Sanchez 20116ac620 2741 - Claim detail deletion visual fix
gitea/salix/pipeline/head This commit looks good Details
2021-02-02 09:08:11 +01:00
Jorge Padawan 509de4fa0a Fix for good practique code
gitea/salix/pipeline/head This commit looks good Details
2021-01-12 10:11:37 +01:00
Jorge Padawan f45aa7937d Added conditionals with rols to display or not the icons with link 2021-01-12 07:39:12 +01:00
Jorge Padawan af55e2cc32 Add tooltip and modified sref for previews 2021-01-11 10:36:20 +01:00
Joan Sanchez a521ad4262 Fixed claim basicData back error
gitea/salix/pipeline/head This commit looks good Details
2020-12-31 14:18:06 +01:00
Joan Sanchez d8a2184695 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2576-photo_uploader 2020-12-18 17:24:30 +01:00
Carlos Jimenez Ruiz 116730a3b2 claim module refactors 2020-12-15 17:24:13 +01:00
Joan Sanchez 1ba1d27ba0 2576 - Photo upload component
gitea/salix/pipeline/head There was a failure building this commit Details
2020-11-27 13:10:39 +01:00
Joan Sanchez 80bae4de0a 2607 - Changed preview icon
gitea/salix/pipeline/head This commit looks good Details
2020-11-24 08:22:54 +01:00
Joan Sanchez c654e14cfe 2611 - Summary go to entity
gitea/salix/pipeline/head This commit looks good Details
2020-11-23 13:41:51 +01:00
Joan Sanchez ac5f30924a Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 08:20:46 +01:00
Joan Sanchez 0fc01b2316 1419 - Claim update discount hotfix
gitea/salix/pipeline/head This commit looks good Details
2020-11-18 08:16:37 +01:00
Carlos Jimenez Ruiz e22e74a725 expanded date columns + order index translations
gitea/salix/pipeline/head This commit looks good Details
2020-11-10 16:47:39 +01:00
Bernat Exposito Domenech a5e6f99b1f Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-29 08:06:50 +01:00
Joan Sanchez 343358c231 Updated translations 2020-10-27 14:42:43 +01:00
Joan Sanchez 3675f7ed34 2511 - Changed salesAssitant role to claimManager
gitea/salix/pipeline/head This commit looks good Details
2020-10-26 12:16:57 +01:00
Bernat Exposito Domenech 58168e78ab test, translate and supplier searpanel, summary
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-26 08:38:43 +01:00
Bernat Exposito Domenech 0f6e1eae24 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2502-supplier_summary 2020-10-21 08:22:51 +02:00
Bernat Exposito Domenech 256206ace4 supplier summary dscriptor and card
gitea/salix/pipeline/head There was a failure building this commit Details
2020-10-20 09:44:44 +02:00
Carlos Jimenez Ruiz dd6035606f some more tests fixed + refactors 2020-10-15 18:57:27 +02:00
Carlos Jimenez Ruiz c04b7a0657 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 10:31:06 +02:00
Joan Sanchez 7538b1c941 Merge branch 'dev' into 1447-updateClaim_refactor
gitea/salix/pipeline/head This commit looks good Details
2020-10-13 06:56:23 +00:00
Carlos Jimenez Ruiz b6b84cfea7 more tests fixed + small refactors 2020-10-08 16:00:19 +02:00
Carlos Jimenez Ruiz 641eb93282 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random 2020-10-06 14:50:23 +02:00
Bernat Exposito Domenech fcebbb68b6 delete comments
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 14:46:58 +02:00
Joan Sanchez a29d92718a Updated description
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 14:37:03 +02:00
Joan Sanchez 254c391138 Removed test exclusion
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 14:32:24 +02:00
Bernat Exposito Domenech 3d39467613 refactor updateclaim
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 14:23:35 +02:00
Bernat Exposito Domenech 134d1c4385 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 1447-updateClaim_refactor 2020-10-06 13:06:43 +02:00
Bernat Exposito Domenech e6b4d21ddb refactor updateClaim
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 10:57:40 +02:00
Carlos Jimenez Ruiz 0dbdb5103e Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2488-jasmine_true_random
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 10:16:08 +02:00
Carlos Jimenez Ruiz 89fb980f14 some tests fixed 2020-10-06 10:15:27 +02:00
Joan Sanchez 0b8d8a4f65 Added focus directive to searchbar
gitea/salix/pipeline/head This commit looks good Details
2020-10-06 08:17:12 +02:00
Carlos Jimenez Ruiz 1e55632b94 refactor & fix regularize claim and prices Diff
gitea/salix/pipeline/head This commit looks good Details
2020-09-29 13:28:02 +02:00
Juan Ferrer fc6a19b60d Merge branch 'dev' into 2177-userModule 2020-09-21 14:10:15 +02:00
Carlos Jimenez Ruiz ea077e8d4a added auto-load to some combos 2020-09-17 20:12:52 +02:00
Carlos Jimenez Ruiz bde6c4495d e2e path updated + 2 new tasks for broken tests
gitea/salix/pipeline/head This commit looks good Details
2020-09-16 16:10:43 +02:00
Carlos Jimenez Ruiz 5b69ce983c salesPersonUser replaces salesPerson relation
gitea/salix/pipeline/head This commit looks good Details
2020-09-15 19:43:07 +02:00
Juan Ferrer 4b5d2cd0dd 2177 account module
gitea/salix/pipeline/head There was a failure building this commit Details
LDAP test

RC1

SQL version changed

Tests fixes

Back & front tests fixed

All tests passed

Front and back tests plus some fixes
2020-09-11 14:36:16 +02:00
Joan Sanchez b848fa52f2 2385 - Replaced worker nickname
gitea/salix/pipeline/head This commit looks good Details
2020-09-03 15:11:16 +02:00
Carlos Jimenez Ruiz 0e4fc7e2bd removed unused code.
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 18:43:57 +02:00
Carlos Jimenez Ruiz 69cc18be12 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2330-Implement_print_service_testing 2020-08-14 18:42:51 +02:00
Carlos Jimenez Ruiz a679ebfce8 quick fix for updateClaim from other branch 2020-08-14 18:42:45 +02:00
Carlos Jimenez Ruiz b711728999 ultimate edition deluxe
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 17:47:13 +02:00
Carlos Jimenez Ruiz 3df9ae2946 section no longer nukes salesPerson-user relation
gitea/salix/pipeline/head This commit looks good Details
2020-08-14 17:10:59 +02:00
Carlos Jimenez Ruiz c62801e741 modules component to vnComponent working
gitea/salix/pipeline/head This commit looks good Details
2020-07-24 14:22:30 +02:00
Carlos Jimenez Ruiz 6913f2db72 $httpBackend.when and .expect no longer misused
gitea/salix/pipeline/head This commit looks good Details
2020-07-23 17:10:07 +02:00
Carlos Jimenez Ruiz 4ca004f833 angular.mock.injet shorten to inject 2020-07-23 16:46:16 +02:00
Carlos Jimenez Ruiz 7d5dc776c1 replaced most of the translate.instant for $t 2020-07-23 16:07:08 +02:00
Joan Sanchez 171deeb82c Merge branch 'dev' into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-16 11:12:34 +00:00
Joan Sanchez 7b61e129ff HOTFIX: Change claim claimed quantity
gitea/salix/pipeline/head There was a failure building this commit Details
2020-07-09 13:24:56 +02:00
Bernat Exposito Domenech 122dacffb5 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2350-order_index
gitea/salix/pipeline/head This commit looks good Details
2020-07-06 10:20:59 +02:00
Bernat Exposito Domenech ee704b302c update order filter
gitea/salix/pipeline/head This commit looks good Details
2020-07-06 10:20:45 +02:00
Joan Sanchez b40e09a6cb Methods refactor & updated back unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-07-01 14:28:05 +02:00
Joan Sanchez 2c23f3417a Sale selection fixes
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-29 11:43:53 +02:00
Carlos Jimenez Ruiz ec6a3e00f7 removed unused argument in test
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 13:26:21 +02:00
Bernat Exposito Domenech 2275541bb1 change on-response for on-accept
gitea/salix/pipeline/head This commit looks good Details
2020-06-23 12:46:24 +02:00
Bernat Exposito Domenech 84bacfd379 add message before delete a line on a claim
gitea/salix/pipeline/head This commit looks good Details
2020-06-18 10:10:42 +02:00
Juan Ferrer 8e51104e1b Merge branch 'test' into dev
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-17 13:31:54 +02:00
Bernat Exposito Domenech 930e167a8e fix test
gitea/salix/pipeline/head This commit looks good Details
2020-06-17 07:25:05 +02:00
Bernat Exposito Domenech d80d520fba fix claim.beggining
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 12:00:38 +02:00
Bernat Exposito Domenech b6d50f7d8d Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail 2020-06-16 11:36:06 +02:00
Joan Sanchez 2f8fa59561 2332 - Fixed on load error
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 09:04:13 +02:00
Joan Sanchez 7fd77bdaef 2332 - Fixed on load error
gitea/salix/pipeline/head This commit looks good Details
2020-06-16 08:50:59 +02:00
Bernat Exposito Domenech b33f42d05e add restrictions in claim detail
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-16 07:47:46 +02:00
Bernat Exposito Domenech 9d80ec11af Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2275-claim_detail 2020-06-15 09:54:46 +02:00
Joan Sanchez 25b1c6bd8f 2239 - Added services
gitea/salix/pipeline/head This commit looks good Details
2020-06-12 14:28:29 +02:00
Bernat Exposito Domenech 12468afa3c refactor claim detail 2020-06-11 12:31:52 +02:00
Bernat Exposito Domenech 5d426c490c fix traductions 2020-06-11 09:04:17 +02:00
Bernat Exposito 49d4f881ad Merge pull request '2296-fix_back_test' (#295) from 2296-fix_back_test into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
2020-06-05 07:15:10 +00:00
Bernat Exposito Domenech 3a6efebfd9 skipp back test and create task 2304 2020-06-04 14:22:56 +02:00
Joan Sanchez e2391e5595 Changes made
gitea/salix/pipeline/head This commit looks good Details
2020-06-04 10:12:54 +02:00
Joan Sanchez 30c721b0e2 Added ACL
gitea/salix/pipeline/head This commit looks good Details
2020-06-04 08:21:08 +02:00
Joan Sanchez 0695ec01bc Updated unit test
gitea/salix/pipeline/head There was a failure building this commit Details
2020-06-04 07:53:06 +02:00
Joan Sanchez f39719cc46 2281 - Added claim pickup checkbox
gitea/salix/pipeline/head This commit has test failures Details
2020-06-03 14:46:58 +02:00
Joan Sanchez 2af39d4b67 Updated unit tests
gitea/salix/pipeline/head This commit looks good Details
2020-05-25 07:43:24 +02:00
Joan Sanchez 4878c0dc46 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2141-print_reply_to
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-25 07:25:21 +02:00
Joan Sanchez e9e7ae08f2 Locale refactor
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-22 15:20:55 +02:00
Carlos Jimenez Ruiz 245827e8d5 corrected a typo
gitea/salix/pipeline/head This commit looks good Details
2020-05-21 09:28:50 +02:00
Joan Sanchez f6efa7160e 2141 ReplyTo param
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-20 16:23:53 +02:00
Carlos Jimenez Ruiz 55c4ccdb29 Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
gitea/salix/pipeline/head There was a failure building this commit Details
Reviewed-by: Joan Sanchez <joan@verdnatura.es>
Reviewed-by: Carlos Jimenez <carlosjr@verdnatura.es>
2020-05-20 08:40:02 +00:00
Bernat Exposito Domenech 4133021e5c fix translate on plural
gitea/salix/pipeline/head This commit looks good Details
2020-05-20 08:52:20 +02:00
Juan Ferrer e7cf060e12 Merge fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:51:50 +02:00
Bernat Exposito Domenech d289c17530 searchbar translates
gitea/salix/pipeline/head This commit looks good Details
2020-05-19 10:27:22 +02:00
Juan Ferrer d7f2e686b1 Merge branch 'dev' into 1882-descriptorRefactor 2020-05-19 09:28:50 +02:00
Joan Sanchez 309b4dafe9 Requested changes
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 14:03:15 +02:00
Joan Sanchez 4aea769797 2246 Added claim state priority field
gitea/salix/pipeline/head This commit looks good Details
2020-05-18 13:46:45 +02:00
Joan Sanchez 42bec3a944 1833 Claim action refactor
gitea/salix/pipeline/head This commit looks good Details
2020-05-15 14:47:19 +02:00
Joan Sanchez 9b085d13e1 Updated back unit test
gitea/salix/pipeline/head This commit looks good Details
2020-05-14 17:32:52 +02:00
Joan Sanchez 2bb17f4a00 Requested changes
gitea/salix/pipeline/head This commit has test failures Details
2020-05-14 17:15:54 +02:00
Joan Sanchez e51341102b Updated e2e
gitea/salix/pipeline/head This commit looks good Details
2020-05-14 14:30:43 +02:00
Joan Sanchez 62d27e45e2 Updated unit tests
gitea/salix/pipeline/head This commit has test failures Details
2020-05-14 14:01:34 +02:00
Joan Sanchez 94a219760c 2223 Added pickup checkbox
gitea/salix/pipeline/head There was a failure building this commit Details
2020-05-13 15:04:57 +02:00
Juan Ferrer 07cbac7fcd Merge fixes
gitea/salix/pipeline/head This commit looks good Details
2020-05-08 19:56:39 +02:00
Javi Gallego 8453d25852 #2224item.diary provar directiva $anchorScroll
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 18:42:50 +02:00
Juan Ferrer 6c14743017 Last fixes & tests passed
gitea/salix/pipeline/head This commit looks good Details
2020-05-06 14:38:09 +02:00
Juan Ferrer 6a8e1bf6b5 #1882 Boileplate code removed, declarative quicklinks
gitea/salix/pipeline/head This commit looks good Details
2020-04-30 12:48:52 +02:00
Juan Ferrer b536c8291a #1882 Popover::show() boilerplate code removed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-28 14:26:02 +02:00
Juan Ferrer 5826099601 #1882 First step, front tests passed
gitea/salix/pipeline/head There was a failure building this commit Details
2020-04-25 11:50:04 +02:00
Juan Ferrer 2249f68d6e SCSS px to em: rem for font-size 2020-04-02 15:11:42 +02:00
Juan Ferrer 559cc5eb8c SCSS em to px: Second step 2020-04-02 14:52:02 +02:00
Juan Ferrer 734c86c5f5 SCSS px to em - First step 2020-04-02 14:20:57 +02:00
Juan Ferrer bf68d15264 E2E expeditions fixes, scss px/em fixes 2020-04-02 11:39:39 +02:00
Joan Sanchez 9b933e7d88 Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2132-extend_from_section
gitea/salix/pipeline/head This commit looks good Details
2020-03-20 12:00:53 +01:00
Joan Sanchez 40df1018e4 Fixes
gitea/salix/pipeline/head This commit looks good Details
2020-03-18 15:47:38 +01:00