Commit graph

145 commits

Author SHA1 Message Date
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 f8c33d43be
fix: 🐛 Typo 2023-02-06 14:18:47 +01:00
IceToast 994314dbe4
feat: Added migrations undo last patch db update & add cancelation of servers 2023-02-06 14:18:47 +01:00
IceToast 5b738be6e1
fix: 🐛 Renamed Migration & changed precision on decimals to more reasonable number 2023-02-06 14:17:01 +01:00
IceToast 195cadc6a5
feat: 📝 Updated ProductSeeder 2023-02-06 14:13:25 +01:00
IceToast 00e525a764
feat: Added Migration -> last billed field to servers 2023-02-06 14:12:58 +01:00
IceToast 23cc70d79c
fix: 🐛 Added Migration -> Updated user credits column to be decimal 2023-02-06 14:12:58 +01:00
IceToast 88a8541623
fix: Updated Migration to calculate hourly price from existing products 2023-02-06 14:12:58 +01:00
IceToast 54325fbf3e
feat: Added Migration -> Column Billing Period 2023-02-06 14:12:58 +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
IceToast 5ae631ee4f
refactor: ♻️ Move referral_code generation to trait 2023-01-29 23:12:34 +01:00
1day2die 8b4477bc8d finish usefullinks, fix vite 2023-01-26 23:26:00 +01:00
Dennis 0cfa02b4ce
[Feature] Add useful links in top menubar (#662) 2023-01-26 16:08:57 +01:00
1day2die b343134c01 using enums, adding more positions 2023-01-26 15:22:42 +01:00
1day2die f923eef868 Useful Links in Topbar 2023-01-25 22:32:59 +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 b8516c423e fix user factory, fix loadingtimes of users table 2023-01-16 18:30:25 +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
1day2die 2304b64d9a fixes 2023-01-05 19:33:46 +01:00
Shift 0e3f6c98aa
Shift cleanup 2023-01-05 17:03:38 +00:00
Shift 78980a993f
Adopt anonymous migrations 2023-01-05 17:03:31 +00:00
Shift abb28548f1
Remove unnecessary $model property 2023-01-05 17:02:37 +00:00
Shift acb0c08ab4
Use Faker methods
Accessing Faker properties was deprecated in Faker 1.14.
2023-01-05 17:02:35 +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 5d18b36083 feat: added new settings 2022-12-22 22:28:52 +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
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
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