Carlos Jimenez
|
d2eaa62461
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-21 08:08:49 +02:00 |
|
Carlos Jimenez
|
e925146c73
|
#547 ticket/new.js Backend unit tests plus order new refactor
|
2018-08-21 08:08:39 +02:00 |
gerard
|
ca523e634c
|
Bug #589 cambiar el estado desde ticket.sales no guarda el historico
|
2018-08-21 07:39:01 +02:00 |
|
gerard
|
d364025b19
|
added translations
|
2018-08-20 14:51:13 +02:00 |
|
Carlos Jimenez
|
f942732d48
|
#555 item model back unit test
|
2018-08-20 10:06:00 +02:00 |
|
Carlos Jimenez
|
065f2126bf
|
#564 new.js Backend unit tests
|
2018-08-17 16:12:05 +02:00 |
 Joan Sanchez
|
7c4eda87a2
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-17 15:03:53 +02:00 |
|
Joan Sanchez
|
a60720d1ed
|
Ticket packaging refactor + front test updated
|
2018-08-17 14:53:25 +02:00 |
Bernat
|
42fa3d0e69
|
update fixtures table client
|
2018-08-17 14:52:54 +02:00 |
|
Carlos Jimenez
|
d0fff2135e
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-17 13:26:07 +02:00 |
|
Carlos Jimenez
|
8706f5c6c0
|
#531 moveToTicket.js Backend unit tests
|
2018-08-17 13:23:07 +02:00 |
|
Bernat
|
77641666da
|
update fixtures table client
|
2018-08-17 13:14:10 +02:00 |
|
Carlos Jimenez
|
8ccab773c0
|
corrected a problem where dynamic dates were giving false test failures
|
2018-08-17 09:56:50 +02:00 |
|
Carlos Jimenez
|
a6be927a1f
|
small refactor
|
2018-08-17 09:29:00 +02:00 |
|
Joan Sanchez
|
4fff408e68
|
back test priceDifference
|
2018-08-17 08:41:30 +02:00 |
|
Bernat
|
6e6cf47c5a
|
update procedure agencyHourGetLanded
|
2018-08-16 14:31:11 +02:00 |
|
Carlos Jimenez
|
5e9c3461e6
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-16 14:00:50 +02:00 |
|
Carlos Jimenez
|
2e88957c8b
|
#534 reserve.js Backend unit tests
|
2018-08-16 14:00:37 +02:00 |
|
Joan Sanchez
|
611f612068
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-16 13:12:20 +02:00 |
|
Joan Sanchez
|
1786602187
|
Change landed on shipped change #458
|
2018-08-16 13:12:18 +02:00 |
|
Carlos Jimenez
|
51e5e76edd
|
#527 getLastEntries.js unit tests + fixtures + threeKastActive refactor
|
2018-08-16 12:10:56 +02:00 |
|
Carlos Jimenez
|
8f385798b6
|
corrected errors
|
2018-08-14 14:52:39 +02:00 |
|
Carlos Jimenez
|
5cfd5c7605
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-14 14:32:40 +02:00 |
|
Carlos Jimenez
|
25b5cfe99f
|
#549 threeLastActive.js Backend unit tests
|
2018-08-14 14:32:27 +02:00 |
|
Joan Sanchez
|
0efa85c2fb
|
updated ticket filter
|
2018-08-14 13:36:02 +02:00 |
|
Carlos Jimenez
|
35a8a7d7dc
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-14 12:50:10 +02:00 |
|
Carlos Jimenez
|
0c3072fb13
|
#536 updatePrice.js backend unit test
|
2018-08-14 12:48:12 +02:00 |
|
Bernat
|
829f9d33cd
|
add new procedure agencyHourGetLanded
|
2018-08-14 12:03:20 +02:00 |
|
Carlos Jimenez
|
be132e33cb
|
#561 getTotalVolume.js back unit test + servicesDir added to spec files
|
2018-08-14 11:52:10 +02:00 |
|
Carlos Jimenez
|
c14fe295d7
|
#474 descriptor-popover Front unit test and refactor of other test
|
2018-08-14 09:12:28 +02:00 |
|
Carlos Jimenez
|
27bc339721
|
#522 updateBillingData.js Backend unit tests
|
2018-08-13 16:54:34 +02:00 |
|
Carlos Jimenez
|
24ad4a83a1
|
#521 updateBasicData.js Backend unit tests
|
2018-08-13 14:52:05 +02:00 |
|
Carlos Jimenez
|
9268fdb2da
|
#523 updateFiscalData.js Backend unit tests plus refactor
|
2018-08-13 14:10:03 +02:00 |
|
Carlos Jimenez
|
bd2befe3ef
|
removed an fdescribe, added servicesDir to some spec files and refactors
|
2018-08-13 13:11:37 +02:00 |
|
Carlos Jimenez
|
51f7958612
|
removed unexpected focus on describe
|
2018-08-13 12:46:56 +02:00 |
|
Carlos Jimenez
|
fbe0cf2111
|
#556 state back end unit test
|
2018-08-13 12:46:11 +02:00 |
|
gerard
|
c62ed68d28
|
Tarea #541 /methods/ticket/deleted.js Backend unit tests
|
2018-08-10 17:18:21 +02:00 |
|
gerard
|
4076934644
|
Tarea #541 /methods/ticket/deleted.js
|
2018-08-10 17:17:53 +02:00 |
|
gerard
|
ac90bb3b18
|
/ticket/getSalesPersonMana.js Backend unit tests
|
2018-08-10 16:31:44 +02:00 |
|
gerard
|
06a3f0b6bc
|
/order/getTotal.js Backend unit tests
|
2018-08-10 16:30:18 +02:00 |
|
gerard
|
3875f4298c
|
filter modified to get the prices of a product
|
2018-08-10 16:15:17 +02:00 |
|
gerard
|
9b2a2b7a9f
|
translations added
|
2018-08-10 13:22:11 +02:00 |
|
Carlos Jimenez
|
b43f8d2d58
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-10 12:05:48 +02:00 |
|
Carlos Jimenez
|
b4d2e29d5f
|
#537 updateQuantity.js Backend unit tests
|
2018-08-10 12:05:36 +02:00 |
|
Joan Sanchez
|
a3d15965ab
|
packaging & component back tests
|
2018-08-10 11:40:48 +02:00 |
|
Joan Sanchez
|
f15d8c3087
|
front & back tests
|
2018-08-09 12:54:29 +02:00 |
|
Joan Sanchez
|
2fc7c0a807
|
Fixed translations
|
2018-08-09 08:57:16 +02:00 |
|
gerard
|
feb80006ab
|
Tarea #562 /order/getVolumes.js
|
2018-08-08 16:15:53 +02:00 |
|
gerard
|
505ad27217
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-08 14:45:39 +02:00 |
|
gerard
|
4b0a75cc0c
|
Bug #422 refactorizar el summary y el card de item y añadir el visible y el available
|
2018-08-08 14:44:45 +02:00 |
|
gerard
|
1d15e82a64
|
Bug #422 refactorizar el summary de item
|
2018-08-08 14:42:57 +02:00 |
|
Joan Sanchez
|
671c6bd3ff
|
Ticket list refactor. Ticket problems, ticket total #245 & #461
|
2018-08-08 14:26:54 +02:00 |
|
Bernat
|
3fef95aeef
|
update fixtures ticket 21 changes for Gerard
|
2018-08-07 18:57:32 +02:00 |
|
gerard
|
93810c381b
|
translations added
|
2018-08-07 16:10:10 +02:00 |
|
gerard
|
65ffade0a3
|
Tarea #438 order.line
|
2018-08-07 16:04:42 +02:00 |
|
gerard
|
da9a783843
|
Tarea #438 order.line
|
2018-08-07 15:48:55 +02:00 |
|
gerard
|
4c45db1c16
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-07 15:41:42 +02:00 |
|
gerard
|
f2be6cac17
|
Tarea #545 /ticket/isEditable.js Backend unit tests
|
2018-08-07 15:38:44 +02:00 |
|
Carlos Jimenez
|
e094fe4456
|
#568 ticket-packaging.js Backend unit tests
|
2018-08-07 15:04:06 +02:00 |
|
Carlos Jimenez
|
a44719c1ec
|
#552 account.js backend unit tests
|
2018-08-07 12:17:34 +02:00 |
|
Carlos Jimenez
|
9bd69baaf1
|
#569 ticket tracking back unit tests plus tiny refactor
|
2018-08-07 11:06:40 +02:00 |
|
Bernat
|
3b3bc52b53
|
add procedure orderListTax
|
2018-08-06 21:00:44 +02:00 |
|
Bernat
|
e067420255
|
update fixtures, change id item 6 for 71
|
2018-08-06 20:10:39 +02:00 |
|
Carlos Jimenez
|
1a7930308c
|
the test now fails if the tests fails to get into the catch and an item gets cloned
|
2018-08-06 14:34:44 +02:00 |
|
Joan Sanchez
|
8228f49eed
|
Fixed ticket basic data message type
|
2018-08-06 14:25:11 +02:00 |
|
Joan Sanchez
|
a0bae4ab46
|
Updated letter-debtor sample
|
2018-08-06 14:09:37 +02:00 |
|
Carlos Jimenez
|
084896c69a
|
#524 backend clone.js unit tests
|
2018-08-06 12:00:29 +02:00 |
|
Carlos Jimenez
|
ddf138007b
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-03 12:02:39 +02:00 |
|
Carlos Jimenez
|
1d4de8c3bd
|
added selectors for #459 e2e lineas de ticket
|
2018-08-03 12:02:04 +02:00 |
|
Bernat
|
c177bc7ab9
|
fix test and fixtures for itemTags updated
|
2018-08-03 08:29:38 +02:00 |
|
gerard
|
19e72c86cf
|
added translations
|
2018-08-02 15:35:48 +02:00 |
|
gerard
|
9e39c28b51
|
Translations updated
|
2018-08-02 11:06:30 +02:00 |
|
gerard
|
71a559783c
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-02 10:54:08 +02:00 |
|
gerard
|
49ea108771
|
Bug #571 usuario con privilegios cambia el estado de un ticket bloqueado
|
2018-08-02 10:54:03 +02:00 |
|
Joan Sanchez
|
ff0f0436af
|
Fixed locales: client & back-end validations, back-end UserError. #464
|
2018-08-02 09:49:00 +02:00 |
|
Bernat
|
bde19ffdc8
|
update fixtures, fix problems with item Visible and Available
|
2018-08-01 19:33:22 +02:00 |
|
Carlos Jimenez
|
d8fb0b2d95
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-08-01 14:01:59 +02:00 |
|
Carlos Jimenez
|
d799ac8100
|
renamed spec files accordingly plus linter and indentation corrections
|
2018-08-01 14:01:42 +02:00 |
|
Bernat
|
0c6ae08d4a
|
change idWorker from to users and fix back unit test
|
2018-08-01 13:24:38 +02:00 |
|
Bernat
|
0447d2f521
|
update fixtures
|
2018-07-31 15:03:53 +02:00 |
|
Carlos Jimenez
|
5aae572566
|
renamed spec files plus fixtures update for ticket basicdata #462 e2e
|
2018-07-31 13:49:54 +02:00 |
|
Joan Sanchez
|
4103f7fcf6
|
Added sample create #440
|
2018-07-31 11:08:22 +02:00 |
|
Bernat
|
81c6546e96
|
update fixtures
|
2018-07-30 20:45:26 +02:00 |
|
Bernat
|
8e1ef327c2
|
add model ClaimDevelopment
|
2018-07-30 20:16:25 +02:00 |
|
Bernat
|
c3956b2354
|
add model ClaimDevelopment
|
2018-07-30 15:41:02 +02:00 |
|
Bernat
|
1ec3777f4a
|
update fixtures and fix test
|
2018-07-30 15:21:12 +02:00 |
|
Bernat
|
23b7e5a0cc
|
update fixtures and add new models for claim module
|
2018-07-30 14:10:09 +02:00 |
|
gerard
|
97cbb4fb25
|
Iban validation for french clients desactivated
|
2018-07-27 15:13:01 +02:00 |
|
Joan Sanchez
|
23993ce717
|
updated model sample & clientSample
|
2018-07-27 11:18:27 +02:00 |
|
Bernat
|
4e2ff17121
|
add new models and fixtures
|
2018-07-25 20:47:07 +02:00 |
|
Joan Sanchez
|
2433d7684d
|
Change page title #426
|
2018-07-25 15:14:03 +02:00 |
|
gerard
|
b68f34d3d4
|
Tarea #427 mover create order de ticket a order
|
2018-07-24 13:48:31 +02:00 |
|
gerard
|
81dc09999f
|
Tarea #406 order.volumen
|
2018-07-24 12:57:07 +02:00 |
|
gerard
|
a7ec730216
|
bug with barcodes solved
|
2018-07-24 12:56:07 +02:00 |
|
Joan Sanchez
|
bea6378f6a
|
Change shipment date on landed data selection. #410
|
2018-07-24 12:14:35 +02:00 |
|
gerard
|
dc60156277
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-24 11:36:28 +02:00 |
|
gerard
|
7e62f2afa7
|
excluded french TIN test as it has been disabled
|
2018-07-24 11:36:07 +02:00 |
|
Bernat
|
6b73a6392f
|
update fixtures
|
2018-07-24 11:32:10 +02:00 |
|
gerard
|
3dfa4bfc04
|
Bug #425 Split no funciona en produccion
|
2018-07-24 11:27:04 +02:00 |
|
Joan Sanchez
|
896c033594
|
added order catalogue #408
|
2018-07-24 09:35:23 +02:00 |
|
Bernat
|
d2904bd065
|
update fixtures
|
2018-07-24 08:11:55 +02:00 |
|
Bernat
|
65bf807195
|
update fixtures
|
2018-07-24 08:01:04 +02:00 |
|
Bernat
|
78f3376c20
|
export production structure DB to local
|
2018-07-24 07:34:14 +02:00 |
|
gerard
|
72d9212262
|
Bug #422 refactorizar el summary de item y añadir el visible y avaible
|
2018-07-23 09:58:07 +02:00 |
|
gerard
|
9a80f22e93
|
Tarea #405 crear order
|
2018-07-20 16:32:34 +02:00 |
|
Bernat
|
4ba541bec2
|
update structure
|
2018-07-20 11:30:55 +02:00 |
|
Bernat
|
62988fade8
|
update structure
|
2018-07-20 09:42:08 +02:00 |
|
Joan Sanchez
|
2c9ace654e
|
payment update mail fr translation
|
2018-07-19 14:16:51 +02:00 |
|
Bernat
|
eb159453cf
|
update structure
|
2018-07-19 09:44:58 +02:00 |
|
gerard
|
51e96d0bbf
|
Tarea #417 quitar de item.clone la foto
|
2018-07-18 14:34:45 +02:00 |
|
gerard
|
3c3abb9063
|
Tarea #405 crear order
|
2018-07-18 14:21:58 +02:00 |
|
Joan Sanchez
|
ebf38e225e
|
Deleted unused filter methods, fixed summary css
|
2018-07-18 13:18:40 +02:00 |
|
gerard
|
1542e38746
|
quitada la validacion del dni frances
|
2018-07-18 09:49:04 +02:00 |
|
Joan Sanchez
|
291c00e2da
|
Show address city & province on ticket summary #414
|
2018-07-18 09:23:51 +02:00 |
|
Bernat
|
c9a43d98b8
|
update structure
|
2018-07-17 14:09:59 +02:00 |
|
Bernat
|
8c7f05785c
|
update structure
|
2018-07-17 13:39:20 +02:00 |
 Javi Gallego
|
56344ac301
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-17 13:11:20 +02:00 |
|
Joan Sanchez
|
ef71f5c7cf
|
item & ticket crud-refactor #372
|
2018-07-17 08:44:31 +02:00 |
|
Bernat
|
7e1a2025a5
|
update structure
|
2018-07-17 08:34:27 +02:00 |
|
gerard
|
ee1ee77240
|
bug solved
|
2018-07-16 14:24:03 +02:00 |
|
Bernat
|
8040db4d17
|
update structure
|
2018-07-16 13:23:54 +02:00 |
|
Javi Gallego
|
77e0494b37
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-16 12:34:03 +02:00 |
|
Joan Sanchez
|
75d7c79af1
|
item crud model refactor #372
|
2018-07-16 09:28:32 +02:00 |
|
gerard
|
4cf5777b4e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-16 09:19:44 +02:00 |
|
gerard
|
467df7acbe
|
bugs solved
|
2018-07-16 09:19:38 +02:00 |
|
Joan Sanchez
|
bd37f91c46
|
client crud-model refactor #372
|
2018-07-16 08:00:04 +02:00 |
|
gerard
|
84e61c6cdf
|
Bug fixed
|
2018-07-16 07:55:13 +02:00 |
|
gerard
|
13e9b53a73
|
#390 Crear nuevo tipo de textfield
|
2018-07-13 15:21:37 +02:00 |
|
gerard
|
ef9b72b78c
|
Bug #331 Revisar los ACL en back-end
|
2018-07-13 12:37:58 +02:00 |
|
Joan Sanchez
|
dce8d16077
|
Deleted data
|
2018-07-12 13:53:52 +02:00 |
|
Bernat
|
755e0c1360
|
update structure
|
2018-07-12 08:43:41 +02:00 |
|
gerard
|
675c6be73e
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-11 13:52:35 +02:00 |
|
Bernat
|
c65211de46
|
update structure DB
|
2018-07-11 13:52:10 +02:00 |
|
gerard
|
67030370a1
|
Bug #398 El SPLUR crea los nuevos tickets sin Alias(nickname)
|
2018-07-11 13:52:04 +02:00 |
|
Bernat
|
26a0ee1096
|
update ACL
|
2018-07-11 08:47:20 +02:00 |
|
gerard
|
7ecefab8ce
|
cleanup
|
2018-07-10 15:36:59 +02:00 |
|
gerard
|
0f795102cb
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-10 14:55:20 +02:00 |
|
gerard
|
1df2daa569
|
Bug #379 Loopback trata las horas en UTC y deberia tratarlas en CEST
|
2018-07-10 14:55:13 +02:00 |
|
Joan Sanchez
|
2d020268fe
|
Change dueDay to 5 only with paymethod with iban #341
|
2018-07-10 14:13:47 +02:00 |
|
Bernat
|
841a72a269
|
update fixtures
|
2018-07-10 10:55:35 +02:00 |
Juan
|
303290af53
|
Merge
|
2018-07-09 18:07:02 +02:00 |
|
Juan
|
542d9dca86
|
#345 - Filter items by tag
|
2018-07-09 18:06:25 +02:00 |
|
gerard
|
f4417f924a
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-09 13:54:49 +02:00 |
|
gerard
|
18929e379c
|
Tarea #356 Crear Order
|
2018-07-09 13:54:43 +02:00 |
|
Joan Sanchez
|
10953841ec
|
show grade on client summary + fix insurance datetime #375
|
2018-07-09 13:01:46 +02:00 |
|
gerard
|
e90ba9d785
|
Bug #379 Loopback guarda las horas en UTC
|
2018-07-09 12:47:22 +02:00 |
|
Joan Sanchez
|
5608b1bd26
|
itemDiary alertLevel replaced by state name #384
|
2018-07-09 09:37:38 +02:00 |
|
Juan
|
96d755cd21
|
Code linting, code clean
|
2018-07-06 16:32:23 +02:00 |
|
Joan Sanchez
|
9a87a40293
|
Fixed ticketPriceDifference, fixed ticketComponentUpdate #385
|
2018-07-06 12:43:34 +02:00 |
|
gerard
|
f3f86c2dff
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-06 08:19:07 +02:00 |