 Luca Haid
|
5026ec5bdd
|
Merge branch 'rework-dashboard' into 'master'
Added new Dashboard
See merge request fronk/thetool!869
|
2025-01-09 15:38:06 +00:00 |
|
|
Luca Haid
|
6aa797a006
|
Added new Dashboard
|
2025-01-09 16:37:36 +01:00 |
|
|
Luca Haid
|
5b60d76bbd
|
Merge branch 'revert-preorder' into 'master'
Reverted Filter
See merge request fronk/thetool!864
|
2025-01-08 10:58:15 +00:00 |
|
|
Luca Haid
|
bb3b27b9b8
|
Reverted Filter
|
2025-01-08 11:57:54 +01:00 |
|
|
Luca Haid
|
91b9c994d0
|
Update Preorder\Index.php
|
2025-01-08 10:30:48 +00:00 |
|
|
Luca Haid
|
aa1b54312c
|
Revert Previous changes
|
2025-01-08 10:30:17 +00:00 |
|
|
Luca Haid
|
657e707abd
|
Fixed Preorder Filter Bug
|
2025-01-08 10:21:04 +00:00 |
|
|
Luca Haid
|
125316234d
|
Merge branch 'add-preorder-filter' into 'master'
Fixed Filter
See merge request fronk/thetool!863
|
2025-01-08 08:03:49 +00:00 |
|
|
Luca Haid
|
9e95111fad
|
Fixed Filter
|
2025-01-08 09:03:33 +01:00 |
|
|
Luca Haid
|
7c97689ac3
|
Merge branch 'add-preorder-filter' into 'master'
Added new "Netzbesitzer" Filter inside Preorder
See merge request fronk/thetool!862
|
2025-01-08 07:47:01 +00:00 |
|
|
Luca Haid
|
ff0ec543b3
|
Added new "Netzbesitzer" Filter inside Preorder
|
2025-01-08 08:46:12 +01:00 |
|
|
Luca Haid
|
88267b72bd
|
Merge branch 'improve-order-request' into 'master'
implemented new features for warehouseorderrequest
See merge request fronk/thetool!857
|
2025-01-07 15:49:50 +00:00 |
|
|
Luca Haid
|
f622204aa0
|
implemented new features for warehouseorderrequest
|
2025-01-07 16:49:20 +01:00 |
|
|
Luca Haid
|
dcc18a5446
|
Update HistoricBillModel.php
|
2025-01-02 10:02:17 +00:00 |
|
|
Luca Haid
|
c01308d633
|
Update HistoricBillModel.php
|
2025-01-02 09:55:48 +00:00 |
|
|
Luca Haid
|
47b8c8c62d
|
Merge branch 'historic-bill-update' into 'master'
added 2 new columns to historicbill
See merge request fronk/thetool!852
|
2025-01-02 09:49:04 +00:00 |
|
|
Luca Haid
|
04bc973160
|
added 2 new columns to historicbill
|
2025-01-02 10:48:24 +01:00 |
|
|
Luca Haid
|
e6e6b8b3c6
|
Merge branch 'reorder-preorder-filter' into 'master'
added new orderrequest module
See merge request fronk/thetool!842
|
2024-12-23 08:34:23 +00:00 |
|
|
Luca Haid
|
2a3ddf9a92
|
added new orderrequest module
|
2024-12-23 09:33:42 +01:00 |
|
|
Luca Haid
|
0086a705f8
|
Merge branch 'reorder-preorder-filter' into 'master'
reordered preorder filters
See merge request fronk/thetool!839
|
2024-12-20 07:38:44 +00:00 |
|
|
Luca Haid
|
203a9a7bf6
|
reordered preorder filters
|
2024-12-20 08:37:21 +01:00 |
|
|
Luca Haid
|
f9ee2ba39f
|
Merge branch 'shipping-note-fix-float-hours' into 'master'
fixed new borderpoint filter
See merge request fronk/thetool!838
|
2024-12-19 13:23:19 +00:00 |
|
|
Luca Haid
|
b14a34c82b
|
fixed new borderpoint filter
|
2024-12-19 14:22:50 +01:00 |
|
|
Luca Haid
|
cd40975e9c
|
Merge branch 'shipping-note-fix-float-hours' into 'master'
fixed new borderpoint filter
See merge request fronk/thetool!837
|
2024-12-19 13:20:53 +00:00 |
|
|
Luca Haid
|
5bda708fd3
|
fixed new borderpoint filter
|
2024-12-19 14:20:32 +01:00 |
|
|
Luca Haid
|
2496758111
|
Merge branch 'shipping-note-fix-float-hours' into 'master'
added new borderpoint filter for preorder
See merge request fronk/thetool!835
|
2024-12-19 13:14:46 +00:00 |
|
|
Luca Haid
|
616f76c37e
|
added new borderpoint filter for preorder
|
2024-12-19 14:14:00 +01:00 |
|
|
Luca Haid
|
f3947aa812
|
Merge branch 'shipping-note-fix-float-hours' into 'master'
fixed shipping note
See merge request fronk/thetool!834
|
2024-12-19 13:05:09 +00:00 |
|
|
Luca Haid
|
93ce386615
|
fixed shipping note
|
2024-12-19 14:04:29 +01:00 |
|
|
Luca Haid
|
dfa64578ea
|
Merge branch 'update-preorder-filter' into 'master'
Added new filters // borderpoint is still missing
See merge request fronk/thetool!831
|
2024-12-19 09:44:56 +00:00 |
|
|
Luca Haid
|
991568cc87
|
Added new filters // borderpoint is still missing
|
2024-12-19 10:44:28 +01:00 |
|
|
Luca Haid
|
6a09c9c03b
|
Merge branch 'add-project-api' into 'master'
Added function to search for Tickets in OpenProject
See merge request fronk/thetool!824
|
2024-12-18 08:45:10 +00:00 |
|
|
Luca Haid
|
801c162922
|
Added function to search for Tickets in OpenProject
|
2024-12-18 09:43:43 +01:00 |
|
|
Luca Haid
|
5928fab974
|
Update WarehouseShippingNoteModel.php
|
2024-12-16 13:18:16 +00:00 |
|
|
Luca Haid
|
60039cf441
|
Update WarehouseShippingNoteController.php
|
2024-12-16 13:16:08 +00:00 |
|
|
Luca Haid
|
27ac09d87d
|
Merge branch 'shipping-note-add-direct-url-create' into 'master'
Shipping note add direct url create
See merge request fronk/thetool!814
|
2024-12-13 07:25:55 +00:00 |
|
|
Luca Haid
|
35251c5ee5
|
Shipping note add direct url create
|
2024-12-13 07:25:55 +00:00 |
|
|
Luca Haid
|
bc97bcb9a9
|
Update WarehouseShippingNoteController.php
|
2024-12-11 10:02:55 +00:00 |
|
|
Luca Haid
|
f541dcdb55
|
Merge branch 'feature/tt-button-fix' into 'master'
Fixed Error when no additional class was set
See merge request fronk/thetool!804
|
2024-12-11 08:53:37 +00:00 |
|
|
Luca Haid
|
444b740b31
|
Merge branch 'feature/warehouse-improve-2' into 'master'
Feature/warehouse improve 2
See merge request fronk/thetool!803
|
2024-12-10 14:41:21 +00:00 |
|
|
Luca Haid
|
9fb8758ac4
|
Feature/warehouse improve 2
|
2024-12-10 14:41:20 +00:00 |
|
|
Luca Haid
|
8bd8ed8619
|
Merge branch 'feature/warehouse-improve-2' into 'master'
Feature/warehouse improve 2
See merge request fronk/thetool!802
|
2024-12-10 13:55:53 +00:00 |
|
|
Luca Haid
|
2b14953318
|
Feature/warehouse improve 2
|
2024-12-10 13:55:53 +00:00 |
|
|
Luca Haid
|
7c0491cdff
|
Merge branch 'eshop-only-admin-price' into 'master'
fixed error if no articlenumber is found
See merge request fronk/thetool!801
|
2024-12-10 13:06:42 +00:00 |
|
|
Luca Haid
|
efdf432511
|
fixed error if no articlenumber is found
|
2024-12-10 14:05:42 +01:00 |
|
|
Luca Haid
|
ec23d40caf
|
Merge branch 'eshop-only-admin-price' into 'master'
dont show price for non admins
See merge request fronk/thetool!800
|
2024-12-10 12:57:01 +00:00 |
|
|
Luca Haid
|
c73bc38084
|
dont show price for non admins
|
2024-12-10 13:56:06 +01:00 |
|
|
Luca Haid
|
d275d6823d
|
Merge branch 'fix-eshop-shipping-note' into 'master'
added articlenumber for article and shipping note
See merge request fronk/thetool!799
|
2024-12-10 12:51:24 +00:00 |
|
|
Luca Haid
|
77fd40dd9d
|
added articlenumber for article and shipping note
|
2024-12-10 13:49:24 +01:00 |
|
|
Luca Haid
|
39548df762
|
Merge branch 'fix-eshop-shipping-note' into 'master'
Fixed Bug when creating warehouse e shop shipping note
See merge request fronk/thetool!797
|
2024-12-10 11:14:20 +00:00 |
|
|
Luca Haid
|
02a1106f5b
|
Fixed Bug when creating warehouse e shop shipping note
|
2024-12-10 12:11:38 +01:00 |
|
|
Luca Haid
|
2a5ebe4386
|
Merge branch 'fix-tt-autocomplete' into 'master'
Fixed Bug when typing that the first character is dismissed when clearing the input field
See merge request fronk/thetool!795
|
2024-12-10 10:52:31 +00:00 |
|
|
Luca Haid
|
18de84fcae
|
Fixed Bug when typing that the first character is dismissed when clearing the input field
|
2024-12-10 11:52:10 +01:00 |
|
|
Luca Haid
|
71630e1ee4
|
Merge branch 'feature/hide-warehouse-price' into 'master'
allow changing status
See merge request fronk/thetool!794
|
2024-12-10 08:31:01 +00:00 |
|
|
Luca Haid
|
fe77295648
|
allow changing status
|
2024-12-10 09:23:42 +01:00 |
|
|
Luca Haid
|
7309fdb840
|
Merge branch 'feature/hide-warehouse-price' into 'master'
hiding prices on shipping note for now on
See merge request fronk/thetool!793
|
2024-12-10 07:07:10 +00:00 |
|
|
Luca Haid
|
4130e33153
|
hiding prices on shipping note for now on
|
2024-12-10 08:06:30 +01:00 |
|
|
Luca Haid
|
a2b8a7b282
|
Merge branch 'feature/improve-shipping-note' into 'master'
changed shipping note
See merge request fronk/thetool!791
|
2024-12-09 12:19:53 +00:00 |
|
|
Luca Haid
|
9c8c57561a
|
changed shipping note
|
2024-12-09 13:18:52 +01:00 |
|
|
Luca Haid
|
c0e9bd7b4b
|
Merge branch 'feature/improve-shipping-note' into 'master'
changed shipping note
See merge request fronk/thetool!790
|
2024-12-09 12:16:48 +00:00 |
|
|
Luca Haid
|
d39ea5fa4c
|
changed shipping note
|
2024-12-09 13:16:34 +01:00 |
|
|
Luca Haid
|
e87af8efd4
|
Merge branch 'feature/improve-shipping-note' into 'master'
changed shipping note
See merge request fronk/thetool!789
|
2024-12-09 12:15:07 +00:00 |
|
|
Luca Haid
|
5e5feb3ce6
|
changed shipping note
|
2024-12-09 13:14:44 +01:00 |
|
|
Luca Haid
|
45a534246b
|
Merge branch 'feature/improve-address-search' into 'master'
improved search with ss or ß
See merge request fronk/thetool!770
|
2024-11-28 13:35:58 +00:00 |
|
|
Luca Haid
|
21b2f6d9c6
|
improved search with ss or ß
|
2024-11-28 13:35:57 +00:00 |
|
|
Luca Haid
|
3643e62b0b
|
Merge branch 'feature/warehouse-improve' into 'master'
Changed notify duration
See merge request fronk/thetool!769
|
2024-11-27 13:52:18 +00:00 |
|
|
Luca Haid
|
400c48643e
|
Changed notify duration
|
2024-11-27 13:52:17 +00:00 |
|
|
Luca Haid
|
d6aeee9f79
|
Merge branch 'feature/warehouse-improve' into 'master'
Changed notify duration
See merge request fronk/thetool!768
|
2024-11-27 13:46:01 +00:00 |
|
|
Luca Haid
|
1cf6b0f0b1
|
Changed notify duration
|
2024-11-27 13:46:00 +00:00 |
|
|
Luca Haid
|
a46a8479eb
|
Merge branch 'feature/warehouse-improve' into 'master'
Changed notify duration
See merge request fronk/thetool!767
|
2024-11-27 13:17:50 +00:00 |
|
|
Luca Haid
|
465509a0c6
|
Changed notify duration
|
2024-11-27 13:17:49 +00:00 |
|
|
Luca Haid
|
ef5e2b151e
|
Merge branch 'feature/partner-search-preorder' into 'master'
Removed Price as necesatiy
See merge request fronk/thetool!766
|
2024-11-27 11:54:41 +00:00 |
|
|
Luca Haid
|
6ee92de994
|
Removed Price as necesatiy
|
2024-11-27 12:54:22 +01:00 |
|
|
Luca Haid
|
436a3fb469
|
Merge branch 'feature/partner-search-preorder' into 'master'
added partner search to preorder
See merge request fronk/thetool!765
|
2024-11-27 11:30:40 +00:00 |
|
|
Luca Haid
|
2225e89a22
|
added partner search to preorder
|
2024-11-27 12:30:22 +01:00 |
|
|
Luca Haid
|
892ca52c23
|
Merge branch 'feature/warehouse-improve' into 'master'
fixed hoursEntries to be text
See merge request fronk/thetool!764
|
2024-11-27 09:57:32 +00:00 |
|
|
Luca Haid
|
58e868eac0
|
fixed hoursEntries to be text
|
2024-11-27 10:54:58 +01:00 |
|
|
Luca Haid
|
7aeea7d882
|
Merge branch 'feature/warehouse-shipping-note-additional-fix' into 'master'
switched 2 inputs
See merge request fronk/thetool!762
|
2024-11-25 10:47:07 +00:00 |
|
|
Luca Haid
|
f3a1aef719
|
switched 2 inputs
|
2024-11-25 10:47:06 +00:00 |
|
|
Luca Haid
|
02ae370515
|
Merge branch 'feature/warehouse-shipping-note-additional-fix' into 'master'
switched 2 inputs
See merge request fronk/thetool!757
|
2024-11-21 09:12:45 +00:00 |
|
|
Luca Haid
|
0cf35b19b1
|
switched 2 inputs
|
2024-11-21 09:12:44 +00:00 |
|
|
Luca Haid
|
11ec0cf97b
|
Update WarehouseShippingNoteController.php
|
2024-11-21 09:10:39 +00:00 |
|
|
Luca Haid
|
21e5c828f1
|
Update WarehouseShippingNoteController.php
|
2024-11-20 16:11:19 +00:00 |
|
|
Luca Haid
|
c80e3d442a
|
Merge branch 'feature/warehouse-shipping-note-additional-fix' into 'master'
switched 2 inputs
See merge request fronk/thetool!754
|
2024-11-20 12:26:23 +00:00 |
|
|
Luca Haid
|
5bb51fd676
|
switched 2 inputs
|
2024-11-20 12:26:22 +00:00 |
|
|
Luca Haid
|
b36f8108ad
|
Merge branch 'feature/graphing' into 'master'
Added Graphing
See merge request fronk/thetool!753
|
2024-11-19 19:20:03 +00:00 |
|
|
Luca Haid
|
6b2c292282
|
Added Graphing
|
2024-11-19 20:19:46 +01:00 |
|
|
Luca Haid
|
01e461b5ba
|
Fixed Error when no additional class was set
|
2024-11-19 13:52:27 +01:00 |
|
|
Luca Haid
|
115856cd07
|
Update ContractView.js
|
2024-11-15 09:13:38 +00:00 |
|
|
Luca Haid
|
bab46867e9
|
Update HistoricBill.js
|
2024-11-15 09:11:27 +00:00 |
|
|
Luca Haid
|
1f847ba92c
|
Merge branch 'feature/improve-warehouse-shipping-note' into 'master'
Feature/improve warehouse shipping note
See merge request fronk/thetool!735
|
2024-11-14 10:13:16 +00:00 |
|
|
Luca Haid
|
902f38e395
|
Feature/improve warehouse shipping note
|
2024-11-14 10:13:15 +00:00 |
|
|
Luca Haid
|
5b19d136f1
|
Merge branch 'feature/improve-warehouse-shipping-note' into 'master'
Added some permissions for warehouse
See merge request fronk/thetool!734
|
2024-11-14 10:09:08 +00:00 |
|
|
Luca Haid
|
5914ac6320
|
Added some permissions for warehouse
|
2024-11-14 11:08:01 +01:00 |
|
|
Luca Haid
|
5153fc65a7
|
Merge branch 'feature/improve-warehouse-shipping-note' into 'master'
- Disabled default Car being ID:2
See merge request fronk/thetool!731
|
2024-11-13 17:17:05 +00:00 |
|
|
Luca Haid
|
c393d8e6a1
|
- Disabled default Car being ID:2
- Showing Message if User has no default car
|
2024-11-13 18:16:11 +01:00 |
|
|
Luca Haid
|
b2a8ae43cc
|
Merge branch 'bugfix/warehouse-e-shop-shopping-cart' into 'master'
fixed overflowing shopping cart on weird zoom factors
See merge request fronk/thetool!729
|
2024-11-13 14:04:36 +00:00 |
|
|
Luca Haid
|
78a0019564
|
fixed overflowing shopping cart on weird zoom factors
|
2024-11-13 15:04:18 +01:00 |
|
|
Luca Haid
|
5230da11bd
|
Merge branch 'feature/rework-contract-view' into 'master'
Reworked Contract View to Vue.js
See merge request fronk/thetool!728
|
2024-11-13 13:51:50 +00:00 |
|
|
Luca Haid
|
5690f08892
|
Reworked Contract View to Vue.js
|
2024-11-13 13:51:49 +00:00 |
|