Joan Sanchez
|
5cff983d4c
|
Merge pull request 'regularizado' (#1040) from #4432-salesBoss-por-salesTeamBoss into dev
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
|
2022-09-06 09:35:01 +02:00 |
Javi Gallego
|
9fe32788fc
|
regularizado
|
2022-08-24 14:38:05 +02:00 |
Alex Moreno
|
3fd34e0861
|
feat(claim_pickup_order): modify email
|
2022-07-25 14:49:39 +02:00 |
Javi Gallego
|
4c5c51a319
|
claim basic-data minor bug
|
2022-06-27 18:20:26 +02:00 |
Carlos Jimenez Ruiz
|
d183ccb843
|
feat(claim.notes): added the observations setction to claim plus refactors
|
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 |
Vicent Llopis
|
4baf1afb83
|
fix: show videos in claim.summary
|
2022-05-25 07:51:47 +02:00 |
Vicent Llopis
|
bb4dbb60b8
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
|
2022-05-10 07:11:26 +02:00 |
Vicent Llopis
|
4a6873a0fd
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 3752-claim_action
|
2022-04-21 09:34:37 +02:00 |
Vicent Llopis
|
0ec51202e0
|
pull request changed
|
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
|
2022-04-21 07:13:34 +02:00 |
Vicent Llopis
|
c1edb8206e
|
refactor
|
2022-04-12 12:46:26 +02:00 |
Vicent Llopis
|
1e11191e79
|
fix: frontTest
|
2022-04-12 12:32:48 +02:00 |
Vicent Llopis
|
5921891161
|
refactor: updated css
|
2022-04-12 12:20:36 +02:00 |
Vicent Llopis
|
4872407723
|
fix test
|
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
|
2022-04-12 10:09:36 +02:00 |
Vicent Llopis
|
313e911940
|
fix(claim_action): smart-table
|
2022-04-12 10:09:00 +02:00 |
Alex Moreno
|
786b7fa84f
|
feat(descriptor): button open summary popup
|
2022-04-11 08:02:05 +02:00 |
Vicent Llopis
|
ddd6d61d9e
|
fix(claim_photos): consider other image types in html
|
2022-04-11 07:58:23 +02:00 |
Vicent Llopis
|
5431dbdc3e
|
refactor: resize vide0s
|
2022-04-08 14:33:00 +02:00 |
Vicent Llopis
|
5567e07773
|
feat(claim_photo): can upload videos
|
2022-04-08 09:34:46 +02:00 |
Alex Moreno
|
238a9fd5da
|
feat(client.defaulter&claim): change socialName to name
|
2022-04-08 08:52:21 +02:00 |
Vicent Llopis
|
df26a40e63
|
feat(claim_action): add smart-table and 'change destinantion' to all rows
|
2022-04-08 07:37:17 +02:00 |
Vicent Llopis
|
1915850a09
|
feat(claim_photo): added videos
|
2022-04-07 14:12:56 +02:00 |
Alex Moreno
|
f337f82b35
|
feat(claim): add packages, and next button
|
2022-03-15 12:51:33 +01:00 |
Carlos Jimenez Ruiz
|
63fc58b6ba
|
Merge branch 'dev' into 3649-claim_log
|
2022-03-03 12:00:02 +00:00 |
Alex Moreno
|
619baf2896
|
refactor claim_main controller
|
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 |
Alex Moreno
|
44318903e7
|
feat(claim): add log section
|
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
|
2022-02-28 07:57:46 +01:00 |
Alex Moreno
|
fc3a46eb26
|
refactor(claim): removed importTicketSales and fix tests
|
2022-02-24 13:52:26 +01:00 |
Alex Moreno
|
52cf79516a
|
refactor(claim_summary): move responsability and improve fixtures
|
2022-02-23 12:23:47 +01:00 |
Vicent Llopis
|
34730f48ed
|
fix: add role salesBoss to filter
|
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
|
bb0745532b
|
fix(claim): salesPersonFk where add officeBoss
|
2021-11-02 11:24:52 +01:00 |
Carlos Jimenez Ruiz
|
8344a58ab8
|
updated client/worker/user IDs on tests
|
2021-06-23 13:24: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
|
6b8074e32f
|
2878 - Splitted method into activeWithRole and activeWithInheritedRole
|
2021-04-13 14:08:10 +02:00 |
Joan Sanchez
|
0ec6d273e6
|
Merge branch 'dev' of https://gitea.verdnatura.es/verdnatura/salix into 2734-invoice_report
|
2021-03-15 13:49:16 +01:00 |
Joan Sanchez
|
bd081f9fd6
|
2734 - Make invoice PDF refactor
|
2021-03-15 13:43:22 +01:00 |
Jorge Padawan
|
aaf77677d1
|
Aligned title with column
|
2021-02-16 15:50:48 +01:00 |
Jorge Padawan
|
ac4a19841d
|
Added shrink for date
|
2021-02-16 15:40:20 +01:00 |
Joan Sanchez
|
20116ac620
|
2741 - Claim detail deletion visual fix
|
2021-02-02 09:08:11 +01:00 |
Jorge Padawan
|
509de4fa0a
|
Fix for good practique code
|
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
|
2020-12-31 14:18:06 +01:00 |
Carlos Jimenez Ruiz
|
116730a3b2
|
claim module refactors
|
2020-12-15 17:24:13 +01:00 |
Joan Sanchez
|
80bae4de0a
|
2607 - Changed preview icon
|
2020-11-24 08:22:54 +01:00 |
Joan Sanchez
|
c654e14cfe
|
2611 - Summary go to entity
|
2020-11-23 13:41:51 +01:00 |
Joan Sanchez
|
ac5f30924a
|
Merge branch 'test' of https://gitea.verdnatura.es/verdnatura/salix into dev
|
2020-11-18 08:20:46 +01:00 |
Joan Sanchez
|
0fc01b2316
|
1419 - Claim update discount hotfix
|
2020-11-18 08:16:37 +01:00 |
Carlos Jimenez Ruiz
|
e22e74a725
|
expanded date columns + order index translations
|
2020-11-10 16:47:39 +01:00 |
Joan Sanchez
|
343358c231
|
Updated translations
|
2020-10-27 14:42:43 +01:00 |
Joan Sanchez
|
3675f7ed34
|
2511 - Changed salesAssitant role to claimManager
|
2020-10-26 12:16:57 +01:00 |
Joan Sanchez
|
7538b1c941
|
Merge branch 'dev' into 1447-updateClaim_refactor
|
2020-10-13 06:56:23 +00:00 |
Bernat Exposito Domenech
|
fcebbb68b6
|
delete comments
|
2020-10-06 14:46:58 +02:00 |
Joan Sanchez
|
a29d92718a
|
Updated description
|
2020-10-06 14:37:03 +02:00 |
Joan Sanchez
|
254c391138
|
Removed test exclusion
|
2020-10-06 14:32:24 +02:00 |
Bernat Exposito Domenech
|
3d39467613
|
refactor updateclaim
|
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
|
2020-10-06 10:57:40 +02:00 |
Joan Sanchez
|
0b8d8a4f65
|
Added focus directive to searchbar
|
2020-10-06 08:17:12 +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
|
5b69ce983c
|
salesPersonUser replaces salesPerson relation
|
2020-09-15 19:43:07 +02:00 |
Juan Ferrer
|
4b5d2cd0dd
|
2177 account module
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
|
2020-09-03 15:11:16 +02:00 |
Carlos Jimenez Ruiz
|
b711728999
|
ultimate edition deluxe
|
2020-08-14 17:47:13 +02:00 |
Carlos Jimenez Ruiz
|
c62801e741
|
modules component to vnComponent working
|
2020-07-24 14:22:30 +02:00 |
Carlos Jimenez Ruiz
|
6913f2db72
|
$httpBackend.when and .expect no longer misused
|
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
|
7b61e129ff
|
HOTFIX: Change claim claimed quantity
|
2020-07-09 13:24:56 +02:00 |
Carlos Jimenez Ruiz
|
ec6a3e00f7
|
removed unused argument in test
|
2020-06-23 13:26:21 +02:00 |
Bernat Exposito Domenech
|
2275541bb1
|
change on-response for on-accept
|
2020-06-23 12:46:24 +02:00 |
Bernat Exposito Domenech
|
84bacfd379
|
add message before delete a line on a claim
|
2020-06-18 10:10:42 +02:00 |
Juan Ferrer
|
8e51104e1b
|
Merge branch 'test' into dev
|
2020-06-17 13:31:54 +02:00 |
Bernat Exposito Domenech
|
930e167a8e
|
fix test
|
2020-06-17 07:25:05 +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
|
2020-06-16 09:04:13 +02:00 |
Joan Sanchez
|
7fd77bdaef
|
2332 - Fixed on load error
|
2020-06-16 08:50:59 +02:00 |
Bernat Exposito Domenech
|
b33f42d05e
|
add restrictions in claim detail
|
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
|
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 |
Joan Sanchez
|
30c721b0e2
|
Added ACL
|
2020-06-04 08:21:08 +02:00 |
Joan Sanchez
|
f39719cc46
|
2281 - Added claim pickup checkbox
|
2020-06-03 14:46:58 +02:00 |
Joan Sanchez
|
2af39d4b67
|
Updated unit tests
|
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
|
2020-05-25 07:25:21 +02:00 |
Joan Sanchez
|
e9e7ae08f2
|
Locale refactor
|
2020-05-22 15:20:55 +02:00 |
Carlos Jimenez Ruiz
|
55c4ccdb29
|
Merge pull request 'searchbar translates' (#261) from 2247-refactor_searchBar into dev
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
|
2020-05-20 08:52:20 +02:00 |
Juan Ferrer
|
e7cf060e12
|
Merge fixes
|
2020-05-19 10:51:50 +02:00 |
Bernat Exposito Domenech
|
d289c17530
|
searchbar translates
|
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
|
2020-05-18 14:03:15 +02:00 |