 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 |
|
|
Luca Haid
|
899e5c88ff
|
Merge branch 'feature/shipping-note-refinements' into 'master'
Feature/shipping note refinements
See merge request fronk/thetool!727
|
2024-11-13 12:28:46 +00:00 |
|
|
Luca Haid
|
c3bf25f668
|
Feature/shipping note refinements
|
2024-11-13 12:28:45 +00:00 |
|
|
Luca Haid
|
4ea9a5aea0
|
Merge branch 'feature/shipping-note-refinements' into 'master'
Feature/shipping note refinements
See merge request fronk/thetool!726
|
2024-11-13 12:18:21 +00:00 |
|
|
Luca Haid
|
41a9b0bbd9
|
Feature/shipping note refinements
|
2024-11-13 12:18:20 +00:00 |
|
|
Luca Haid
|
be089593ea
|
Merge branch 'feature/update-shipping-note' into 'master'
Updated WarehouseShippingNote
See merge request fronk/thetool!721
|
2024-11-12 17:29:35 +00:00 |
|
|
Luca Haid
|
c03876ffa6
|
Updated WarehouseShippingNote
|
2024-11-12 18:29:10 +01:00 |
|
|
Luca Haid
|
154968d1cf
|
Merge branch 'feature/update-shipping-note' into 'master'
Updated WarehouseShippingNote
See merge request fronk/thetool!720
|
2024-11-12 17:27:20 +00:00 |
|
|
Luca Haid
|
560563aaa4
|
Updated WarehouseShippingNote
|
2024-11-12 18:27:03 +01:00 |
|
|
Luca Haid
|
76b58543ee
|
Merge branch 'feature/update-shipping-note' into 'master'
Updated WarehouseShippingNote
See merge request fronk/thetool!719
|
2024-11-12 17:25:30 +00:00 |
|
|
Luca Haid
|
e42a13041b
|
Updated WarehouseShippingNote
|
2024-11-12 18:24:25 +01:00 |
|
|
Luca Haid
|
d8ea1bb7f5
|
Merge branch 'hotfix/warehouse-eshop-gls-mail-parser' into 'master'
fixed email fetching utf8
See merge request fronk/thetool!718
|
2024-11-12 13:14:35 +00:00 |
|
|
Luca Haid
|
50228c36e4
|
fixed email fetching utf8
|
2024-11-12 14:14:15 +01:00 |
|
|
Luca Haid
|
85f8bfb57a
|
Merge branch 'hotfix/warehouse-eshop-gls-mail-parser' into 'master'
fixed email fetching utf8
See merge request fronk/thetool!717
|
2024-11-12 13:09:47 +00:00 |
|
|
Luca Haid
|
24676a67a0
|
fixed email fetching utf8
|
2024-11-12 14:09:02 +01:00 |
|
|
Luca Haid
|
b7ebc3cd30
|
Update 20241106120000_add_historic_bill.php
|
2024-11-12 12:37:31 +00:00 |
|
|
Luca Haid
|
b3bfc3edfc
|
Merge branch 'hotfix/warehouse-eshop-gls-mail-parser' into 'master'
fixed for loop
See merge request fronk/thetool!715
|
2024-11-12 12:36:23 +00:00 |
|
|
Luca Haid
|
acf7dc151e
|
fixed for loop
|
2024-11-12 13:34:31 +01:00 |
|
|
Luca Haid
|
5f36db7358
|
Merge branch 'feature/add-historic-bills' into 'master'
Feature/add historic bills
See merge request fronk/thetool!699
|
2024-11-06 12:39:14 +00:00 |
|
|
Luca Haid
|
a696f60383
|
Feature/add historic bills
|
2024-11-06 12:39:14 +00:00 |
|
|
Luca Haid
|
cdd9372f1d
|
Merge branch 'feature/add-device-zabbix-sync' into 'master'
hotfix on if check
See merge request fronk/thetool!695
|
2024-11-05 19:45:35 +00:00 |
|
|
Luca Haid
|
7960531197
|
hotfix on if check
|
2024-11-05 20:45:16 +01:00 |
|
|
Luca Haid
|
440f0f156c
|
Merge branch 'feature/add-device-zabbix-sync' into 'master'
hotfix on if check
See merge request fronk/thetool!694
|
2024-11-05 19:44:56 +00:00 |
|
|
Luca Haid
|
a148da16e4
|
hotfix on if check
|
2024-11-05 20:44:31 +01:00 |
|
|
Luca Haid
|
bd41a7fd73
|
Merge branch 'feature/add-device-zabbix-sync' into 'master'
added zabbix sync and view for Device
See merge request fronk/thetool!693
|
2024-11-05 19:43:05 +00:00 |
|
|
Luca Haid
|
eb9a1a3995
|
added zabbix sync and view for Device
|
2024-11-05 20:42:16 +01:00 |
|
|
Luca Haid
|
ce8cdee32d
|
Merge branch 'feature/add-device-congestion' into 'master'
added new view for device congestion
See merge request fronk/thetool!692
|
2024-11-05 18:13:40 +00:00 |
|
|
Luca Haid
|
bea341f869
|
added new view for device congestion
|
2024-11-05 19:12:19 +01:00 |
|
|
Luca Haid
|
be64c5381f
|
fixed ticket modal for customers
|
2024-11-05 12:16:10 +01:00 |
|
|
Luca Haid
|
f74d34f5aa
|
Merge branch 'feature/create-ticket-from-address' into 'master'
added new button to create tickets
See merge request fronk/thetool!683
|
2024-10-31 13:06:38 +00:00 |
|
|
Luca Haid
|
1bd7163011
|
Merge branch 'feature/warehouse-e-shop-mobile' into 'master'
added mobile view for eshop
See merge request fronk/thetool!682
|
2024-10-29 15:30:04 +00:00 |
|
|
Luca Haid
|
d8c45fcdd8
|
Merge branch 'feature/preorder-mobile' into 'master'
added mobile view for preorder
See merge request fronk/thetool!681
|
2024-10-29 15:10:53 +00:00 |
|
|
Luca Haid
|
e17999d2b0
|
Merge branch 'feature/preorder-mobile' into 'master'
added mobile view for preorder
See merge request fronk/thetool!680
|
2024-10-29 14:55:22 +00:00 |
|
|
Luca Haid
|
137c1e67a5
|
Merge branch 'feature/preorder-mobile' into 'master'
added mobile view for preorder
See merge request fronk/thetool!679
|
2024-10-29 14:53:21 +00:00 |
|