omair/exchange
1
0
Fork 0
mirror of https://gitlab.com/omair-personal/exchange.git synced 2026-08-19 04:24:08 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'fix/forgot-password' into 'master'

Browse Source 
fix forgot-password

See merge request CIEFWorldwideSdnBhd/exchange!108
This commit is contained in:
Jack Goh
2018-08-09 07:32:38 +00:00
parent caf58ac4cf c2b1c9aa38
commit 1b6284bad9
7 changed files with 14 additions and 6 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitlab-ci.yml
+1 -1
View File
@@ -27,7 +27,7 @@ staging:
- chmod 400 ~/.ssh/id_rsa
- '[[ -f /.dockerenv ]] && echo -e "Host *\n\tStrictHostKeyChecking no\n\n" > ~/.ssh/config'
script:
- ssh izyim@40.76.84.105 "cd exchange && git add . && git commit -am "merge staging" && git pull origin master && sudo docker-compose -f docker-prod.yml build && sudo docker-compose -f docker-prod.yml up -d"
- ssh izyim@40.76.84.105 "cd exchange && git pull origin master && sudo docker-compose -f docker-prod.yml build && sudo docker-compose -f docker-prod.yml up -d"
environment:
name: staging
url: https://exchange-staging.izyim.com/
Dockerfile
+1
View File
@@ -22,6 +22,7 @@ RUN php artisan clear-compiled
COPY wait.sh /usr/local/bin/wait.sh
RUN chmod +x /usr/local/bin/wait.sh
RUN rm app/public/storage
RUN php artisan storage:link
CMD /usr/local/bin/wait.sh && composer update --no-scripts && composer dumpautoload && php artisan migrate && php artisan serve --host=0.0.0.0 --port=8000
app/Http/Controllers/Auth/ForgotPasswordController.php
+9 -2
View File
@@ -26,9 +26,16 @@ class ForgotPasswordController extends Controller
* @param string $response
* @return \Illuminate\Http\RedirectResponse
*/
protected function sendResetLinkEmail($response)
protected function sendResetLink(Request $request)
{
return ['status' => trans($response)];
if($request->input('email')) {
$this->sendResetLinkEmail($request);
}
return response()->json([
'error' => false,
'email' => $request->input('email'),
]);
}
/**
app/Http/Controllers/ChinaBankSlipController.php
+1
View File
@@ -56,6 +56,7 @@ class ChinaBankSlipController extends Controller
}
$china_bankslip = new ChinaBankSlip;
$china_bankslip->bank_branch = '-';
$china_bankslip->booking_id = $booking->id;
$china_bankslip->china_bank_slip_path = $upload_path;
$china_bankslip->save();
database/migrations/2018_08_02_141753_make_nullable_in_china_bank_slips_table.php
-1
View File
@@ -20,7 +20,6 @@ class MakeNullableInChinaBankSlipsTable extends Migration
$table->string('bank_address')->nullable()->change();
$table->string('swift')->nullable()->change();
$table->string('cnap')->nullable()->change();
$table->string('bank_branch')->nullable()->change();
$table->string('order_id')->nullable()->change();
$table->decimal('transfer_amount_needed')->nullable()->change();
$table->decimal('actual_transfer_amount')->nullable()->change();
routes/api.php
+1 -1
View File
@@ -60,7 +60,7 @@ Route::group(['middleware' => 'auth:api'], function () {
Route::group(['middleware' => 'guest:api'], function () {
Route::post('login', 'Auth\LoginController@login')->name('login');
Route::post('register', 'Auth\RegisterController@create');
Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLinkEmail');
Route::post('password/email', 'Auth\ForgotPasswordController@sendResetLink');
Route::post('password/reset', 'Auth\ResetPasswordController@reset');
Route::post('oauth/{driver}', 'Auth\OAuthController@redirectToProvider');
Route::get('oauth/{driver}/callback', 'Auth\OAuthController@handleProviderCallback')->name('oauth.callback');
tests/Feature/ChinaBankSlipTest.php
+1 -1
View File
@@ -55,7 +55,7 @@ class ChinaBankSlipTest extends TestCase
'actual_transfer_amount' => '12',
'details' => "123123",
'date' => "123123"
]);
]);
if(!file_exists($china_bank_slips_path) || $size_in_kb > 3072){
$response->assertStatus(400);
}