Commit graph

83 commits

Author SHA1 Message Date
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 7d974d3408 role powers 2023-05-05 11:17:40 +02:00
1day2die 83d7590b60 fix installer, new users get role 2023-04-30 12:13:01 +02:00
1day2die 0ffceb535d simple starting permissions. only admin 2023-04-30 02:22:59 +02:00
Ferks-FK cfd370eb6d Too many changes to mention. 2023-02-24 14:02:28 +01:00
Ferks-FK 636d4e259e Register all classes in the config file 2023-02-24 14:02:28 +01:00
Ferks-FK 5305ae7803 fix: Ternary would always return 'true' 2023-02-24 14:02:28 +01:00
Ferks-FK 2229586b58 feat: implement laravel-settings 2023-02-24 14:02:28 +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 195cadc6a5
feat: 📝 Updated ProductSeeder 2023-02-06 14:13:25 +01:00
IceToast bd11bd2657
Revert "Merge branch 'v0.10' into development"
This reverts commit e6a545309f, reversing
changes made to 036fe6f47f.
2023-02-01 21:03:20 +01:00
IceToast e6a545309f
Merge branch 'v0.10' into development 2023-02-01 20:55:34 +01:00
1day2die 8b4477bc8d finish usefullinks, fix vite 2023-01-26 23:26:00 +01:00
Ferks-FK 6b848b1446 Multiple changes 2023-01-25 18:42:54 +00: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
Ferks-FK 977d2ddd18 Simple fix of a checkbox 2023-01-22 19:58:28 +00:00
IceToast 5fd58514b5 Merge branch addons/billing_period into V0.10 2023-01-21 15:13:48 +01:00
Dennis bd7d2770a2
Update SettingsSeeder.php 2023-01-19 16:15:53 +01:00
IceToast c3ec17e1e8 fix: 🐛 Disable Referral by defualt 2023-01-19 16:07:23 +01:00
1day2die a0800509cb ticket notify 2023-01-13 19:32:32 +01:00
1day2die 540bb95291 SEO 2023-01-13 18:41:32 +01:00
1day2die 5d7550b43f TinyMCE, MOTD, 2023-01-12 15:43:24 +01:00
1day2die ae16fd6d6a change adress to address 2023-01-12 10:25:28 +01:00
1day2die 9b7ca02f00 add theme support 2023-01-11 11:08:22 +01:00
1day2die 94fe7d245c Alert on Homepage 2023-01-10 19:45:19 +01:00
Dennis aacbd6780c
Merge branch 'development' into shift-77419 2023-01-06 00:13:50 +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
Dennis 8b8d73c3b2
Merge pull request #575 from ok236449/Partners-and-discounts
Partners and discounts
2023-01-02 13:09:18 +01:00
IceToast 5d18b36083 feat: added new settings 2022-12-22 22:28:52 +01:00
IceToast 549b2830f9 chore: Update to latest cpgg version 2022-11-11 13:40:31 +01:00
Ferks-FK 98045d8896 General fixes 2022-11-04 17:15:16 +00:00
Ferks-FK 566383ccd5 Initial commits to the new options 2022-11-03 22:15:06 +00:00
ok236449 86cf2981c1 commission from first/every purchase 2022-10-18 23:33:33 +02:00
IceToast 35479c9cfc chore: Update to newest CPGG Main version 2022-10-13 23:34:12 +02:00
IceToast 7d363246b0 Merge branch 'main' into billing_system 2022-08-21 19:56:25 +02:00
ok236449 67ab374f07 merge to v0.8.2 2022-08-19 19:37:37 +02:00
ok236449 043edf9a9b Show individual node status on admin overview 2022-08-19 19:18:44 +02:00
IceToast 07825b0b4b chore: 🌱 Added enable_upgrade setting to seeder 2022-08-16 22:37:40 +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
1Day b9d44b589d im stoopid 2022-08-12 12:50:29 +02:00
IceToast b726326e99 feat: 📝 Updated ProductSeeder 2022-06-16 12:01:53 +02:00
1day2die b8d3378b02 fix typo 2022-06-07 17:26:17 +02:00
1Day 33a39fccd9 Switch Modes / Commission - Sign-Up 2022-06-07 10:05:19 +02:00
1day2die 7ed402a227 choose who can see their referral URL 2022-06-02 18:41:08 +02:00
1Day 378187aea0 Referal System 2022-06-02 16:11:24 +02:00
1Day c4520830d9 Create Seeder 2022-05-30 12:03:55 +02:00
1Day e19ca05723 Refactoring 2022-05-30 11:07:10 +02:00
1Day 4be83c4c0d Fix MailFromName showing as ${APPNAME} 2022-02-02 11:58:16 +01:00
IceToast 30879c606d fix: 🐛 correct stripe_methods seed 2022-01-29 04:21:48 +01:00