added SMS gateway for forgot password

config/app.php

@@ -188,6 +188,9 @@ return [
         ],
     ],
 
+    'sms_gateway' => env('SMS_GATEWAY'),
+    'check_sms_gateway' => env('CHECK_SMS_GATEWAY'),
+
     /*
     |--------------------------------------------------------------------------
     | Autoloaded Service Providers

packages/TPS/Shop/src/Http/Controllers/Registration.php

@@ -157,14 +157,10 @@ class Registration extends Controller
 
     public function update(CustomerProfileRequest $customerProfileRequest)
     {
-        // dd("hi");
         $isPasswordChanged = false;
-        // dd($customerProfileRequest);
 
         $data = $customerProfileRequest->validated();
 
-        // dd($data);
-
         if (isset($data['date_of_birth']) && $data['date_of_birth'] == '') {
             unset($data['date_of_birth']);
         }
@@ -244,7 +240,8 @@ class Registration extends Controller
         return redirect()->back($this->_config['redirect']);
     }
 
-    public function resetPassword(Request $request){
+    public function resetPassword(Request $request){ 
+
         $request->validate([
             'phone' => 'required|digits:8'
         ]);
@@ -253,17 +250,20 @@ class Registration extends Controller
             ->where('phone', $request->phone)
             ->first()){
 
-            $token = rand(1000,9999);
+            $res = Event::dispatch('shop.register.verify', $request);
 
-            $customer->token = $token;
-            $customer->save();
-
-            $request->merge(['token'=>$token]);
-
-
-            Event::dispatch('shop.register.verify', $request);
+            $res = $res[0];
 
+            if (!$res->successful()) {
+                return response()->json([
+                    'success' => false,
+                    'status' => $res->status(),
+                    'error' => $res->body()
+                ], $res->status());
+            }
+        
             return response()->json(['success' => true]);
+
         }else{
             return response([
                 'message' => trans('shop::app.customer.login-text.no_account'),
@@ -285,9 +285,20 @@ class Registration extends Controller
 
         if($customer = $this->customerRepository
             ->where('phone', $request->phone)
-            ->where('token', $request->token)
             ->first()){
 
+            $res = Event::dispatch('shop.register.checkVerify', $request);
+
+            $res = $res[0]; 
+
+            if ($res->status() !== 200) {
+                return response()->json([
+                    'success' => false,
+                    'status' => $res->status(),
+                    'error' => $res->body()
+                ], $res->status());
+            }
+
             $customer->password = bcrypt($request->password);
             $customer->save();
 

packages/TPS/Shop/src/Listeners/Customer.php

@@ -6,21 +6,24 @@ use Illuminate\Support\Facades\Log;
 class Customer
 {
     public function __construct(){
-//        $this->sms_gateway = env('SMS_GATEWAY_ADDRESS','http://sms.digital-tps.tk/api/verify/web');
-        $this->sms_gateway = 'https://tmex.gov.tm/api/version';
+        $this->sms_gateway = config('app.sms_gateway'); 
+        $this->check_sms_gateway = config('app.check_sms_gateway');
     }
 
     public function sendVeificationCode($data){
-//        Http::withHeaders(['Accept' => 'application/json'])
-//            ->post($this->sms_gateway, $data->only(['phone','token']));
-
         $response = Http::withHeaders(['Accept' => 'application/json'])
-            ->get($this->sms_gateway, ['to' => '993'.$data->phone,'content'=> $data->token]);
+        ->post($this->sms_gateway, [
+            'phone_number' => '+993'.$data->phone
+        ]);
+        return $response;
+    }
 
-//PARENT_APP=https://tmex.gov.tm/tm/girmek
-        //[2022-12-14 17:06:30] production.INFO: SQLSTATE[23000]: Integrity constraint violation: 1452 Cannot add or update a child row: a foreign key constraint fails (`exchange25042022_2`.`exports`, CONSTRAINT `exports_group_id_foreign` FOREIGN KEY (`group_id`) REFERENCES `g
-        //roups` (`id`) ON DELETE CASCADE) (SQL: insert into `exports` (`locale`, `category_id`, `group_id`, `type`, `currency`, `title`, `unit`, `amount`, `price`, `payment`, `send`, `point`, `country`, `seller`, `place`, `updated_at`, `created_at`) values (tm, 3, q, extern
-        //al, USD, "Cadillac STS" awtomobili (bronirlenen), 2010ý. nowa belgisi 1G6DU6EA4A0119765 (ýuzt.511169) (Türkmenistanyň Prezidentiniň Diwany, Iş Dolandyryş Müdirligi), sany, 1, 72500, öňünden tölemek, EXW, Aşgabat ş., Germaniýa, 2, =I58, 2022-12-14 17:06:30, 2022-12-14
-        // 17:06:30))
+    public function checkVeificationCode($data){
+        $response = Http::withHeaders(['Accept' => 'application/json'])
+        ->post($this->check_sms_gateway, [
+            'phone_number' => '+993'.$data->phone,
+            'otp' => $data->token
+        ]);
+        return $response;
     }
 }

packages/TPS/Shop/src/Providers/EventServiceProvider.php

@@ -14,5 +14,6 @@ class EventServiceProvider extends ServiceProvider
      */
     public function boot(){
         Event::listen('shop.register.verify', 'TPS\Shop\Listeners\Customer@sendVeificationCode');
+        Event::listen('shop.register.checkVerify', 'TPS\Shop\Listeners\Customer@checkVeificationCode');
     }
 }

packages/TPS/Shop/src/Resources/views/shop/customers/signup/recovery-form.blade.php

@@ -18,7 +18,7 @@
                                data-vv-as=""{{ ucfirst(__('shop::app.customer.account.address.create.phone')) }}"">
                         <span class="control-error" v-if="errors.has('register.phone')">@{{ errors.first('register.phone') }}</span>
                     </div>
-                </div>
+                </div> 
                 <button type="submit" class="log-in topped sms-trigger" :disabled="disable_button">{{ __('shop::app.customer.forgot-password.submit') }}</button>
             </form>
         </div>
@@ -34,18 +34,17 @@
                 <div class="sign-up-input">
                     <span>{{ __('shop::app.customer.reset-password.token') }}</span>
                     <div class="dif-input">
-                        <input type="text" name="token" v-model="code" v-validate="'required|numeric|min:4'" >
-                        <span class="control-error" v-if="errors.has('token')">@{{ errors.first('token') }}</span>
+                        <input type="text" name="token" v-model="code" v-validate="'required|numeric|min:4'">
+                        <span class="control-error" v-if="errors.has('reset.token')">@{{ errors.first('reset.token') }}</span>
                     </div>
                 </div>
                 <div class="sign-up-input">
                     <span>{{ __('shop::app.customer.reset-password.password') }}</span>
                     <div class="dif-input">
                         <input type="password" v-model="password" autocomplete="off" name="password" v-validate="'required|min:6'" ref="password">
-                        <span class="control-error" v-if="errors.has('password')">@{{ errors.first('password') }}</span>
+                        <span class="control-error" v-if="errors.has('reset.password')">@{{ errors.first('reset.password') }}</span>
                     </div>
                 </div>
-
                 <button type="submit" class="log-in topped">{{ __('shop::app.customer.reset-password.submit-btn-title') }}</button>
                 <div class="sign-up-footer">
                     <span>{{ __('shop::app.customer.reset-password.no-message') }}</span>
@@ -113,54 +112,72 @@
                     }
                 });
             },
-            resetPassword(scope){
+            resetPassword(scope) {
                 let self = this;
 
                 self.message = null;
+                self.error_message = null;
+
 
                 self.disable_button = true;
-                this.$validator.validateAll(scope).then(result =>{
+
+                // Validate the form fields
+                this.$validator.validateAll(scope).then(result => {
                     if (result) {
-                        axios.post('{{ route('customer.register.reset_password') }}', {phone: self.phone,token:self.code,password: self.password})
-                            .then(function(response) {
-                                // console.log(response.data);
+                        // Validation successful, send the request
+                        axios.post('{{ route('customer.register.reset_password') }}', {
+                            phone: self.phone,
+                            token: self.code,
+                            password: self.password
+                        })
+                        .then(function(response) {
+                            window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}];
+                            self.$root.addFlashMessages();
 
-                                window.flashMessages = [{'type': 'alert-success', 'message': response.data.message}];
+                            setTimeout(function() {
+                                let loginForm = document.querySelector('.login-form');
+                                let resetForm = document.querySelector('.reset-password');
+                                loginForm.style.display = 'block';
+                                resetForm.style.display = 'none';
+                                self.reset_password = false;
+                            }, 1500);
 
-                                self.$root.addFlashMessages();
+                            self.disable_button = false;
+                        })
+                        .catch(function(error) {
+                            console.error('Error received:', error.response.data);
 
-                                // window.location.href = response.data.redirect;
-                                setTimeout(function() {
-                                    let loginForm = document.querySelector('.login-form');
-                                    let resetForm = document.querySelector('.reset-password');
-                                    loginForm.style.display = 'block';
-                                    resetForm.style.display = 'none';
-                                    self.reset_password = false
-                                }, 1500);
+                            self.error_message = error.response.data.message;
+                            self.disable_button = false;
 
-                                self.disable_button = false;
-                            })
-                            .catch(function(error) {
-                                self.error_message = error.response.data.message;
-                                // self.$setErrorsFromResponse(error.response.data);
-                                self.disable_button = false;
+                            if (error.response.data.errors) {
                                 let errorFields = Object.keys(error.response.data.errors);
                                 errorFields.map(field => {
                                     let errorString = error.response.data.errors[field].join(', ');
                                     self.$validator.errors.add({
-                                        field:field,
+                                        field: field,
                                         msg: errorString,
-                                        scope:scope
+                                        scope: scope
                                     });
                                 });
-                            });
-                    }else {
+                            }
+                        });
+                    } else {
+                        // Validation failed
                         self.disable_button = false;
-                        eventBus.$emit('onFormError')
-                    }
 
+                        // Display validation errors
+                        let validationErrors = this.$validator.errors.items.filter(e => e.scope === scope);
+                        self.error_message = validationErrors.map(e => e.msg).join(', ');
+
+                        eventBus.$emit('onFormError');
+                    }
+                }).catch(err => {
+                    console.error('Validation error:', err);
                 });
             }
+
+
         }
     });
 </script>