Commit Graph
100 Commits
Author SHA1 Message Date
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
Luca Haid 55f3749e98 Merge branch 'feature/enable-set-ls-invoiced' into 'master'
added possibility to set shipping notes as billed

See merge request fronk/thetool!667
2024-10-14 10:56:54 +00:00
Luca Haid 63626df87a Merge branch 'bugfix/e-shop' into 'master'
fixed emailing error

See merge request fronk/thetool!666
2024-10-14 07:30:06 +00:00
Luca Haid 8ec8b3248b Merge branch 'bugfix/e-shop' into 'master'
fixed emailing error

See merge request fronk/thetool!665
2024-10-14 07:25:53 +00:00
Luca Haid 16fe715e52 Merge branch 'bugfix/e-shop' into 'master'
fixed emailing error

See merge request fronk/thetool!664
2024-10-14 07:07:01 +00:00
Luca Haid 0ea7a93c52 Merge branch 'bugfix/e-shop' into 'master'
fixed emailing error

See merge request fronk/thetool!663
2024-10-14 06:58:06 +00:00
Luca Haid eadaf797f2 Merge branch 'bugfix/e-shop' into 'master'
fixed error while creating shipping note for e-shop order

See merge request fronk/thetool!660
2024-10-10 12:35:04 +00:00
Luca Haid 4876fc3fd0 Merge branch 'bugfix/e-shop' into 'master'
added shipping notes for warehouse e shop

See merge request fronk/thetool!659
2024-10-10 09:20:37 +00:00
Luca Haid 7f4239a768 Merge branch 'bugfix/e-shop' into 'master'
fixed error because it is now object instead of array

See merge request fronk/thetool!658
2024-10-10 08:58:52 +00:00
Luca Haid 726d77f9dc Merge branch 'feature/address-show-internal-note' into 'master'
show internal note in the view of an address

See merge request fronk/thetool!657
2024-10-10 08:13:44 +00:00
Luca Haid 7d4d8d9b58 Merge branch 'bugfix/create-locations-action' into 'master'
fixed createLocations Action not working

See merge request fronk/thetool!656
2024-10-10 07:34:43 +00:00
Luca Haid 5814988016 Merge branch 'feature/update-warehouse' into 'master'
update for warehouse

See merge request fronk/thetool!655
2024-10-10 06:54:14 +00:00
Luca Haid 6eda9de0dd Merge branch 'feature/update-warehouse' into 'master'
update for warehouse

See merge request fronk/thetool!654
2024-10-10 06:52:01 +00:00
Luca Haid 050f820525 Merge branch 'feature/update-warehouse' into 'master'
fixed creating csv

See merge request fronk/thetool!646
2024-09-27 10:29:02 +00:00
Luca Haid 4ce85bcad8 Merge branch 'warehouse-add-email-parsing' into 'master'
fixed table definition

See merge request fronk/thetool!638
2024-09-20 09:23:35 +00:00
Luca Haid 9d27acd82d Merge branch 'warehouse-add-email-parsing' into 'master'
added new tracking support

See merge request fronk/thetool!637
2024-09-20 09:17:07 +00:00
Luca Haid d4cd3128d6 Merge branch 'warehouse-add-email-parsing' into 'master'
added new tracking support

See merge request fronk/thetool!636
2024-09-20 09:14:04 +00:00
Luca Haid ace714413b Merge branch 'feature/warehouse-improvement' into 'master'
added new et ref field for eshop

See merge request fronk/thetool!630
2024-09-12 06:45:23 +00:00
Luca Haid 432828dd27 Merge branch 'feature/warehouse-improvement' into 'master'
fixed typo

See merge request fronk/thetool!629
2024-09-10 09:57:47 +00:00
Luca Haid a47bd176eb Merge branch 'feature/warehouse-improvement' into 'master'
Feature/warehouse improvement

See merge request fronk/thetool!628
2024-09-10 09:56:44 +00:00
Luca Haid 0d65e2c1bd Merge branch 'feature/warehouse-improvement' into 'master'
fixed email not sending

See merge request fronk/thetool!627
2024-09-10 09:46:30 +00:00
Luca Haid ca525d998b Merge branch 'feature/warehouse-improvement' into 'master'
added confirmation email for eshop

See merge request fronk/thetool!626
2024-09-10 09:44:06 +00:00
Luca Haid e6d5f7ce4c Merge branch 'feature/warehouse-improvement' into 'master'
added confirmation email for eshop

See merge request fronk/thetool!625
2024-09-10 08:47:31 +00:00
Luca Haid eb553e5f90 Fixed Xinon Logo Height on PDF Generation 2024-08-27 06:17:54 +00:00
Luca Haid 599d5f7f77 Merge branch 'bugfix/warehouseeshop' into 'master'
now not only showing xinon users

See merge request fronk/thetool!605
2024-08-26 07:48:12 +00:00
Luca Haid 3def74eb01 Fixed unecessary characters 2024-08-21 09:38:42 +00:00
Luca Haid e3f0fca2c8 Merge branch 'bugfix/leitungsbau' into 'master'
fixed problem when changer->address is null

See merge request fronk/thetool!603
2024-08-21 07:56:52 +00:00
Luca Haid 96a4d79c63 Merge branch 'bugfix/warehouse-e-shop-order-exoprt' into 'master'
fixed page 0 on client side rendered tables

See merge request fronk/thetool!602
2024-08-21 06:18:16 +00:00
Luca Haid 28a476eeda Merge branch 'bugfix/warehouse-e-shop-order-exoprt' into 'master'
switched csv export to excel export

See merge request fronk/thetool!556
2024-08-02 07:40:21 +00:00
Luca Haid 689dba697d Merge branch 'bugfix/warehouse-e-shop-order-articlepackets' into 'master'
added csv export for triotronik for e shop orders

See merge request fronk/thetool!555
2024-08-02 07:28:34 +00:00
Luca Haid e40ee16fce Merge branch 'bugfix/warehouse-e-shop-order-articlepackets' into 'master'
fixed searching for article packets

See merge request fronk/thetool!539
2024-07-31 10:32:04 +00:00
Luca Haid 27de993a57 Merge branch 'feature/add-warehouse-e-shop-order-items' into 'master'
Feature/add warehouse e shop order items

See merge request fronk/thetool!537
2024-07-31 10:26:10 +00:00
Luca Haid e2288ba6cd Feature/add warehouse e shop order items 2024-07-31 10:26:10 +00:00
Luca Haid 215d23ddc2 Merge branch 'feature/improve-domain' into 'master'
Feature/improve domain

See merge request fronk/thetool!532
2024-07-30 18:34:54 +00:00
Luca Haid aea3ba9fb4 Feature/improve domain 2024-07-30 18:34:53 +00:00
Luca Haid 3bd2e7a7bc Merge branch 'feature/improve-domain' into 'master'
Feature/improve domain

See merge request fronk/thetool!529
2024-07-30 17:52:05 +00:00
Luca Haid d75f9fa26f Feature/improve domain 2024-07-30 17:52:04 +00:00
Luca Haid 6aebba464f Merge branch 'feature/tt-table-fix-excel-export' into 'master'
fixed excel export to only show filtered rows

See merge request fronk/thetool!528
2024-07-30 17:01:05 +00:00
Luca Haid 34e5f0a220 Merge branch 'feature/ipnetwork-update' into 'master'
added delete and update functions to ipnetwork

See merge request fronk/thetool!512
2024-07-25 09:42:25 +00:00
Luca Haid 5ff9549461 Merge branch 'bugfix/warehouse-price-handling' into 'master'
fixed mysql query for history

See merge request fronk/thetool!511
2024-07-25 06:22:10 +00:00
Luca Haid c1aefa32fd Merge branch 'bugfix/warehouse-price-handling' into 'master'
fixed some price handling aswell as tt-autocomplete and tt-table excel export always showing

See merge request fronk/thetool!510
2024-07-25 06:01:26 +00:00
Luca Haid 813b0b4524 Merge branch 'bugfix/fix-php7-issue' into 'master'
Bugfix/fix php7 issue

See merge request fronk/thetool!508
2024-07-24 15:11:44 +00:00
Luca Haid ec187d56f8 Bugfix/fix php7 issue 2024-07-24 15:11:43 +00:00
Luca Haid f73aaffea9 Merge branch 'bugfix/fix-php7-issue' into 'master'
Bugfix/fix php7 issue

See merge request fronk/thetool!507
2024-07-24 15:07:47 +00:00
Luca Haid 29c873f145 Bugfix/fix php7 issue 2024-07-24 15:07:46 +00:00
Luca Haid 41f8a1b2e6 Merge branch 'feature/tt-table-move-filter-reset' into 'master'
Feature/tt table move filter reset

See merge request fronk/thetool!506
2024-07-24 15:04:04 +00:00
Luca Haid cceb0c3f54 Feature/tt table move filter reset 2024-07-24 15:04:03 +00:00
Luca Haid 75e8c6b2e7 Merge branch 'feature/warehouse-improvements' into 'master'
Feature/warehouse improvements

See merge request fronk/thetool!505
2024-07-24 14:16:54 +00:00
Luca Haid c3f949e1ac Feature/warehouse improvements 2024-07-24 14:16:54 +00:00
Luca Haid 9aafa93bc9 Merge branch 'feature/add-e-shop' into 'master'
Feature/add e shop

See merge request fronk/thetool!503
2024-07-24 13:25:50 +00:00
Luca Haid 6c79a9302f Feature/add e shop 2024-07-24 13:25:49 +00:00
Luca Haid 1c8f1acf2a Merge branch 'feature/tt-table-header-class' into 'master'
Feature/tt table header class

See merge request fronk/thetool!502
2024-07-23 14:19:55 +00:00
Luca Haid cd716a2e30 Feature/tt table header class 2024-07-23 14:19:54 +00:00
Luca Haid 1a7f18e3a3 Merge branch 'feature/tt-table-header-class' into 'master'
added headerClass property to tt-table

See merge request fronk/thetool!501
2024-07-23 14:15:53 +00:00
Luca Haid 44848b06c7 Merge branch 'feature/add-disable-filtering' into 'master'
added disable-filtering option

See merge request fronk/thetool!500
2024-07-23 13:50:46 +00:00
Luca Haid 04153eb8d3 Feature/preorder add history 2024-07-17 13:34:22 +00:00