Commit Graph
100 Commits
Author SHA1 Message Date
Luca Haid dbbf49a9a9 Merge branch 'fix-addr-model' into 'master'
fixed address model

See merge request fronk/thetool!895
2025-01-14 12:39:19 +00:00
Luca Haid 963aa08a2c fixed address model 2025-01-14 13:38:14 +01:00
Luca Haid 1250bf17d3 Merge branch 'added-enter-searching' into 'master'
added enter to search

See merge request fronk/thetool!894
2025-01-14 12:31:04 +00:00
Luca Haid 8d0067adc1 added enter to search 2025-01-14 13:30:45 +01:00
Luca Haid d07cdfce12 Merge branch 'fix-tt-autocomplete' into 'master'
fixed touch input

See merge request fronk/thetool!893
2025-01-14 11:57:09 +00:00
Luca Haid 6233454b66 fixed touch input 2025-01-14 12:56:12 +01:00
Luca Haid a5d56d9350 Merge branch 'fix-tt-autocomplete' into 'master'
fixed touch issue

See merge request fronk/thetool!892
2025-01-14 11:34:10 +00:00
Luca Haid 1ec1afd859 fixed touch issue 2025-01-14 12:33:55 +01:00
Luca Haid 18ad06395e Merge branch 'add-radius-connection' into 'master'
added link to edit user

See merge request fronk/thetool!891
2025-01-14 11:08:11 +00:00
Luca Haid e86db7d2e1 added link to edit user 2025-01-14 12:07:44 +01:00
Luca Haid 0f42830ffb Update Radius.js 2025-01-14 08:36:36 +00:00
Luca Haid 0465c6c57d Merge branch 'add-radius-connection' into 'master'
added new radius module

See merge request fronk/thetool!890
2025-01-14 08:10:58 +00:00
Luca Haid 08b4c27c5d added new radius module 2025-01-14 09:10:24 +01:00
Luca Haid 896692d25d Merge branch 'add-radius-connection' into 'master'
added new radius module

See merge request fronk/thetool!889
2025-01-14 07:53:21 +00:00
Luca Haid 35e5040155 added new radius module 2025-01-14 08:52:50 +01:00
Luca Haid d1ec42b017 Merge branch 'dashboard-chart-edit' into 'master'
made points inside chart bigger

See merge request fronk/thetool!886
2025-01-13 10:32:01 +00:00
Luca Haid bb4eee7caa made points inside chart bigger 2025-01-13 11:31:42 +01:00
Luca Haid 7ee2a1e8b2 Merge branch 'shipping-note-add-inv-addr' into 'master'
added invoice addr to shipping note pdf

See merge request fronk/thetool!885
2025-01-13 10:31:07 +00:00
Luca Haid 65755afd2d added invoice addr to shipping note pdf 2025-01-13 11:30:49 +01:00
Luca Haid 0641753ee5 Merge branch 'rework-dashboard' into 'master'
fixed cache disabling

See merge request fronk/thetool!884
2025-01-13 09:48:01 +00:00
Luca Haid 101cd50261 fixed cache disabling 2025-01-13 10:47:18 +01:00
Luca Haid 9dcddbd1ec Merge branch 'rework-dashboard' into 'master'
Updated Dashboard and made it live

See merge request fronk/thetool!883
2025-01-13 09:45:44 +00:00
Luca Haid a6df4c6496 Updated Dashboard and made it live 2025-01-13 10:44:32 +01:00
Luca Haid 9f7338c77f Merge branch 'rework-dashboard' into 'master'
Rework dashboard

See merge request fronk/thetool!881
2025-01-10 12:31:06 +00:00
Luca Haid 534febd8e7 Rework dashboard 2025-01-10 12:31:05 +00:00
Luca Haid 3eabc30c58 Merge branch 'rework-dashboard' into 'master'
Rework dashboard

See merge request fronk/thetool!880
2025-01-10 11:12:33 +00:00
Luca Haid 50fb2ca7d8 Rework dashboard 2025-01-10 11:12:33 +00:00
Luca Haid 1147cb259f Merge branch 'rework-dashboard' into 'master'
Rework dashboard

See merge request fronk/thetool!878
2025-01-10 10:01:36 +00:00
Luca Haid c5813d9839 Rework dashboard 2025-01-10 10:01:36 +00:00
Luca Haid a504e02733 Merge branch 'rework-dashboard' into 'master'
Fixed User-Select for new Dashboard

See merge request fronk/thetool!877
2025-01-10 10:00:40 +00:00
Luca Haid c562d2e5fb Fixed User-Select for new Dashboard 2025-01-10 10:00:39 +00:00
Luca Haid fe4506bc9e Merge branch 'rework-dashboard' into 'master'
Added Graph for Orders in NewDashboard

See merge request fronk/thetool!876
2025-01-10 08:07:36 +00:00
Luca Haid 93525a5b98 Added Graph for Orders in NewDashboard 2025-01-10 09:07:18 +01:00
Luca Haid 00d000599a Merge branch 'rework-dashboard' into 'master'
Updated small things in new Dashboard

See merge request fronk/thetool!875
2025-01-10 07:34:39 +00:00
Luca Haid 068c332710 Updated small things in new Dashboard 2025-01-10 08:33:45 +01:00
Luca Haid 447633058c Merge branch 'rework-dashboard' into 'master'
Updated small things in new Dashboard

See merge request fronk/thetool!874
2025-01-10 07:32:27 +00:00
Luca Haid b196f4c6af Updated small things in new Dashboard 2025-01-10 08:32:10 +01:00
Luca Haid ff28bc897f Merge branch 'rework-dashboard' into 'master'
Updated small things in new Dashboard

See merge request fronk/thetool!873
2025-01-10 07:30:24 +00:00
Luca Haid 5c893f4d3e Updated small things in new Dashboard 2025-01-10 08:28:59 +01:00
Luca Haid 4fdbebdb19 Merge branch 'rework-dashboard' into 'master'
fixed gemeinde filter for new dashboard

See merge request fronk/thetool!872
2025-01-10 07:17:47 +00:00
Luca Haid 8956ec58c6 fixed gemeinde filter for new dashboard 2025-01-10 08:17:24 +01:00
Luca Haid 39da6f2e2e Merge branch 'rework-dashboard' into 'master'
updated new dashboard

See merge request fronk/thetool!871
2025-01-09 16:16:29 +00:00
Luca Haid 32c541095a updated new dashboard 2025-01-09 17:15:40 +01:00
Luca Haid 6504908cc2 Merge branch 'rework-dashboard' into 'master'
Added new Dashboard

See merge request fronk/thetool!870
2025-01-09 15:38:59 +00:00
Luca Haid e659d54265 Added new Dashboard 2025-01-09 16:38:46 +01:00
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