Commit Graph
100 Commits
Author SHA1 Message Date
Luca Haid 105e1a39a0 Merge branch 'constr-consent-add-ez' into 'master'
Changed

See merge request fronk/thetool!1094
2025-03-10 13:10:55 +00:00
Luca Haid 2b36a8ea57 Changed 2025-03-10 14:10:37 +01:00
Luca Haid 6d7501cce4 Merge branch 'constr-consent-add-ez' into 'master'
Added EZ to ConstructionConsent

See merge request fronk/thetool!1092
2025-03-10 12:26:00 +00:00
Luca Haid d44b8509ea Added EZ to ConstructionConsent 2025-03-10 13:25:43 +01:00
Luca Haid 5368e7bd91 Merge branch 'warehouse-improve' into 'master'
Fixed Issue in TTCrud for PermissionCheck

See merge request fronk/thetool!1091
2025-03-10 12:00:09 +00:00
Luca Haid d10ffc1be8 Fixed Issue in TTCrud for PermissionCheck 2025-03-10 12:59:47 +01:00
Luca Haid ae22776c00 Merge branch 'warehouse-improve' into 'master'
added new warehouseorder features

See merge request fronk/thetool!1090
2025-03-10 09:40:31 +00:00
Luca Haid 8174902d88 added new warehouseorder features 2025-03-10 10:39:39 +01:00
Luca Haid 182587c0ea Merge branch 'order-change-email' into 'master'
added new warehouseorder features

See merge request fronk/thetool!1086
2025-03-07 07:05:16 +00:00
Luca Haid 7e3b1af54a added new warehouseorder features 2025-03-07 08:04:36 +01:00
Luca Haid 8f71b2f43c Merge branch 'order-change-email' into 'master'
changed email from office to einkauf

See merge request fronk/thetool!1085
2025-03-06 14:35:43 +00:00
Luca Haid d24c1cc5dc changed email from office to einkauf 2025-03-06 15:35:21 +01:00
Luca Haid 495dd2c886 Merge branch 'orderrequest-show-id' into 'master'
show id from now on

See merge request fronk/thetool!1084
2025-03-06 14:03:22 +00:00
Luca Haid e510413abc show id from now on 2025-03-06 15:03:07 +01:00
Luca Haid 54dd6257d8 Merge branch 'orderrequest-show-id' into 'master'
show id from now on

See merge request fronk/thetool!1083
2025-03-06 14:02:30 +00:00
Luca Haid b5870a34ab show id from now on 2025-03-06 15:02:14 +01:00
Luca Haid 41c41c7777 Merge branch 'eshop-add-ext-art-nr' into 'master'
added external article number for csv and email

See merge request fronk/thetool!1082
2025-03-06 13:08:32 +00:00
Luca Haid 0613e765fe added external article number for csv and email 2025-03-06 14:07:58 +01:00
Luca Haid 1156cbec83 Merge branch 'preordercampaign-add-caching' into 'master'
fixed issue in preordercampaign that the total unit count * 2

See merge request fronk/thetool!1080
2025-03-06 12:53:29 +00:00
Luca Haid 187cc30c76 fixed issue in preordercampaign that the total unit count * 2 2025-03-06 13:52:51 +01:00
Luca Haid e3f74fc822 Merge branch 'preordercampaign-add-caching' into 'master'
fixed issue in preordercampaign that the total unit count * 2

See merge request fronk/thetool!1079
2025-03-06 12:52:10 +00:00
Luca Haid 478779fec7 fixed issue in preordercampaign that the total unit count * 2 2025-03-06 13:51:07 +01:00
Luca Haid cbc482d944 Merge branch 'preordercampaign-add-caching' into 'master'
added cache to preordercampaign

See merge request fronk/thetool!1078
2025-03-06 12:29:14 +00:00
Luca Haid fc222cd7b9 added cache to preordercampaign 2025-03-06 13:28:43 +01:00
Luca Haid a486c1521c Merge branch 'fix/WarehouseOrderRequest' into 'master'
show warehouseorderrequest note from now on

See merge request fronk/thetool!1077
2025-03-06 12:21:06 +00:00
Luca Haid b2064c1ef5 show warehouseorderrequest note from now on 2025-03-06 13:19:24 +01:00
Luca Haid d8ab8421b8 Merge branch 'fix/WarehouseOrderRequest' into 'master'
fixed issue with cleartext tt-position-manager <-> tt-autocomplete

See merge request fronk/thetool!1076
2025-03-06 10:41:26 +00:00
Luca Haid b1038e542d fixed issue with cleartext tt-position-manager <-> tt-autocomplete 2025-03-06 11:38:41 +01:00
Luca Haid a729e77781 Update WarehouseOrderRequestController.php 2025-03-06 09:33:07 +00:00
Luca Haid 7a34d2f00e Merge branch 'warehouse-order-improvements' into 'master'
Updated WarehouseOrder and WarehouseOrderRequest

See merge request fronk/thetool!1075
2025-03-06 09:30:26 +00:00
Luca Haid a4df764a49 Updated WarehouseOrder and WarehouseOrderRequest 2025-03-06 10:29:48 +01:00
Luca Haid 6385fe8371 Merge branch 'preorder-campaign-rework' into 'master'
Preorder campaign rework

See merge request fronk/thetool!1074
2025-03-05 16:39:27 +00:00
Luca Haid 0420480399 Preorder campaign rework 2025-03-05 16:39:27 +00:00
Luca Haid 83d211ed10 Merge branch 'preorder-campaign-rework' into 'master'
Preorder campaign rework

See merge request fronk/thetool!1072
2025-03-05 16:32:21 +00:00
Luca Haid f42e472000 Preorder campaign rework 2025-03-05 16:32:20 +00:00
Luca Haid 1740e8d125 Changed Pop Network Filter to text based because of errors 2025-03-04 08:04:05 +00:00
Luca Haid 034906a3f0 Update menu.php 2025-03-04 07:41:45 +00:00
Luca Haid e59d357a74 Update menu.php 2025-03-04 07:40:46 +00:00
Luca Haid a3daee9468 Update menu.php 2025-03-04 07:36:59 +00:00
Luca Haid b6cf2473a5 Allow Ingena into ConstructionConsent 2025-03-04 07:34:51 +00:00
Luca Haid 0ac2ff4cc1 Changed ConstructionConsent Stats 2025-02-27 09:43:07 +00:00
Luca Haid 4dfbbfcaff Cleanup generateStats() in ConstructionConsentController 2025-02-27 09:11:47 +00:00
Luca Haid d7f2715116 Merge branch 'const-consent-add-filter' into 'master'
Const consent add filter

See merge request fronk/thetool!1047
2025-02-25 18:33:05 +00:00
Luca Haid d1d446f905 Const consent add filter 2025-02-25 18:33:04 +00:00
Luca Haid ba00e47d88 Merge branch 'const-consent-add-filter' into 'master'
Fixed Filter for ADB Street in ConstructionConsent.php

See merge request fronk/thetool!1046
2025-02-25 13:47:42 +00:00
Luca Haid de52191313 Fixed Filter for ADB Street in ConstructionConsent.php 2025-02-25 14:47:23 +01:00
Luca Haid 1f8e24333b Merge branch 'dashboard-add-timeline' into 'master'
Added new Dashboard Features

See merge request fronk/thetool!1045
2025-02-25 08:07:46 +00:00
Luca Haid 6f70ea1273 Added new Dashboard Features 2025-02-25 09:07:13 +01:00
Luca Haid 60e1b33353 Merge branch 'const-consent-add-filter' into 'master'
Fixed Address Filter

See merge request fronk/thetool!1044
2025-02-24 06:30:50 +00:00
Luca Haid 64d2df213d Fixed Address Filter 2025-02-24 07:29:29 +01:00
Luca Haid 4bae3e3419 Merge branch 'const-consent-add-filter' into 'master'
Added new GST Filter

See merge request fronk/thetool!1043
2025-02-20 10:02:18 +00:00
Luca Haid c8a374b850 Added new GST Filter 2025-02-20 11:01:57 +01:00
Luca Haid 518047c906 Merge branch 'const-consent-add-filter' into 'master'
ConstructionConsent added new Stats

See merge request fronk/thetool!1042
2025-02-20 09:22:17 +00:00
Luca Haid 53697382a0 ConstructionConsent added new Stats 2025-02-20 10:21:57 +01:00
Luca Haid 7e8d277559 Merge branch 'const-consent-add-filter' into 'master'
ConstructionConsent added new Filters

See merge request fronk/thetool!1041
2025-02-19 19:31:48 +00:00
Luca Haid d2a17d996d ConstructionConsent added new Filters 2025-02-19 20:30:29 +01:00
Luca Haid fc4d38dfc3 Update ConstructionConsentController.php 2025-02-17 12:22:29 +00:00
Luca Haid fa5aa34059 Merge branch 'constr-consent-add-stats' into 'master'
Added Stats inside ConstructionConsent

See merge request fronk/thetool!1035
2025-02-17 11:57:29 +00:00
Luca Haid bf5bc71e24 Added Stats inside ConstructionConsent 2025-02-17 12:55:59 +01:00
Luca Haid f89a2c7ea3 Added ConstructionConsentProject to preorderfront if address is correct 2025-02-14 11:51:45 +00:00
Luca Haid cb17eba40b Update tt-modal.js 2025-02-14 10:00:43 +00:00
Luca Haid 7c5045812f Merge branch 'construction-consent-add-popover' into 'master'
Added Popover to Inform Users

See merge request fronk/thetool!1021
2025-02-13 11:48:32 +00:00
Luca Haid 9e513dfb35 Added Popover to Inform Users 2025-02-13 12:47:54 +01:00
Luca Haid 6f1ec33a1e Merge branch 'improve-warehouse' into 'master'
Fixed WarehouseOffer Modal

See merge request fronk/thetool!1020
2025-02-13 11:37:35 +00:00
Luca Haid ac5c09c8be Fixed WarehouseOffer Modal 2025-02-13 12:37:10 +01:00
Luca Haid 57f7a1c9fe Merge branch 'improve-warehouse' into 'master'
Fixed WarehouseOrderModel.php

See merge request fronk/thetool!1019
2025-02-13 11:33:42 +00:00
Luca Haid 71b72151f6 Fixed WarehouseOrderModel.php 2025-02-13 12:33:21 +01:00
Luca Haid c3e1af6649 Merge branch 'improve-warehouse' into 'master'
Allowed ingena for cons consent

See merge request fronk/thetool!1018
2025-02-13 11:10:04 +00:00
Luca Haid 8f20ce39d6 Allowed ingena for cons consent 2025-02-13 12:09:35 +01:00
Luca Haid 1661469d06 Merge branch 'improve-warehouse' into 'master'
Updated Warehouse

See merge request fronk/thetool!1017
2025-02-13 10:57:41 +00:00
Luca Haid c8d11661d0 Updated Warehouse 2025-02-13 11:56:27 +01:00
Luca Haid bbe841875e Added gstnr to ConstructionConsent/Index 2025-02-13 08:19:54 +00:00
Luca Haid 2159035675 Added gstnr to ConstructionConsent/Index 2025-02-13 08:18:55 +00:00
Luca Haid bb5a993c27 Update DashboardNew.js 2025-02-12 17:03:08 +00:00
Luca Haid 5a5fc9d3d9 Merge branch 'improve-warehouse' into 'master'
Changed Dashboard

See merge request fronk/thetool!1015
2025-02-12 16:56:48 +00:00
Luca Haid cc58b32312 Changed Dashboard 2025-02-12 17:56:34 +01:00
Luca Haid 3da43ea0e7 Merge branch 'improve-warehouse' into 'master'
Changed Dashboard

See merge request fronk/thetool!1014
2025-02-12 16:52:00 +00:00
Luca Haid 14308d3285 Changed Dashboard 2025-02-12 17:51:29 +01:00
Luca Haid 6feece50bd Merge branch 'improve-warehouse' into 'master'
Updated Shipping Note so that Status is now a iconSelect

See merge request fronk/thetool!1011
2025-02-12 10:14:20 +00:00
Luca Haid 1e868e9b84 Updated Shipping Note so that Status is now a iconSelect 2025-02-12 11:13:33 +01:00
Luca Haid 11b09c6b93 Update DeviceController.php 2025-02-10 13:06:59 +00:00
Luca Haid 1bcc192399 Update TTCrud.php 2025-02-10 08:08:12 +00:00
Luca Haid 131506d74e Update TTCrud.php 2025-02-10 08:04:04 +00:00
Luca Haid 9022b464d9 Update WarehouseEShopOrderController.php 2025-02-10 07:59:39 +00:00
Luca Haid 740ec1f3d7 Merge branch 'radius-add-auto-live' into 'master'
Radius added auto fetching for under 5 results / enabled checkbox

See merge request fronk/thetool!1000
2025-02-06 10:30:50 +00:00
Luca Haid 814e2e88e3 Merge branch 'preorder-improve-map' into 'master'
Added Tickets View for Customers

See merge request fronk/thetool!999
2025-02-06 10:24:32 +00:00
Luca Haid e2ee980493 Radius added auto fetching for under 5 results / enabled checkbox 2025-02-06 11:24:14 +01:00
Luca Haid b1521f8af8 Added Tickets View for Customers 2025-02-06 11:03:49 +01:00
Luca Haid eb526280b0 Merge branch 'preorder-improve-map' into 'master'
Added Preorder View Url inside the Map

See merge request fronk/thetool!995
2025-02-05 14:35:38 +00:00
Luca Haid 1f317de7a2 Added Preorder View Url inside the Map 2025-02-05 15:35:00 +01:00
Luca Haid 2ce75b766d Merge branch 'construction-consent-permissions' into 'master'
Updated ConstructionConsent Permissions

See merge request fronk/thetool!991
2025-02-05 08:36:50 +00:00
Luca Haid 04a31770ed Updated ConstructionConsent Permissions 2025-02-05 09:35:34 +01:00
Luca Haid f69e155cbb Merge branch 'add-snopp-api' into 'master'
Added SNOPP API Library

See merge request fronk/thetool!989
2025-02-04 18:57:06 +00:00
Luca Haid 8eeae13187 Added SNOPP API Library 2025-02-04 19:56:33 +01:00
Luca Haid c1f63a21c9 Merge branch 'change-device-permissions' into 'master'
Updated Warehouse

See merge request fronk/thetool!988
2025-02-04 18:06:56 +00:00
Luca Haid 7c8af7aed4 Updated Warehouse 2025-02-04 19:06:08 +01:00
Luca Haid 588a872e4b Changed FIBU Filter Header 2025-02-04 18:03:19 +00:00
Luca Haid f57770dfcf Update DeviceController.php 2025-02-03 13:31:50 +00:00
Luca Haid 14e5d16018 Merge branch 'change-device-permissions' into 'master'
Added Different view for non-admins

See merge request fronk/thetool!984
2025-02-03 13:00:40 +00:00
Luca Haid 514d5d5d7e Added Different view for non-admins 2025-02-03 14:00:22 +01:00