diff --git a/app/Http/Controllers/Admin/PaymentController.php b/app/Http/Controllers/Admin/PaymentController.php
index 2f2c2df6..65b534f8 100644
--- a/app/Http/Controllers/Admin/PaymentController.php
+++ b/app/Http/Controllers/Admin/PaymentController.php
@@ -18,6 +18,7 @@ use Illuminate\Http\RedirectResponse;
use Illuminate\Http\Request;
use Illuminate\Support\Facades\Auth;
use App\Helpers\ExtensionHelper;
+use App\Settings\GeneralSettings;
use App\Settings\LocaleSettings;
class PaymentController extends Controller
@@ -38,7 +39,7 @@ class PaymentController extends Controller
* @param ShopProduct $shopProduct
* @return Application|Factory|View
*/
- public function checkOut(ShopProduct $shopProduct)
+ public function checkOut(ShopProduct $shopProduct, GeneralSettings $general_settings)
{
$discount = PartnerDiscount::getDiscount();
$price = $shopProduct->price - ($shopProduct->price * $discount / 100);
@@ -69,6 +70,7 @@ class PaymentController extends Controller
'total' => $shopProduct->getTotalPrice(),
'paymentGateways' => $paymentGateways,
'productIsFree' => $price <= 0,
+ 'credits_display_name' => $general_settings->credits_display_name
]);
}
diff --git a/app/Http/Controllers/Admin/ShopProductController.php b/app/Http/Controllers/Admin/ShopProductController.php
index 8c6f671b..87e04290 100644
--- a/app/Http/Controllers/Admin/ShopProductController.php
+++ b/app/Http/Controllers/Admin/ShopProductController.php
@@ -83,11 +83,12 @@ class ShopProductController extends Controller
* @param ShopProduct $shopProduct
* @return Application|Factory|View|Response
*/
- public function edit(ShopProduct $shopProduct)
+ public function edit(ShopProduct $shopProduct, GeneralSettings $general_settings)
{
return view('admin.store.edit', [
'currencyCodes' => config('currency_codes'),
'shopProduct' => $shopProduct,
+ 'credits_display_name' => $general_settings->credits_display_name
]);
}
diff --git a/app/Http/Controllers/Admin/VoucherController.php b/app/Http/Controllers/Admin/VoucherController.php
index e8f747d5..73498176 100644
--- a/app/Http/Controllers/Admin/VoucherController.php
+++ b/app/Http/Controllers/Admin/VoucherController.php
@@ -125,11 +125,12 @@ class VoucherController extends Controller
return redirect()->back()->with('success', __('voucher has been removed!'));
}
- public function users(Voucher $voucher, LocaleSettings $locale_settings)
+ public function users(Voucher $voucher, LocaleSettings $locale_settings, GeneralSettings $general_settings)
{
return view('admin.vouchers.users', [
'voucher' => $voucher,
- 'locale_datatables' => $locale_settings->datatables
+ 'locale_datatables' => $locale_settings->datatables,
+ 'credits_display_name' => $general_settings->credits_display_name
]);
}
diff --git a/app/Http/Controllers/ServerController.php b/app/Http/Controllers/ServerController.php
index 8b572888..8a13ca11 100644
--- a/app/Http/Controllers/ServerController.php
+++ b/app/Http/Controllers/ServerController.php
@@ -79,7 +79,7 @@ class ServerController extends Controller
}
/** Show the form for creating a new resource. */
- public function create(UserSettings $user_settings, ServerSettings $server_settings)
+ public function create(UserSettings $user_settings, ServerSettings $server_settings, GeneralSettings $general_settings)
{
$validate_configuration = $this->validateConfigurationRules($user_settings, $server_settings);
@@ -115,7 +115,8 @@ class ServerController extends Controller
'eggs' => $eggs,
'user' => Auth::user(),
'server_creation_enabled' => $server_settings->creation_enabled,
- 'min_credits_to_make_server' => $user_settings->min_credits_to_make_server
+ 'min_credits_to_make_server' => $user_settings->min_credits_to_make_server,
+ 'credits_display_name' => $general_settings->credits_display_name
]);
}
@@ -268,7 +269,7 @@ class ServerController extends Controller
}
/** Show Server Settings */
- public function show(Server $server, ServerSettings $server_settings)
+ public function show(Server $server, ServerSettings $server_settings, GeneralSettings $general_settings)
{
if ($server->user_id != Auth::user()->id) {
return back()->with('error', __('This is not your Server!'));
@@ -308,7 +309,8 @@ class ServerController extends Controller
return view('servers.settings')->with([
'server' => $server,
'products' => $products,
- 'server_enable_upgrade' => $server_settings->enable_upgrade
+ 'server_enable_upgrade' => $server_settings->enable_upgrade,
+ 'credits_display_name' => $general_settings->credits_display_name
]);
}
diff --git a/app/Http/Controllers/StoreController.php b/app/Http/Controllers/StoreController.php
index e29b9846..6ae24117 100644
--- a/app/Http/Controllers/StoreController.php
+++ b/app/Http/Controllers/StoreController.php
@@ -3,13 +3,14 @@
namespace App\Http\Controllers;
use App\Models\ShopProduct;
+use App\Settings\GeneralSettings;
use App\Settings\UserSettings;
use Illuminate\Support\Facades\Auth;
class StoreController extends Controller
{
/** Display a listing of the resource. */
- public function index(UserSettings $user_settings)
+ public function index(UserSettings $user_settings, GeneralSettings $general_settings)
{
$isPaymentSetup = false;
@@ -33,7 +34,8 @@ class StoreController extends Controller
return view('store.index')->with([
'products' => ShopProduct::where('disabled', '=', false)->orderBy('type', 'asc')->orderBy('price', 'asc')->get(),
- 'isPaymentSetup' => $isPaymentSetup,
+ 'isPaymentSetup' => true,
+ 'credits_display_name' => $general_settings->credits_display_name
]);
}
}
diff --git a/themes/default/views/admin/products/edit.blade.php b/themes/default/views/admin/products/edit.blade.php
index fb99ec03..4a0d9e24 100644
--- a/themes/default/views/admin/products/edit.blade.php
+++ b/themes/default/views/admin/products/edit.blade.php
@@ -75,7 +75,7 @@