Commit graph

296 commits

Author SHA1 Message Date
IceToast c0ae772981 chore: ⚰️ Remove dead "use" 2023-01-15 02:24:16 +01:00
IceToast a34825a692 feat: Moved Stripe functions to extension 2023-01-15 01:41:16 +01:00
IceToast b72d142a81 chore: 🔥 Remove Paypal Code from payment controller 2023-01-15 00:41:57 +01:00
IceToast 69dd7a6855 fix: 🐛 Removed PayPal Routes -> to own extension 2023-01-14 23:33:30 +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
1day2die 9b7ca02f00 add theme support 2023-01-11 11:08:22 +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
ok236449 b6e45c443c fix admin overview year conditions
sort currencies
2023-01-04 18:57:57 +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
Dennis 8b8d73c3b2
Merge pull request #575 from ok236449/Partners-and-discounts
Partners and discounts
2023-01-02 13:09:18 +01:00
ok236449 3e99461a70 Fix admin overview error when node got deleted
on pterodactyl
2022-10-26 19:13:56 +02:00
ok236449 17e2d284af rename temporary price variable 2022-10-23 10:46:02 +02:00
ok236449 c7ec586157 sync servers button - deleted on ptero + names 2022-10-21 21:12:07 +02:00
ok236449 86cf2981c1 commission from first/every purchase 2022-10-18 23:33:33 +02:00
ok236449 63a30a1e57 Yearly tax overview, stop caching ticket overview 2022-10-14 22:59:02 +02:00
ok236449 d41a68c63e add discount to invoices 2022-08-27 20:35:17 +02:00
ok236449 dc0737e803 fix users table sorting and add users to payments 2022-08-27 19:44:27 +02:00
ok236449 3a53ddbc59 partner discounts and their referrals 2022-08-27 18:59:07 +02:00
ok236449 c763dac689 Stop caching nodes and counters - hotfix 2022-08-24 22:18:29 +02:00
ok236449 dfc3d0bd42 fix division by zero 2022-08-23 20:08:49 +02:00
ok236449 4871272670 Added latest tickets to admin overview 2022-08-20 21:19:27 +02:00
ok236449 5fc4103a7c Latest payments section 2022-08-20 17:07:54 +02:00
ok236449 043edf9a9b Show individual node status on admin overview 2022-08-19 19:18:44 +02:00
1Day 88538ab391 Update UserController.php 2022-08-12 12:44:15 +02:00
Dennis 487dd09f3e
Merge pull request #517 from jozefbonnar/email
Allows admins to force verify a users email
2022-08-10 20:25:42 +02:00
Jozef Bonnar 266057b666
Add forced email verify for admins 2022-08-10 19:11:02 +01:00
1day2die c823a03466 cleaning up some stuff. changing routes. making it work actually... 2022-08-02 17:37:59 +02:00
Jens 97f766db27
Update UserController.php
Fixes an issue when you update a user, it's impossible to update it, the check for referral_code is invalid.

Fixed:
- Deletes the custom check and uses laravel's check to ensure it's valid.
2022-07-19 20:27:16 +02:00
1Day 0c77046c93 Experimental Server Edit 2022-07-19 10:36:40 +02:00
1Day d197a2e251 Custom Ref ID 2022-07-12 07:33:48 +02:00
1Day 2bc5e91c25 small rewrite of activity log // log refs 2022-06-08 10:11:55 +02:00
1day2die ad8c8b5ebe fixed the worst error ive ever experienced 2022-06-07 21:58:04 +02:00
1day2die d2608c995c Add "both" mode to referrals 2022-06-07 16:04:41 +02:00
1Day 33a39fccd9 Switch Modes / Commission - Sign-Up 2022-06-07 10:05:19 +02:00
1Day 378187aea0 Referal System 2022-06-02 16:11:24 +02:00
1Day 8908f4af8f Fix User order on admin/user 2022-05-30 13:33:24 +02:00
1Day 60a8fa1056 Delete Nests and Nodes Controller 2022-05-30 11:13:37 +02:00
1Day e19ca05723 Refactoring 2022-05-30 11:07:10 +02:00
1Day 8e052572f7 Remove Discord button if not set || translation strings on welcome || total credits no admins 2022-05-30 09:53:11 +02:00
1Day a7b199c01a Add the ability to sell server slots 2022-05-30 09:23:35 +02:00
1day2die 4d3b88e59b Fixed Javascript exploit 2022-04-20 12:12:48 +02:00
IceToast f44641389a feat: 🥅 Updated non "Invoice does not exist" error message 2022-02-15 12:23:05 +01:00
Dennis 87f47b9a74
Hotfix Typo 2022-02-15 10:14:19 +01:00
IceToast e9e539c8c5 fix: 🚑️ Icon uploading 2022-02-07 15:30:47 +01:00
IceToast 53f6e0586c feat: Added basic currency support for invoices 2022-02-06 21:10:05 +01:00
IceToast 128b10bbb1 fix: replaced Settings::getValueByKey with config() 2022-01-25 22:52:19 +01:00
IceToast 9b797cf779
Merge branch 'development' into settings_rewrite 2022-01-23 15:00:23 +01:00
IceToast 8e739ccf74 fix: 🚑️ Fixed Config Variable Name 2022-01-15 17:53:47 +01:00
IceToast c8071b64d9 feat: Added Enable/Disable Invoices 2022-01-15 17:52:19 +01:00
IceToast 881d3e4b45 fix: 🚑️ create settings db entries if not existing & moved settingsController out of folder 2022-01-14 10:19:41 +01:00
1Day b9d5f83652 ptero settings in DB, phpmyadmin in db 2022-01-07 10:16:33 +01:00
1Day e959cc79cb payment settings in database 2022-01-07 09:54:01 +01:00
1Day 39177651a3 Invoice-Settings in new Settingsformat 2022-01-05 10:32:17 +01:00
1Day 41d79186bd List only main-Configs in the Main-Config-Table 2022-01-05 09:12:21 +01:00
1Day 63888f11e5 ability to slam all settings into one database 2022-01-05 08:57:41 +01:00
1Day efd8274088 Split InvoiceSettings and InvoiceController 2022-01-04 10:20:27 +01:00
1Day 6f1d372512 basics for the language-settings 2022-01-04 10:03:03 +01:00
1Day acc3371ba8 Download Invoices in Payment-View 2022-01-04 09:05:53 +01:00
IceToast 51c7361d73 feat: Moved "Configurations" to settings 2022-01-03 02:08:09 +01:00
IceToast c84b32c4b2 refactor: 🎨 Moved InvoiceSettingsController to Classes directory -> its not a controller -> needs renaming after db refactor 2022-01-03 01:59:40 +01:00
IceToast 267f28e6e9 feat: Added auto list item generation -> based on files in tabs directory 2022-01-03 01:52:44 +01:00
IceToast cd91931bc0 feat: 🎨 Moved Settingscontroller to their own directory 2022-01-02 19:34:51 +01:00
IceToast 9a54ab67e1 fix: 🐛 remove whitespaces before request of stripe payment_methods list in .env 2021-12-29 16:04:44 +01:00
1Day ae1fecef33 Add payment methode to invoice 2021-12-22 13:48:21 +01:00
IceToast b775ce6cc7 fix: 🚑️ changed the payment setup detection 2021-12-20 18:50:18 +01:00
IceToast a6f200ca55 refactor: ♻️ removed unused case in stripe webhook 2021-12-20 10:59:07 +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 31efac93f0 feat: Added stripe webhook payment succeed handler 2021-12-17 10:00:33 +01:00
1day2die 586bea8795 Translate Invoice-Email. Fix Typo 2021-12-16 19:38:25 +01:00
IceToast 16f7f4cb99 feat: Added StripeWebhook Route 2021-12-16 18:03:38 +01:00
IceToast 06eedeef68 feat: Added Stripe_METHODS to .env variables -> csl of methods to support 2021-12-16 16:19:14 +01:00
IceToast 2ba2c9ab82 chore: 🎨 added localization strings 2021-12-15 13:37:29 +01:00
IceToast 962ddb2fc3 fix: 🚑️ getStripeClient() 2021-12-15 12:31:16 +01:00
IceToast ef2c271257 refactor: 🔒️ Changed getStripeSecret Method -> differentiates between local/prod 2021-12-15 12:24:03 +01:00
IceToast 45b7d703a5 feat: ♻️ Changed payment Status to "paid" && Updated admin/payment table 2021-12-15 12:16:30 +01:00
IceToast 34a8d566a7 feat: modified db payment table 2021-12-15 11:41:57 +01:00
1Day 1d8e0e22dd Fully translate invoices 2021-12-15 11:25:37 +01:00
IceToast 1d72bac7fa feat: Added StripeClient generation 2021-12-15 10:56:58 +01:00
AVMG20 c6cfa6cd2f cleanup 2021-12-14 19:50:36 +01:00
Dennis 63c44e6c0b
Merge branch 'development' into Invoices 2021-12-14 18:54:58 +01:00
IceToast 921135c5dd feat: added StripeSuccess Route with session handling 2021-12-14 15:47:50 +01:00
IceToast 27794078cc feat: added correct currency code for stripe api 2021-12-14 15:47:50 +01:00
IceToast a77455c5fd feat: added StripePay Route 2021-12-14 15:47:50 +01:00
IceToast e3b8ff5045 Rename PaypalProduct -> CreditProduct 2021-12-14 15:47:50 +01:00
1Day 720622ae02 Fixed Datatables 2021-12-14 15:47:17 +01:00
1Day ae67bd9a42 fix vouchers 2021-12-13 16:27:56 +01:00
1Day 60b310bc0c multilanguage support 2021-12-13 13:28:01 +01:00
1Day b7bf406c57 beautify 2021-12-13 13:09:08 +01:00
1Day ff9be6b543 invoice translation 2021-12-13 12:52:13 +01:00
1Day 7ef8fdff4e guess im done? 2021-12-13 11:47:35 +01:00
1day2die 39af10ff95 formatting 2021-12-07 20:27:54 +01:00
1day2die f9206fd7ce Update SettingsController.php 2021-12-07 20:27:06 +01:00
1day2die cb89f65885 Update SettingsController.php 2021-12-07 20:26:20 +01:00
1day2die b826173bcb Update SettingsController.php 2021-12-07 20:25:56 +01:00
1day2die 16edf98dae Fialsafe if no invoices exist 2021-12-07 20:24:25 +01:00
1Day f8e099e133 Update SettingsController.php 2021-12-07 13:16:44 +01:00
1day2die a6de39bc32 small fixes, logo update, prefix update 2021-12-05 20:08:09 +01:00
1day2die 57e3cd8430 Upper/Lowercase fixes- PSR4 2021-12-04 16:35:04 +01:00
WBLKLeipe 86716961f3 download all invoices button 2021-12-02 09:54:30 +01:00
WBLKLeipe 9fff368662 fix small mistake 2021-12-01 13:32:47 +01:00
WBLKLeipe f62583a007 clean UI 2021-12-01 13:30:40 +01:00
WBLKLeipe afd2e2eb21 re-enable email notifications 2021-12-01 12:32:46 +01:00
WBLKLeipe 7f4503d228 invoice settings via DB and changeable 2021-12-01 12:19:06 +01:00
1day2die a11a9cf99c garkein bock mehr alter 2021-11-30 18:54:01 +01:00
1day2die ef3cc1e756 prepare the UI 2021-11-30 18:40:56 +01:00
1day2die c12e825b2e Attach invoice to mail 2021-11-30 18:18:15 +01:00
WBLKLeipe 8cfabf7088 small fixes 2021-11-30 16:30:48 +01:00
WBLKLeipe 69c41620b8 remove wrong save 2021-11-30 16:00:26 +01:00
WBLKLeipe 928086953c Logo, Template and Invoice stuff 2021-11-30 15:50:43 +01:00
WBLKLeipe 92f048c4bd save invoice in correct path 2021-11-30 14:52:36 +01:00
1day2die 21b9d70035 invoice DB, counting up, format stuff 2021-11-27 02:47:36 +01:00
1day2die bf848f0bcb lul 2021-11-26 20:46:26 +01:00
1day2die c3a777bdf4 First COmmit 2021-11-26 20:42:38 +01:00
AVMG20 47c251e48d removed out of credits info 2021-11-12 20:59:33 +01:00
AVMG 8e9895a40a
Merge pull request #276 from 1day2die/Out_of_credits_adminview
Show Client running out of Credits in Admin overview
2021-11-12 19:55:06 +01:00
AVMG20 53a4faa662 Fixed the file uploads in settings 2021-11-12 18:23:06 +01:00
WBLKLeipe 88944235f2 Show Client running out of Credits in Admin overview 2021-11-08 11:52:09 +01:00
Dennis 3fac4f87c0
Merge pull request #265 from 1day2die/fix_Tax
Full configurable Tax support
2021-11-07 20:57:11 +01:00
AnonDev 18e2a88e06
Update PaypalProductController.php 2021-11-07 18:06:32 +01:00
AnonDev c66f820462
Update ProductController.php 2021-11-07 18:05:47 +01:00
AnonDev 574dd24871
Update ServerController.php 2021-11-07 18:04:56 +01:00
AVMG20 2eb4d6ba74 updated side nav bar 2021-11-07 12:16:46 +01:00
AVMG20 bf5c36b232 cleanup 2021-11-07 12:10:46 +01:00
AVMG20 8c7c938c6a fine tuning :) 2021-11-07 12:07:30 +01:00
AVMG20 24e6d48496 removed pterodactyl pages, added overview page, made server create work 2021-11-07 01:47:16 +01:00
Jovan Jovanovic 9ac391d75b fix(tax): formatCurrency -> formatToCurrency 2021-11-06 01:32:51 +01:00
AVMG20 75622d3958 Merge remote-tracking branch 'origin/product_links' into development 2021-11-05 19:46:50 +01:00
1day2die 9e8abe314b Refactor as J22j suggested 2021-11-05 17:38:05 +01:00
WBLKLeipe 3f67ac5f21 Fixing FormatCurrency 2021-11-05 09:00:18 +01:00
WBLKLeipe 93d8dfcf0b EVERYTHING WORKING - Safing 2021-11-05 08:45:29 +01:00
WBLKLeipe c69c28bd89 Brackets! 2021-11-05 07:59:25 +01:00
WBLKLeipe 6797410cb4 Adding Tax, beautify 2021-11-05 07:43:57 +01:00
1day2die bff97e836d basically added tax 2021-11-04 21:42:17 +01:00
Dennis e89c25cdcf
Hotfix HotFix to change Hard-Coded Server-limit-after-IRL-Purchase
This is absolutely not tested as i have no dev env right now
2021-10-14 09:08:20 +02:00
Dennis c2dadbf996
Reverse changes 2021-10-14 09:03:59 +02:00
LogischJo e53a055bc2
Merge pull request #211 from j122j/minimum-credits
Add minimal credits per product
2021-10-06 21:55:11 +02:00
Dennis 4f953474cd
Merge pull request #216 from j122j/config-types
Change input type based on configuration type
2021-10-04 13:34:10 +02:00
Jovan Jovanovic 76595aa7bb Change input type based on configuration type 2021-10-03 23:47:06 +02:00
Jovan Jovanovic 6be22c0eea Add voucher users 2021-10-03 00:55:10 +02:00
Jovan Jovanovic 28af0c0530 Add minimal credits per product 2021-10-01 23:21:49 +02:00
Johannes 4c060fd270 Add the ability to Suspend Users 2021-09-26 17:50:13 +02:00
AVMG20 5877ddbe81 update auto unsuspend servers to be server resource friendlier 2021-09-09 21:09:57 +02:00
Jovan Jovanovic e764327e32
Merge branch 'development' into custom-notifications 2021-08-04 23:15:04 +02:00
Jovan Jovanovic e58b8c2aad Add array separator 2021-08-04 22:17:50 +02:00