etehadie removed

app/Http/Controllers/Admin/DashboardController.php

@@ -11,7 +11,6 @@ use App\Models\Product;
 use App\Models\TransactionsAdmin;
 use App\Models\Withdraw;
 use App\Services\ConfigService;
-use App\Services\EtehadiePriceService;
 use Carbon\Carbon;
 use Hekmatinasser\Verta\Verta;
 use Illuminate\Http\Request;
@@ -87,13 +86,14 @@ class DashboardController extends Controller
 
         $gramPrice = (int) ($tallaPrice->price ?? 0);
         $FPrices = [];
-        if (app(ConfigService::class)->usesEtehadiePricing()) {
-            $etehadie = app(EtehadiePriceService::class)->fetchMainGramPrice();
-            if (($etehadie['price'] ?? 0) > 0) {
-                $gramPrice = (int) round($etehadie['price'] / 10);
+        $mainProductId = app(ConfigService::class)->mainProductId();
+        if ($mainProductId) {
+            $mainProduct = Product::find($mainProductId);
+            if ($mainProduct) {
+                $gramPrice = (int) ($mainProduct->price + ($mainProduct->price_profit ?? 0));
                 $FPrices[] = [
-                    'id' => 'etehadie',
-                    'name' => 'اتحادیه',
+                    'id' => 'main_product',
+                    'name' => $mainProduct->title ?? 'محصول اصلی',
                     'price' => $gramPrice,
                     'profit' => 0,
                 ];

app/Http/Controllers/Admin/ProductController.php

@@ -170,7 +170,7 @@ class ProductController extends SuperController
 //        }catch (\Exception $e){}
 
         $config = app(ConfigService::class);
-        $mainProductId = Cnt::where('key', 'main_product')->value('value');
+        $mainProductId = app(ConfigService::class)->mainProductId();
         $hasExtremeKeys = Setting::whereIn('key', ['up_price', 'down_price'])->count() === 2;
         $products = Product::with([])->whereNotNull('reading_method')->get();
         foreach ($products as $product) {

app/Http/Controllers/Admin/SettingsController.php

@@ -10,7 +10,10 @@ use Illuminate\Support\Facades\Artisan;
 class SettingsController extends Controller
 {
     public function index(){
-        $Setting = Setting::where('can_edit',1)->select('id','title_fa', 'key','value','description','is_active','type')->get();
+        $Setting = Setting::where('can_edit', 1)
+            ->select(Setting::adminSelectColumns())
+            ->get();
+
         return response()->json($Setting);
     }
     public function edit(Request $request)
@@ -19,23 +22,25 @@ class SettingsController extends Controller
         $setting = Setting::where('key', $request->key)->first();
 
         if ($setting) {
-            // Update the existing setting
             $setting->value = $request->value;
             $setting->description = $request->description;
             $setting->is_active = $request->is_active;
-            $setting->type = $request->type??'';
-            $setting->title_fa = $request->title_fa??'';
+            $setting->title_fa = $request->title_fa ?? '';
+            if (Setting::hasTypeColumn()) {
+                $setting->type = $request->type ?? '';
+            }
             $setting->save();
         } else {
-            // Create a new setting
             $setting = new Setting();
             $setting->key = $request->key;
-            $setting->type = $request->type??$request->type??'';
-            $setting->title_fa = $request->title_fa??$setting->title_fa??'';
+            $setting->title_fa = $request->title_fa ?? '';
             $setting->value = $request->value;
             $setting->description = $request->description;
             $setting->is_active = $request->is_active;
             $setting->can_edit = 1;
+            if (Setting::hasTypeColumn()) {
+                $setting->type = $request->type ?? '';
+            }
             $setting->save();
         }