diff --git a/app/Http/Controllers/Admin/CustomerController.php b/app/Http/Controllers/Admin/CustomerController.php
index b04bb46..f7ee636 100644
--- a/app/Http/Controllers/Admin/CustomerController.php
+++ b/app/Http/Controllers/Admin/CustomerController.php
@@ -266,22 +266,20 @@ class CustomerController extends SuperController
         if (empty($request->national_code)) {
             throw new UnprocessableEntityHttpException('لطفا شماره ملی وارد کنید.');
         }
-        if(empty($request->birth_date)){
-            throw new UnprocessableEntityHttpException('لطفا تاریخ تولد وارد کنید.');
+        if(!empty($request->birth_date)){
+            $birth_date = Verta::instance(Carbon::parse($request->birth_date))->format('Ymd');
         }
-        $birth_date = Verta::instance(Carbon::parse($request->birth_date))->format('Ymd');
         $card_number = preg_replace('/\D/', '', $request->cart_number);
 
-//        dd("ok");
-
-        $response = $this->jibit("cartMatching", $card_number, $request->national_code, $birth_date);
-
+        $response = $this->jibit("cartMatching", $card_number, $request->national_code, $birth_date ?? null);
+        if(isset($response['refresh'])){
+            unset($response['refresh']);
+        }
         if(!empty($response)){
-            if (isset($response['cartData'])) {
-                unset($response['refresh']);
-                return response()->json($response);
-            }elseif(!empty($response['message'])){
+            if(!empty($response['message'])){
                 throw new UnprocessableEntityHttpException($response['message']);
+            }else{
+                return response()->json($response);
             }
         }else{
             throw new UnprocessableEntityHttpException('ارتباط با سامانه قطع میباشد.');
diff --git a/app/Http/Controllers/Admin/SettingsController.php b/app/Http/Controllers/Admin/SettingsController.php
index 64ba5f3..f659ed4 100644
--- a/app/Http/Controllers/Admin/SettingsController.php
+++ b/app/Http/Controllers/Admin/SettingsController.php
@@ -31,6 +31,7 @@ class SettingsController extends Controller
             $setting->value = $request->value;
             $setting->description = $request->description;
             $setting->is_active = $request->is_active;
+            $setting->can_edit = 1;
             $setting->save();
         }
 
diff --git a/app/Http/Controllers/Controller.php b/app/Http/Controllers/Controller.php
index 5c06b20..96b732e 100644
--- a/app/Http/Controllers/Controller.php
+++ b/app/Http/Controllers/Controller.php
@@ -212,6 +212,8 @@ class Controller extends BaseController
         if (isset( $apiData['cartMatching']['matched']) and  $apiData['cartMatching']['matched'] == true) {
             $apiData['cartData'] = Http::withoutVerifying()->withToken(Storage::get('accessTokenGibit'))->get("https://napi.jibit.ir/ide/v1/cards?number=$p1&iban=true")->json();
             return $apiData;
+        }elseif(isset( $apiData['cartMatching']['matched']) and  $apiData['cartMatching']['matched'] == false){
+            return $apiData;
         } else {
             throw new UnprocessableEntityHttpException($apiData['cartMatching']['message']);
         }