Commit graph

68 commits

Author SHA1 Message Date
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
1day2die 5d7550b43f TinyMCE, MOTD, 2023-01-12 15:43:24 +01:00
1day2die 2304b64d9a fixes 2023-01-05 19:33:46 +01:00
Shift 78980a993f
Adopt anonymous migrations 2023-01-05 17:03:31 +00: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
einsz e08d173e78 change migration down to the old state 2023-01-04 06:47:37 +01:00
einsz 4645427403 change nest description to text
fixes error 500 on long nest description
2023-01-03 19:19:07 +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 13b9d964a4 chore: Update to latest cpgg 2022-12-19 15:13:19 +01:00
1day2die c15d0f4ef6 Fix Ticket System 2022-11-29 09:20:24 +01:00
ok236449 3a53ddbc59 partner discounts and their referrals 2022-08-27 18:59:07 +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
SahrulGnwn 9b3fce2808 Ticket Blacklist 2022-08-12 16:01:51 +07:00
1Day fcbf7ffe45 ptero client key 2022-08-11 15:14:50 +02:00
SahrulGnwn 94bbea2690 Ticket System 2022-08-01 23:52:16 +07:00
IceToast 32384044ea fix: 🐛 Typo 2022-07-22 03:51:05 +02:00
IceToast 690e0e7e12 feat: Added migrations undo last patch db update & add cancelation of servers 2022-07-22 01:50:45 +02:00
IceToast 16eb9eeca6 Merge branch 'main' of https://github.com/ControlPanel-gg/dashboard into billing_system 2022-07-20 23:16:41 +02:00
1Day f3269bac57 decimals in server price and tax 2022-07-12 07:17:09 +02:00
IceToast d7c0c26f35 fix: 🐛 Renamed Migration & changed precision on decimals to more reasonable number 2022-06-16 15:33:44 +02:00
IceToast d7830eeb41 feat: Added Migration -> last billed field to servers 2022-06-16 11:59:17 +02:00
IceToast 8383fa03aa fix: 🐛 Added Migration -> Updated user credits column to be decimal 2022-06-16 11:56:05 +02:00
IceToast 950278c948 fix: Updated Migration to calculate hourly price from existing products 2022-06-16 11:55:34 +02:00
IceToast 8f38b9e023 feat: Added Migration -> Column Billing Period 2022-06-16 11:32:00 +02:00
Dennis 42ff82c310
Better Code Gen 2022-06-07 10:18:33 +02:00
1Day c0e0c99a1b fixes 2022-06-02 16:31:06 +02:00
1Day 378187aea0 Referal System 2022-06-02 16:11:24 +02:00
1Day b4cde73528 Update 2021_12_15_120346_update_to_payments_table.php 2022-05-30 11:21:40 +02:00
1Day e19ca05723 Refactoring 2022-05-30 11:07:10 +02:00
IceToast e79e38ee27 feat: 🔒️ readded missing configurations migration & fixed old paypal_products migration & added seeder descriptions 2022-01-23 23:52:46 +01:00
IceToast 9b797cf779
Merge branch 'development' into settings_rewrite 2022-01-23 15:00:23 +01:00
IceToast 5dc5b8a95a fix: 🚑️ removed old migration renaming (wrong one) 2022-01-20 09:32:22 +01:00
IceToast 4621547c01 feat: Allow value column in table to be nullable -> can store "0" values 2022-01-15 00:49:33 +01:00
IceToast 96f5f45b58 feat: Added db migration -> configurations to settings table 2022-01-05 18:56:51 +01:00
1Day 39177651a3 Invoice-Settings in new Settingsformat 2022-01-05 10:32:17 +01:00
1Day 63888f11e5 ability to slam all settings into one database 2022-01-05 08:57:41 +01:00
IceToast 0a75de9689 fix: 🚑️ Added DB-Migration -> renaming paypal_products table to credit_products 2021-12-28 21:38:55 +01:00
Dennis 24d68a8bed
Merge pull request #340 from 1day2die/development
Remove translationmanager
2021-12-22 13:07:23 +01:00
1Day 09fc130306 Remove translationmanager 2021-12-22 10:36:35 +01:00
IceToast 84ec3e583c feat: Added invoice creation on stripe route & webhook 2021-12-17 11:22:37 +01:00
IceToast 754a3e38b8 Merge branch 'development' into stripe_integration
# Conflicts:
#	app/Http/Controllers/Admin/CreditProductController.php
#	app/Http/Controllers/Admin/PaymentController.php
#	composer.lock
#	resources/views/admin/payments/index.blade.php
#	resources/views/admin/store/edit.blade.php
#	resources/views/store/checkout.blade.php
#	resources/views/store/index.blade.php
2021-12-17 10:41:32 +01:00
IceToast bd56c6b320 fix: 🐛 payments migration 2021-12-15 13:30:32 +01:00
IceToast ae47ebfcc6 feat: Added payment table migration 2021-12-15 13:07:51 +01:00
IceToast 34a8d566a7 feat: modified db payment table 2021-12-15 11:41:57 +01:00
Dennis 26eb7c349e
Merge branch 'Invoices' into development 2021-12-14 19:31:14 +01:00
AVMG20 505bf7b6fa added translation manager 2021-12-14 19:17:44 +01:00
IceToast e3b8ff5045 Rename PaypalProduct -> CreditProduct 2021-12-14 15:47:50 +01:00
WBLKLeipe a2ab45d28c fix .env.example and migration 2021-12-01 12:27:49 +01:00
1day2die a11a9cf99c garkein bock mehr alter 2021-11-30 18:54:01 +01:00