update making requests

app/Http/Controllers/Web/ImportController.php

@@ -10,6 +10,7 @@ use MeiliSearch\Endpoints\Indexes;
 use App\Http\Controllers\Controller;
 use Maatwebsite\Excel\Facades\Excel;
 use App\Http\Resources\ImportResource;
+use App\Models\BirzhaUser;
 
 class ImportController extends Controller
 {
@@ -20,6 +21,16 @@ class ImportController extends Controller
      */
     public function index()
     {
+        try {
+            $userId = preg_split("/[\s\[\]\",]+/", \Cookie::get('user_auth'))[1];
+            // $userId = 64;
+
+            $user = BirzhaUser::find($userId);
+        } catch (Throwable $th) {
+            \Log::info($th);
+            return Inertia::location(env('PARENT_APP'));
+        }
+
         if (blank(request('group'))) {
             request()->merge([
                 'group' => optional(Group::whereType('import')->where('is_default', true)->first())->id
@@ -66,6 +77,7 @@ class ImportController extends Controller
             'countries' => fn () => Import::countries($ids),
             'units' => fn () => Import::units($ids),
             'currencies' => fn () => Import::currencies($ids),
+            'user' => fn () => $user
         ]);
     }
 

app/Http/Controllers/Web/RequestController.php

@@ -41,7 +41,6 @@ class RequestController extends Controller
         $rules = [
             'phone' => ['required'],
             'password' => ['required'],
-            'dial_code' => ['required'],
             'first_name' => ['required'],
             'last_name' => ['required'],
             'email' => ['required', 'email'],
@@ -59,10 +58,9 @@ class RequestController extends Controller
             ], 400);
         }
 
-        $loginResponse = Http::post('http://127.0.0.1:8000/api/login', [
+        $loginResponse = Http::post('http://127.0.0.1:8000/api/auth-for-make-requests', [
             'username' => $input['phone'],
             'password' => $input['password'],
-            'dial_code' => '+' . $input['dial_code']
         ]);
 
         $loginResponseStatus = $loginResponse->status();
@@ -107,7 +105,7 @@ class RequestController extends Controller
                 
                 if($balanceResponseStatus == 201) {
                     RequestModel::create(array_merge($request->only(['first_name', 'last_name', 'email', 'org_type', 'items']), [
-                        'phone' => '+' . $input['dial_code'] . $input['phone']
+                        'phone' => $input['phone']
                     ]));
                 }
 

resources/js/Components/CreateRequestModal.vue

@@ -17,24 +17,7 @@
           <a-form-item
             :label="trans('Phone')"
           >
-            <a-row :gutter="8" type="flex" align="middle">
-              <a-col :span="3">
-                <vue-country-code
-                  @onSelect="onSelect"
-                  :preferredCountries="['tm']"
-                  :defaultCountry="'tm'">
-                </vue-country-code>
-              </a-col>
-              <a-col :span="2">
-                <span>{{ countryCode }}</span>
-              </a-col>
-              <a-col :span="19">
-                <a-input v-model="form.phone" :placeholder="trans('Phone')" />
-              </a-col>
-            </a-row>
-            <template v-if="validationErrorsObj.phone">
-              <span class="validation-error" v-for="item in validationErrorsObj.phone" :key="item">{{ item }}</span>
-            </template>
+            <a-input v-model="form.phone" :placeholder="trans('Phone')" disabled />
           </a-form-item>
           <a-form-item
             :label="'Password'"
@@ -47,10 +30,10 @@
         </div>
 
         <!-- Warning text -->
-        <div class="w-4/12 warning-text not-registered" v-show="warningMessages.notRegistered">
+        <!-- <div class="w-4/12 warning-text not-registered" v-show="warningMessages.notRegistered">
           <p>{{ trans('Need to be registered') }}</p>
           <p>{{ trans('Not registered') }} <a href="http://birzha#register" class="font-bold text-primary">{{ trans('Click here') }}</a></p>
-        </div>
+        </div> -->
         <div class="w-4/12 warning-text low-balance" v-show="warningMessages.lowBalance">
           <p>{{ trans('Fill balance') }}</p>
           <p>{{ trans('Low balance') }} <a href="http://birzha/tm/balance" class="font-bold text-primary">{{ trans('Click here') }}</a></p>
@@ -80,7 +63,7 @@
           <a-form-item
             :label="trans('Email')"
           >
-            <a-input v-model="form.email" :placeholder="trans('Email')" />
+            <a-input v-model="form.email" :placeholder="trans('Email')" disabled />
             <template v-if="validationErrorsObj.email">
               <span class="validation-error" v-for="item in validationErrorsObj.email" :key="item">{{ item }}</span>
             </template>
@@ -159,6 +142,7 @@
 export default {
   props: {
     selectedItems: { type: Array, default: () => [] },
+    user: { type: Object, default: () => {} },
   },
 
   // components: {
@@ -174,11 +158,11 @@ export default {
       visible: true,
       type: "local",
       form: this.$inertia.form({
-        phone: undefined,
+        phone: this.user.username,
         password: undefined,
-        first_name: undefined,
-        last_name: undefined,
-        email: undefined,
+        first_name: this.user.name,
+        last_name: this.user.surname,
+        email: this.user.email,
         org_type: undefined,
         // captcha: undefined,
         items: [
@@ -191,7 +175,7 @@ export default {
       }),
       validationErrorsObj: {},
       loader: false,
-      countryCode: '',
+      // countryCode: this.user.dial_code,
     };
   },
 
@@ -231,10 +215,10 @@ export default {
       };
     },
 
-    onSelect({name, iso2, dialCode}) {
-      console.log(name, iso2, dialCode);
-      this.countryCode = dialCode
-    },
+    // onSelect({name, iso2, dialCode}) {
+    //   console.log(name, iso2, dialCode);
+    //   this.countryCode = dialCode
+    // },
 
     deleteDangerClass() {
       let warningParagraphs = document.querySelectorAll('.warning-text')
@@ -253,7 +237,7 @@ export default {
 
       this.form.totalPrice = this.totalPrice
       this.form.currency = this.currency
-      this.form.dial_code = this.countryCode
+      // this.form.dial_code = this.countryCode
 
       fetch(this.route('requests.store'), {
         method: 'POST',

resources/js/Pages/Imports.vue

@@ -149,6 +149,7 @@
     <create-request-modal
       v-if="createRequestVisible"
       :selected-items="selectedItems"
+      :user="user"
       @close="createRequestVisible = false"
     />
   </div>
@@ -161,7 +162,7 @@ import InfiniteLoading from "vue-infinite-loading";
 import CreateRequestModal from "@/Components/CreateRequestModal";
 
 export default {
-  props: ["imports", "countries", "units", "currencies", "filters", "groups"],
+  props: ["imports", "countries", "units", "currencies", "filters", "groups", "user"],
 
   components: { ImportModal, CreateRequestModal, InfiniteLoading },