NASER fix conflicts

app/Http/Controllers/Admin/WalletController.php

@@ -18,6 +18,7 @@ use Rooyesh\Wallet\models\Transaction;
 use Rooyesh\Wallet\models\Wallet;
 use Symfony\Component\HttpKernel\Exception\UnprocessableEntityHttpException;
 use App\Http\Controllers\Admin\TahesabController;
+use App\Models\Setting;
 
 
 class WalletController extends Controller
@@ -117,9 +118,16 @@ class WalletController extends Controller
             'active' => true
         ], 7, true, $deposit, $gold_block);
 
-        $data['direction'] = 0;
-//        $tahesab = new TahesabController();
-//        $tahesab->wallet($data);
+        if(Setting::where('key', 'send_to_tahesab')->first()->value == "true"){
+            try {
+                $data['direction'] = 0;
+                $tahesab = new TahesabController();
+                $tahesab->wallet($data);
+            }catch (\Exception $e){
+                return response($e->getMessage(), 500);
+            }
+        }
+
         $status = $data['value'] > 0 ?" شارژ شد ": " کسر شد ";
         $message = 'کیف پول شما به اندازه ' . number_format(abs($data['value'])) . " ریال در تاریخ " . verta()->format('Y/n/j H:i:s') .$status . "بابت" . "\n"
             . $data['note']