Commit Graph

746 Commits

Author SHA1 Message Date
Spitzer_Daniel
f3380a771c Remerge 2023-03-22 16:24:42 +01:00
Spitzer_Daniel
78784157e5 Merge remote-tracking branch 'origin/devbyspi' into devbyspi
# Conflicts:
#	public/assets/css/datatables-std.css
2023-03-22 15:50:24 +01:00
Spitzer_Daniel
e9c1c3824f css Upload 2023-03-22 15:48:41 +01:00
Frank Schubert
95a452bba7 Merge branch 'master' into 'devbyspi'
# Conflicts:
#   Layout/default/Device/Detail.php
#   Layout/default/Device/Form.php
#   Layout/default/Device/Index.php
#   application/Device/DeviceController.php
#   application/Device/DeviceModel.php
#   public/assets/css/datatables-std.css
2023-03-22 14:36:13 +00:00
Spitzer_Daniel
0ce064b56b Gerätehersteller, Devices, API Erweiterungen 2023-03-22 15:23:35 +01:00
Frank Schubert
61e84f085d Integrated Contractconfig Hooks in Contractconfig/Save with restore on
error
2023-03-21 22:04:57 +01:00
Frank Schubert
a27d7a7418 Added meridian/rw/hw to AddressDB/Form 2023-03-16 15:28:26 +01:00
Frank Schubert
9d015de8fd Added Hausnummer to preorder export 2023-03-15 14:06:15 +01:00
Frank Schubert
02e31069bf Removing old tilelayer from map when switching 2023-03-15 13:05:34 +01:00
Frank Schubert
cd9bd420a6 Added color to type in preorder popup 2023-03-14 17:23:18 +01:00
Frank Schubert
206a701326 Map tileset toogle keeps old markers and doesnt recenter map 2023-03-14 17:11:05 +01:00
Frank Schubert
06dd6b280a Added Map tileset toggle 2023-03-14 17:04:24 +01:00
Frank Schubert
a4f48657d7 fixed campaign_id in preorder map filter 2023-03-14 16:41:20 +01:00
Frank Schubert
d7054a926f changed colors in preorder map and added more cache 2023-03-14 16:35:23 +01:00
Frank Schubert
387c4e8911 fixed campaign_id filter in preorder map 2023-03-14 16:06:57 +01:00
Frank Schubert
4edc9bc99f Added preorder map (visible for admins only) 2023-03-14 15:55:00 +01:00
Frank Schubert
d919553808 Fixed preorderfront user has no permission for Preorder 2023-03-10 13:30:52 +01:00
Frank Schubert
852be346ec Added Preorder Export 2023-03-09 19:06:32 +01:00
Frank Schubert
88dbea9f79 Not showing network to preorder front users 2023-03-08 21:03:34 +01:00
Frank Schubert
11f29ad36e Fixed User/add 2023-03-08 20:31:53 +01:00
Frank Schubert
0f047c8f60 Added preorder network select to user/form 2023-03-08 20:26:12 +01:00
Frank Schubert
26babafa85 undoing earlier fancyurl safety change 2023-03-08 18:54:01 +01:00
Frank Schubert
ff7ef71929 Added Hausnummer filter 2023-03-08 16:14:28 +01:00
Frank Schubert
67dbee488d Added permission Preorderfront 2023-03-08 15:39:05 +01:00
Frank Schubert
9d02064aa2 Added Preorder attributes and checkboxes in list 2023-03-08 14:49:47 +01:00
Frank Schubert
835d9b1b58 Added premstaetten csv files 2023-03-07 20:30:02 +01:00
Frank Schubert
58e8fb9dc6 Added Premstaetten rimo attrib import script 2023-03-07 20:19:03 +01:00
Frank Schubert
c18f8e4c18 Added new Liezen fields to export 2023-03-06 20:07:12 +01:00
Frank Schubert
be5f445c94 Added script for ADB import liezen 2023-03-02 2023-03-06 15:31:49 +01:00
Frank Schubert
84a3b5be6a fixed saving rollout info in addressdb/save 2023-03-01 17:04:25 +01:00
Frank Schubert
7f2b923940 Contracconfig Hooks WIP 2023-03-01 17:01:49 +01:00
Frank Schubert
acf8ff7bc7 sending int nbe billing info only if nbe is greater than 0 2023-02-28 17:18:04 +01:00
Frank Schubert
f869e14351 subject change 2023-02-28 17:05:02 +01:00
Frank Schubert
c94c0de131 subject fix 2023-02-28 16:56:47 +01:00
Frank Schubert
531f34e0cf Fixed nbe in order form 2023-02-28 16:44:39 +01:00
Frank Schubert
1aa4bdd89e Added internal billing NBE email for external products 2023-02-28 16:43:17 +01:00
Frank Schubert
5610efdb94 Fixed external_id filter 2023-02-28 13:35:58 +01:00
Frank Schubert
3b4772ca4e Added external_id filter to Product/Index 2023-02-28 13:31:49 +01:00
Frank Schubert
76a6d0bfcc Added makimarkers include for andom-tec 2023-02-27 20:09:29 +01:00
Frank Schubert
b4f0d5b653 Added devices to andom menu 2023-02-27 20:01:29 +01:00
Frank Schubert
3d679732a8 showing disabled products in existing orders if needed 2023-02-27 19:17:50 +01:00
Frank Schubert
4be8e91508 Added product active flag, saving filter in Product/Index 2023-02-27 19:02:23 +01:00
Frank Schubert
388e8ea164 GET /preorder/open: if no timestamp supplies, only show open orders 2023-02-27 17:10:22 +01:00
Frank Schubert
28d74a96e5 preorder-apu.yml: Added Response to GET /preorder/open 2023-02-27 16:46:31 +01:00
Frank Schubert
1a8848e02f api changes:
- GET /preorder/open - get all open preorders
 - added extref to preorder requests and responses, can be used to
   identify a specific preorder
2023-02-27 16:17:37 +01:00
Frank Schubert
33dc42eadd Rufnummernportierungsformlaremail an Openproject 2023-02-24 17:27:54 +01:00
Frank Schubert
f0ed591610 Changed int billing email to markdown 2023-02-24 17:10:08 +01:00
Frank Schubert
733dc773a1 Small changes to int billing email layout 2023-02-24 16:50:48 +01:00
Frank Schubert
4744ef94fe Small changes to int billing email layout 2023-02-24 16:45:26 +01:00
Frank Schubert
e0d5e792a3 Changed sender email for openproject 2023-02-24 16:36:12 +01:00