Commit graph

130 commits

Author SHA1 Message Date
IceToast 931f08a1d7 fix: 🐛 Try Catch for upgrade routing 2024-04-24 10:47:39 +02:00
IceToast 330ea45c5b fix: 🐛 Try catch for possible non available settings 2024-04-12 21:01:00 +02:00
Ferks-FK 640468acbe Finish the coupon base. 2023-06-08 20:24:15 +02:00
Ferks-FK 72f3decd3f Feat: Let's implement the coupons now 2023-06-08 20:24:15 +02:00
1day2die 1c179702d0 Re-Implement Image uploading 2023-05-11 11:07:09 +02:00
1day2die 166dccd3de Update web.php 2023-05-08 21:16:06 +02:00
Dennis ee968ff961
[Feature] Add billing cycles (#823) 2023-05-08 11:59:58 +02:00
1day2die 6bba6123c6 Update to new Settings 2023-05-08 11:55:17 +02:00
IceToast 5b95dd4d13 Merge branch 'billing_system' into feature/billing_cycles
# Conflicts:
#	app/Http/Controllers/Admin/ProductController.php
#	app/Http/Controllers/ServerController.php
#	app/Models/Server.php
#	app/Models/User.php
#	lang/cs.json
#	lang/en.json
#	themes/default/views/admin/products/create.blade.php
#	themes/default/views/admin/products/edit.blade.php
#	themes/default/views/admin/settings/tabs/system.blade.php
#	themes/default/views/servers/create.blade.php
#	themes/default/views/servers/index.blade.php
#	themes/default/views/servers/settings.blade.php
2023-05-08 11:03:10 +02:00
1day2die 6ef0b63c36 API Fixes || Missing: Update Role 2023-05-08 10:45:47 +02:00
1day2die 4c780deb02 All permissions except Settings 2023-05-05 01:11:55 +02:00
1day2die 804a800d4f full frontend perms showing roles 2023-05-03 16:16:50 +02:00
1day2die 0ffceb535d simple starting permissions. only admin 2023-04-30 02:22:59 +02:00
IceToast b4b86198e6
Merge branch 'main' into billing_system 2023-03-09 11:58:17 +01:00
IceToast c3420b1684 feat: Add Settings update route & Validation functionality 2023-02-24 14:02:28 +01:00
Ferks-FK 411441e1a8 Migrate all variables in the front-end 2023-02-24 14:02:28 +01:00
Johannes F af5d28e2a5 feat: Reopen tickets 2023-02-14 22:58:19 +01:00
IceToast d6341d41c9
Merge branch 'billing_system' of github.com:IceToast/cpgg_monthly_billing_addon into billing_system 2023-02-06 14:47:32 +01:00
IceToast 7fa9bf2062
feat: Added Server Cancelation route method and charging 2023-02-06 14:20:32 +01:00
1day2die 9420231b58 Edit category name 2023-02-02 13:47:21 +01:00
1day2die 630ebc6b88 Editable Ticket categories 2023-02-01 11:07:37 +01:00
1day2die eeed88aba8 Refactor whole PartnerController 2023-01-31 10:38:43 +01:00
Dennis 6263f163f9
[FEATURE] wysiwyg editor for imprint/Tos/privacy (#669) 2023-01-29 23:15:35 +01:00
IceToast da19554a46 Update Billing-System to V0.9
# Conflicts:
#	app/Console/Kernel.php
#	app/Http/Controllers/Admin/ProductController.php
#	app/Http/Controllers/Admin/ServerController.php
#	app/Http/Controllers/ServerController.php
#	app/Models/Server.php
#	composer.lock
#	database/seeders/Seeds/ProductSeeder.php
#	lang/bg.json
#	lang/bs.json
#	lang/cs.json
#	lang/de.json
#	lang/en.json
#	lang/es.json
#	lang/he.json
#	themes/default/views/servers/create.blade.php
#	themes/default/views/servers/index.blade.php
2023-01-23 16:19:32 +01:00
IceToast 64cd6ac98c feat: Added API-Route support for extensions 2023-01-18 18:05:32 +01:00
IceToast e6ef07139d feat: Moved Stripe routes to extension 2023-01-15 01:40:25 +01:00
IceToast 3cb42a8b60 Merge branch 'development' into feature/extendable_payment_gateways
# Conflicts:
#	app/Http/Controllers/Admin/PaymentController.php
2023-01-14 21:51:20 +01:00
Dennis aacbd6780c
Merge branch 'development' into shift-77419 2023-01-06 00:13:50 +01:00
Dennis 7c717ec61c
Many Many small Fixes
adding minimum credits field in settings (it was present only in the database)
added frontend checks for settings fields (numbers)
added close ticket button for non-admin users
fixed some datatable´s sorting, adding some field, removing dupes,... (etc. Payments table, Products table, Tickets tables)
TOS, imprint and privacy policy in footer - as default they are now disabled
Made partner discounts a little bit easier to understand
little changes to delete user popup (in their profile)
removed the hamburger menu from server cards and made only a single phpmyadmin button
2023-01-06 00:09:48 +01:00
Dennis 81756c2587
Merge pull request #612 from ok236449/Partners-and-discounts
Partners and discounts - finishing it up
2023-01-06 00:09:33 +01:00
ok236449 7ca842e712 many many fixes 2023-01-06 00:01:23 +01:00
Shift 70208d2157
Apply Laravel coding style
Shift automatically applies the Laravel coding style - which uses the PSR-12 coding style as a base with some minor additions.

You may customize the code style applied by configuring [Pint](https://laravel.com/docs/pint), [PHP CS Fixer](https://github.com/FriendsOfPHP/PHP-CS-Fixer), or [PHP CodeSniffer](https://github.com/squizlabs/PHP_CodeSniffer) for your project root.

For more information on customizing the code style applied by Shift, [watch this short video](https://laravelshift.com/videos/shift-code-style).
2023-01-05 17:01:42 +00:00
ok236449 ed5a968d11 finishing up of Partner checkout
support for 100% discount
2023-01-04 18:59:52 +01:00
IceToast 23cb226196 feat: Added payment.pay route and enhanced checkOut route controller to serve gateways to view 2023-01-03 21:17:25 +01:00
IceToast 16a7391372 feat: Fixed extension routes & Added PayPal Extension Routes 2023-01-03 18:31:21 +01:00
IceToast 4041955296 feat: Added Extension routes 2023-01-03 13:50:23 +01:00
1day2die bd2eec9a28 user allowed to delete himself 2023-01-02 15:00:57 +01:00
1day2die d02d6e78ae added TOS 2023-01-02 13:46:21 +01:00
Dennis 8b8d73c3b2
Merge pull request #575 from ok236449/Partners-and-discounts
Partners and discounts
2023-01-02 13:09:18 +01:00
IceToast a2743376f8 refactor: 🚚 Move imprint/privacy to own directory 2022-12-22 22:36:28 +01:00
IceToast 3edff8f6fc feat: Added Imprint and Privacy Page & Links 2022-12-22 22:30:09 +01:00
IceToast 549b2830f9 chore: Update to latest cpgg version 2022-11-11 13:40:31 +01:00
Dennis 6c581ae52a
Merge pull request #595 from Ferks-FK/features-#299
New Options
2022-11-07 09:28:39 +01:00
Ferks-FK 8a2d7b67f1 Add a warning of blocked server creation for adm's 2022-11-04 19:15:48 +00:00
ok236449 c7ec586157 sync servers button - deleted on ptero + names 2022-10-21 21:12:07 +02:00
ok236449 3a53ddbc59 partner discounts and their referrals 2022-08-27 18:59:07 +02:00
IceToast 7d363246b0 Merge branch 'main' into billing_system 2022-08-21 19:56:25 +02:00
IceToast ff5ad1e2bd feat: Added validation on enable upgrade system & disabled upgrade route if not enabled 2022-08-16 22:33:59 +02:00
IceToast 7365cdee18 Merge branch 'main' into billing_system
# Conflicts:
#	app/Http/Controllers/ServerController.php
#	composer.lock
#	resources/lang/de.json
#	resources/lang/en.json
#	resources/views/servers/index.blade.php
2022-08-15 12:39:58 +02:00
1day2die 1ca4cea5a4 globally limit post requests 2022-08-13 22:29:57 +02:00