diff --git a/plugins/atash/contact/classes/Payment.php b/plugins/atash/contact/classes/Payment.php index ba6d86b..f795d9f 100644 --- a/plugins/atash/contact/classes/Payment.php +++ b/plugins/atash/contact/classes/Payment.php @@ -63,10 +63,12 @@ class Payment 'description' => 'Täze plastik Kart almak üçin döwlet pajy.', 'userName' => Settings::get('bank_api_user'), 'password' => Settings::get('bank_api_password'), - // 'returnUrl' => route('paymentReturn', ['is_payment_successful' => 1]), - // 'failUrl' => route('paymentReturn', ['is_payment_cancelled' => 1]) - 'returnUrl' => 'http://localhost:8000/card-application/payment-result/?is_payment_successful=1', - 'failUrl' => 'http://localhost:8000/card-application/payment-result/?is_payment_cancelled=1', + // 'returnUrl' => route('paymentReturn', ['is_payment_successful' => 1]), + // 'failUrl' => route('paymentReturn', ['is_payment_cancelled' => 1]) + //'returnUrl' => 'http://localhost:8000/card-application/payment-result/?is_payment_successful=1', + //'failUrl' => 'http://localhost:8000/card-application/payment-result/?is_payment_cancelled=1', + 'returnUrl' => 'http://shahsyotag.halkbank.gov.tm/app/card-application/payment-result/?is_payment_successful=1', + 'failUrl' => 'http://shahsyotag.halkbank.gov.tm/app/card-application/payment-result/?is_payment_cancelled=1', ]; //Log:info($data); $http->data($data); diff --git a/plugins/rainlab/user/models/User.php b/plugins/rainlab/user/models/User.php index 2a11196..41bb818 100644 --- a/plugins/rainlab/user/models/User.php +++ b/plugins/rainlab/user/models/User.php @@ -62,7 +62,8 @@ class User extends UserBase 'password', 'password_confirmation', 'created_ip_address', - 'last_ip_address' + 'last_ip_address', + 'activated_at' ]; /** diff --git a/plugins/vdomah/jwtauth/routes.php b/plugins/vdomah/jwtauth/routes.php index 01d1907..c1f2428 100644 --- a/plugins/vdomah/jwtauth/routes.php +++ b/plugins/vdomah/jwtauth/routes.php @@ -49,7 +49,7 @@ Route::group(['prefix' => 'api'], function() { 'mobile_phone' => $userModel->mobile_phone, 'home_phone' => $userModel->home_phone, // - 'is_activated' => $userModel->is_activated, + 'is_activated' => 1, ]; } // if no errors are encountered we can return a JWT @@ -99,9 +99,11 @@ Route::group(['prefix' => 'api'], function() { App::abort(404, 'Page not found'); $login_fields = Settings::get('signup_fields', ['email', 'password', 'password_confirmation','surname','name','middle_name','date_birth','passport','place_passport','address_residence','mobile_phone','home_phone','username']); - +// $login_fields['is_activated'] = 1; + //dd(); $credentials = Input::only($login_fields); - // dd($credentials); +// $credentials['is_activated'] = 1; +// dd($credentials); try { $userModel = UserModel::create($credentials); @@ -154,10 +156,10 @@ Route::group(['prefix' => 'api'], function() { $data = Input::except(['username']); - // dd($data); +// dd($data); $rules = [ - 'email' => 'required|between:6,191|email', +// 'email' => 'required|between:6,191|email', 'name' => 'required', // 'surname' => 'required', // 'username' => 'required|digits_between:8,20|numeric', @@ -184,10 +186,10 @@ Route::group(['prefix' => 'api'], function() { // } } - if($me->email != $data['email']) { +// if($me->email != $data['email']) { // $me->email_verified = false; - $me->save(); - } + // $me->save(); + // } $me->fill($data); $me->save();