joan
|
0ffa39e55b
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-11-05 15:06:24 +01:00 |
|
joan
|
25efbac793
|
left-menu with collapsable menu #780
|
2018-11-05 15:06:13 +01:00 |
Juan
|
f02f3938dd
|
vnSearchbar - General search reflected in a new field in the panel
|
2018-11-05 10:14:31 +01:00 |
|
Juan
|
a50a98668c
|
VnModel.crud() bugs fixed (#784) and code refactor, VnMysql refactor
|
2018-11-02 15:44:27 +01:00 |
|
Juan
|
31b86fce6d
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-10-30 16:03:53 +01:00 |
|
Juan
|
74c00ef2f0
|
Ticket index fixes
|
2018-10-30 16:03:46 +01:00 |
Gerard
|
a2db6201aa
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-10-30 15:04:04 +01:00 |
|
Gerard
|
74d72fddfb
|
#760 ticket.ticketWeekly
|
2018-10-30 14:57:22 +01:00 |
|
Juan
|
260f548019
|
#599 Advanced ticket search, eslint rules fixed, e2e ticket_04 refactor
|
2018-10-30 13:58:02 +01:00 |
Carlos Jimenez
|
5423744489
|
Merge branch 'dev' of http://git.verdnatura.es/salix into dev
|
2018-10-29 10:42:52 +01:00 |
|
Carlos Jimenez
|
a8355ff455
|
#756 ticket.sale-tracking scss fixes
|
2018-10-29 10:42:43 +01:00 |
|
Gerard
|
36f048e4ef
|
Bug #772 Ticket expeditions ha dejado de funcionar
|
2018-10-29 09:39:37 +01:00 |
|
Carlos Jimenez
|
53fe9b6103
|
#756 ticket.sale-tracking checking state functionality
|
2018-10-29 08:33:53 +01:00 |
|
Carlos Jimenez
|
2a9dd98e6a
|
#756 ticket.sale-tracking
|
2018-10-28 12:36:41 +01:00 |
|
Gerard
|
47a9ec6101
|
#758 no se muestran Base, Margen y Total en ticket components
|
2018-10-25 10:54:16 +02:00 |
|
Gerard
|
0b112b3d59
|
#744 fix edit sale bug
|
2018-10-23 14:33:07 +02:00 |
|
Gerard
|
6b03ead37d
|
#744 fix edit sale bug, boton MAS descuento
|
2018-10-23 12:39:25 +02:00 |
|
Gerard
|
1a116df136
|
#636 item.index
|
2018-10-22 14:32:05 +02:00 |
|
Juan
|
0034991251
|
Events on elements now are emitted after component linking
|
2018-10-22 13:29:52 +02:00 |
|
Juan
|
93ed02e901
|
Merge
|
2018-10-22 08:24:16 +02:00 |
|
Juan
|
e5b404cc2c
|
Models bugs fixed, tests fixed
|
2018-10-22 08:23:10 +02:00 |
|
Carlos Jimenez
|
2bdfa6ff60
|
#633 El descriptor-popover + test
|
2018-10-18 11:41:25 +02:00 |
|
Juan
|
ecee07530a
|
Merge
|
2018-10-18 09:26:05 +02:00 |
|
Juan
|
ee73068e9e
|
#659 - Unify model beta
|
2018-10-18 09:24:20 +02:00 |
 Joan Sanchez
|
693a68ea26
|
vn-icon-button hide required acl buttons #708
|
2018-10-11 09:41:30 +02:00 |
|
Joan Sanchez
|
31d655b130
|
Create ticket with transaction
|
2018-10-10 09:59:42 +02:00 |
|
Joan Sanchez
|
f7e042320d
|
regularize claim #656
|
2018-10-08 07:31:55 +02:00 |
|
Gerard
|
20e76fb28d
|
Tarea #646 item descriptor now passes the ticket id
|
2018-10-05 14:03:59 +02:00 |
|
Joan Sanchez
|
374d845d4b
|
Descriptor/card/quicklinks fix #656
|
2018-10-03 08:00:19 +02:00 |
|
Joan Sanchez
|
1e604d92b4
|
Sale tracking get state from saleTracking instead of ticket. #695
|
2018-10-01 08:17:36 +02:00 |
|
Joan Sanchez
|
d5ca385ccd
|
added zone index & zone create
|
2018-09-19 15:05:07 +02:00 |
|
gerard
|
5c6ab8efc3
|
skipped tests fixed
|
2018-09-18 09:52:50 +02:00 |
|
gerard
|
97f45e7475
|
focus added to all vn-searcbar in modules index
|
2018-09-17 14:54:38 +02:00 |
|
gerard
|
8d1aa30287
|
Bug #437 Boton cancelar
|
2018-09-14 08:14:52 +02:00 |
|
Carlos Jimenez
|
c2f8f236fb
|
#647 Si se hace control click en ticket.index abrir una nueva pestaña
|
2018-09-12 10:08:19 +02:00 |
 Javi Gallego
|
b6cc8c2fe0
|
merge
|
2018-09-11 13:44:49 +02:00 |
|
Javi Gallego
|
c9ec4aee7e
|
#612 añadir reclamacion
|
2018-09-11 12:49:31 +02:00 |
|
Joan Sanchez
|
a4c730cf65
|
enabled routes module #616
|
2018-09-07 09:40:45 +02:00 |
|
gerard
|
c33e741c14
|
fixed typo
|
2018-09-06 12:33:37 +02:00 |
|
Joan Sanchez
|
660310693f
|
ticket sale translation fix
|
2018-09-06 12:22:12 +02:00 |
|
Javi Gallego
|
588308cf1e
|
merge
|
2018-09-06 11:15:53 +02:00 |
|
Joan Sanchez
|
f330c77cc6
|
added span to descriptor-popover links #637
|
2018-09-06 08:04:43 +02:00 |
|
gerard
|
b2d0832daa
|
Added missing success mesage
|
2018-09-05 16:14:13 +02:00 |
|
Javi Gallego
|
955a7f0aae
|
merge
|
2018-09-04 12:01:44 +02:00 |
|
Javi Gallego
|
dda12c4b62
|
#460 expedition
|
2018-09-04 11:57:41 +02:00 |
|
Joan Sanchez
|
9da95f637e
|
descriptor quicklings fixed #593
|
2018-09-04 11:49:00 +02:00 |
|
Joan Sanchez
|
8879005854
|
fixed ticket list pagination
|
2018-08-31 12:39:57 +02:00 |
|
Joan Sanchez
|
f3fc211dfa
|
removed unused routes, filter and crud routes #409
|
2018-08-31 07:53:38 +02:00 |
|
Javi Gallego
|
c4e0fc74a3
|
Bug #452 quitamos servicio production
|
2018-08-30 11:02:50 +02:00 |
|
Joan Sanchez
|
c7ff42b409
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-23 10:08:15 +02:00 |
|
Joan Sanchez
|
be6b2aa247
|
updated ticket filter #461
|
2018-08-23 10:08:06 +02:00 |
|
gerard
|
c803a754d5
|
watcher deleted because it was causing bugs in this section
|
2018-08-23 08:58:28 +02:00 |
|
gerard
|
901c0f609b
|
bugs with date definition solved
|
2018-08-22 12:55:13 +02:00 |
|
Joan Sanchez
|
300b2c2a07
|
catalog filter #581
|
2018-08-21 13:38:16 +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
|
2d6932fe49
|
Little refactor
|
2018-08-20 14:52:37 +02:00 |
|
Joan Sanchez
|
a60720d1ed
|
Ticket packaging refactor + front test updated
|
2018-08-17 14:53:25 +02:00 |
|
Joan Sanchez
|
1786602187
|
Change landed on shipped change #458
|
2018-08-16 13:12:18 +02:00 |
|
Carlos Jimenez
|
b4321816be
|
#515 descriptor client unit test
|
2018-08-16 07:40:25 +02:00 |
|
Carlos Jimenez
|
8fa84c5074
|
#517 ticket index unit tests
|
2018-08-13 09:32:33 +02:00 |
|
Carlos Jimenez
|
5b81308cd9
|
#514 ticket step 3 clientside unit tests
|
2018-08-12 10:55:16 +02:00 |
|
Joan Sanchez
|
a3d15965ab
|
packaging & component back tests
|
2018-08-10 11:40:48 +02:00 |
|
Joan Sanchez
|
3c79f3cc7b
|
ticket summary unit test
|
2018-08-10 07:43:39 +02:00 |
|
Joan Sanchez
|
337b4114f0
|
address & ticket card front unit tests
|
2018-08-09 14:42:02 +02:00 |
|
Joan Sanchez
|
2fc7c0a807
|
Fixed translations
|
2018-08-09 08:57:16 +02:00 |
|
Joan Sanchez
|
671c6bd3ff
|
Ticket list refactor. Ticket problems, ticket total #245 & #461
|
2018-08-08 14:26:54 +02:00 |
|
gerard
|
f170f7b621
|
sale now rolls back to olda data when it cant update the price
|
2018-08-07 16:06:44 +02:00 |
|
Joan Sanchez
|
8228f49eed
|
Fixed ticket basic data message type
|
2018-08-06 14:25:11 +02:00 |
|
gerard
|
7367792d91
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-06 11:58:08 +02:00 |
Bernat
|
c177bc7ab9
|
fix test and fixtures for itemTags updated
|
2018-08-03 08:29:38 +02:00 |
|
gerard
|
a758cad2de
|
focus deleted
|
2018-08-03 08:25:13 +02:00 |
|
Joan Sanchez
|
901398cfa7
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-08-03 07:52:44 +02:00 |
|
Joan Sanchez
|
8ce1e5ebf7
|
Added ticket pictures section #430
|
2018-08-03 07:52:37 +02:00 |
|
gerard
|
2fa91ef59d
|
getVAT now doesn't make a call when it can't
|
2018-08-02 15:39:32 +02:00 |
|
gerard
|
17b70192af
|
Bug #576 Cambiar los bindings del textfield
|
2018-08-02 15:34:48 +02:00 |
|
gerard
|
84462be55a
|
revert Bug #575 ng-click se llama en los vn-button deshabilitados
|
2018-08-02 15:33:24 +02:00 |
|
gerard
|
ee3627be16
|
Bug #575 ng-click se llama en los vn-button deshabilitados
|
2018-08-02 11:34:50 +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
|
d83665a0c5
|
show itemDiary icon on ticket descriptor popover. #441 - CR Javi
|
2018-08-01 12:15:09 +02:00 |
|
Carlos Jimenez
|
b5356eb07d
|
spec files renamed accordingly, plus linter or indentation corrections
|
2018-08-01 09:47:34 +02:00 |
|
Carlos Jimenez
|
5aae572566
|
renamed spec files plus fixtures update for ticket basicdata #462 e2e
|
2018-07-31 13:49:54 +02:00 |
|
gerard
|
564d4f63b8
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-30 14:46:09 +02:00 |
|
gerard
|
2d9edcef52
|
fixed wrong calls to functions
|
2018-07-30 14:46:04 +02:00 |
|
Carlos Jimenez
|
7b7a0cc1e9
|
refactor para que funcione data bind en lineas de pedido
|
2018-07-30 14:05:27 +02:00 |
|
gerard
|
38ba6bae7a
|
Bug #453 Fallo al cambiar el estaddo de un ticket desde sale
|
2018-07-27 12:20:10 +02:00 |
|
gerard
|
f87ccee0b2
|
fixed bugs of client descriptor popover
|
2018-07-27 09:44:25 +02:00 |
|
gerard
|
d2359af6ba
|
added client descriptor popover to ticket descriptor
|
2018-07-26 14:02:23 +02:00 |
|
gerard
|
fa9494fe03
|
added styles
|
2018-07-26 13:49:01 +02:00 |
|
gerard
|
296508d216
|
Tarea #428 Componentizar descriptor de client
|
2018-07-26 12:06:53 +02:00 |
|
gerard
|
d569c19a8a
|
readded scope refresh
|
2018-07-26 09:16:33 +02:00 |
|
gerard
|
0f1227a47b
|
removed dummy buttons
|
2018-07-26 09:12:25 +02:00 |
|
Joan Sanchez
|
2433d7684d
|
Change page title #426
|
2018-07-25 15:14:03 +02:00 |
|
gerard
|
82b0323847
|
Bug #431 error con tickets sin foto
|
2018-07-25 11:37:15 +02:00 |
|
gerard
|
b68f34d3d4
|
Tarea #427 mover create order de ticket a order
|
2018-07-24 13:48:31 +02:00 |
|
gerard
|
446a503ee5
|
Merge branch 'dev' of https://git.verdnatura.es/salix into dev
|
2018-07-24 12:22:54 +02:00 |
|
gerard
|
a04b592633
|
padding added
|
2018-07-24 12:22:49 +02:00 |
|
Joan Sanchez
|
bea6378f6a
|
Change shipment date on landed data selection. #410
|
2018-07-24 12:14:35 +02:00 |
|
gerard
|
5d64376212
|
rollback
|
2018-07-23 14:45:01 +02:00 |
|
gerard
|
17e1bd351c
|
Tarea #401 Links con texto subrayado
|
2018-07-23 10:59:49 +02:00 |
|
gerard
|
71d63aea4f
|
watchers reducidos
|
2018-07-19 14:09:50 +02:00 |