Commit graph

125 commits

Author SHA1 Message Date
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
1day2die 586bea8795 Translate Invoice-Email. Fix Typo 2021-12-16 19:38:25 +01:00
IceToast 2ba2c9ab82 chore: 🎨 added localization strings 2021-12-15 13:37:29 +01:00
IceToast 45b7d703a5 feat: ♻️ Changed payment Status to "paid" && Updated admin/payment table 2021-12-15 12:16:30 +01:00
AVMG20 9ebca3aec3 logo padding fix 2021-12-14 19:36:44 +01:00
Dennis 63c44e6c0b
Merge branch 'development' into Invoices 2021-12-14 18:54:58 +01:00
1Day d9b9eb369e fix spaces 2021-12-14 16:08:51 +01:00
Dennis d572a603d3
Merge branch 'development' into localization 2021-12-14 16:06:45 +01:00
1Day 82ce13fcbd resolve conflicts 2021-12-14 16:05:27 +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 47b7402db8 fix column 2021-12-14 15:24:53 +01:00
IceToast fdd0f2131a style: 💄 fixed code formatting 2021-12-14 00:38:45 +01:00
1day2die e2328cb328 Translate Datatables 2021-12-13 22:39:40 +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
1Day 6bc01d5ae6 All blade files 2021-12-13 11:14:42 +01:00
1Day 70828b6d48 fully translateable backend 2021-12-13 10:12:32 +01:00
1Day 88eafb72c5 quicksave 2021-12-13 08:59:27 +01:00
1Day 24ee173326 saving progress 2021-12-13 08:42:53 +01:00
1day2die 9644fe0fe2 first steps 2021-12-06 17:11:48 +01:00
1day2die a6de39bc32 small fixes, logo update, prefix update 2021-12-05 20:08:09 +01:00
1Day 75c550e0c1 Fixes requested by IceToast 2021-12-02 12:01:11 +01:00
WBLKLeipe 86716961f3 download all invoices button 2021-12-02 09:54:30 +01:00
WBLKLeipe f62583a007 clean UI 2021-12-01 13:30:40 +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
IceToast 38f1273d2d fix: 🚑️ swapped nodes/eggs column naming -> now correct order 2021-11-29 09:24:18 +01:00
AVMG20 47c251e48d removed out of credits info 2021-11-12 20:59:33 +01:00
AVMG20 d15a9dabdb cloning minimum credits fixed 2021-11-12 20:42:12 +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
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
AVMG20 16a7d174e9 new server create page w.i.p 2021-11-06 01:56:57 +01:00
AVMG20 75622d3958 Merge remote-tracking branch 'origin/product_links' into development 2021-11-05 19:46:50 +01:00
WBLKLeipe 93d8dfcf0b EVERYTHING WORKING - Safing 2021-11-05 08:45:29 +01: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 4bc9d4cdce Fix tooltips 2021-10-03 21:28:34 +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
Dennis 2d21d2d2ca
Added better Logs 2021-09-27 15:32:27 +02:00
Jovan Jovanovic 212a537279 Add value to all checkbox and close form tag 2021-08-08 15:14:01 +02:00
Jovan Jovanovic e764327e32
Merge branch 'development' into custom-notifications 2021-08-04 23:15:04 +02:00
Jovan Jovanovic b120322732 Fix something I think 2021-08-04 23:09:58 +02:00
Jovan Jovanovic e97ae55725 Send notification to multiple users 2021-08-04 22:01:50 +02:00
Jovan Jovanovic bb2b239ebb Remove unused javascript 2021-08-03 22:49:45 +02:00
Jovan Jovanovic a19cbb1575 Merge database and mail fields 2021-08-03 22:46:58 +02:00
Jovan Jovanovic 0597b4aabe Add admin ui 2021-08-03 04:03:02 +02:00
AVMG20 370c85585c added the option to change the credits display name 2021-08-02 19:25:33 +02:00
Jovan Jovanovic f0a31fd4e2 Add support to add time for voucher expires_at 2021-07-28 18:22:12 +02:00
AVMG20 78d298c119 added datetime picker and better date validation 2021-07-12 12:54:59 +02:00
AVMG20 7c4fedfa93 added activity log to vouchers, added rate limits to voucher redeem form 2021-07-10 09:41:24 +02:00
AVMG20 7aa6acb5d8 added the ability to edit vouchers 2021-07-10 09:10:42 +02:00
AVMG20 55b2223435 Added Voucher system 2021-07-10 08:58:11 +02:00
AVMG20 a7f8d71f92 Added voucher system 2021-07-10 00:18:22 +02:00
AVMG20 ed553674b2 Added voucher system 2021-07-10 00:11:13 +02:00
AVMG20 c31d67e2f4 added clone function to clone products 2021-07-06 23:19:25 +02:00
AVMG20 bd45b3b713 Linking of products to nodes and/or eggs 2021-07-06 21:38:13 +02:00
AVMG a5cd1234dc
Merge pull request #97 from LogischJo/patch-1
Change link for cronjob docs
2021-06-29 18:52:41 +02:00
LogischJo 9a7ded93b8
Change link for cronjob docs 2021-06-28 20:20:56 +02:00
AVMG20 b445cf7003 Some love to payments
Fixed a bug with the new payment changes
Improved the payments table and changes
2021-06-23 11:28:57 +02:00
AVMG20 e40b2c49b2 added extra config option for server limit after purchases 2021-06-22 21:25:04 +02:00
AVMG e0199589dc
Merge branch 'development' into useful_links_and_menu 2021-06-10 23:36:50 +02:00
AVMG20 690abe03ba Auto stash before revert of "Merge remote-tracking branch 'origin/development' into development"
Added all the plugins from adminlite, added usefulllinks tab
2021-06-10 23:29:25 +02:00
AVMG20 ffa6035c2b Auto stash before revert of "Merge remote-tracking branch 'origin/development' into development"
Added all the plugins from adminlite, added usefulllinks tab
2021-06-10 23:25:13 +02:00
LogischJo 5aba2c27bc
Password Changes from Admin User Edit (#33)
* Password Changes from Admin User Edit

With this Commit Admins can change the user password from the admin user edit page

* Admin Password Change: UI Changes
2021-06-09 00:16:31 +02:00
Arno ecc3c66589 WIP added api keys and user api endpoint 2021-06-06 20:22:40 +02:00
AVMG20 7c644b3960 added the ability to edit users pterodactyl id 2021-06-06 12:11:35 +02:00
AVMG20 e5d638ee5e first init 2021-06-05 11:26:32 +02:00