From eec356f22d7aae6c768bdc9887ab8bda31673c77 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Sat, 30 Jun 2018 10:29:03 +0800 Subject: [PATCH] fix wrong timeout fix seeder info to newer info --- app/Http/Controllers/BookingController.php | 20 ++++++++++++-------- database/seeds/BookTableSeeder.php | 9 +++++++-- database/seeds/SettingCreditSeeder.php | 2 +- 3 files changed, 20 insertions(+), 11 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 3bf7bcc8..e553add7 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -30,8 +30,9 @@ class BookingController extends Controller // set timeout $date1 = new DateTime($booking->created_at); $date2 = new DateTime(); - $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); - $booking->timeout = $difference_in_seconds; + $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit; + $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U')); + $booking->timeout = $difference_in_seconds; // TODO : you can make it better if($difference_in_seconds < 0 ){ @@ -160,10 +161,12 @@ class BookingController extends Controller $booking->invoice_path = Storage::url($invoice->invoice_path); } + // set timeout + $date1 = new DateTime($booking->created_at); $date2 = new DateTime(); - $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); - - $booking->timeout = $difference_in_seconds; + $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit; + $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U')); + $booking->timeout = $difference_in_seconds; if (!$booking){ return response()->json(['success'=>false, 'message'=>'not found'], 404); @@ -203,11 +206,12 @@ class BookingController extends Controller $booking->invoice_path = Storage::url($invoice->invoice_path); } + // set timeout $date1 = new DateTime($booking->created_at); $date2 = new DateTime(); - $difference_in_seconds = ($date1->format('U') + 600) - ($date2->format('U')); - - $booking->timeout = $difference_in_seconds; + $time_in_seconds = SettingCredit::orderby('updated_at','desc')->first()->time_limit; + $difference_in_seconds = ($date1->format('U') + $time_in_seconds) - ($date2->format('U')); + $booking->timeout = $difference_in_seconds; if (!$booking){ return response()->json(['success'=>false, 'message'=>'not found'], 404); diff --git a/database/seeds/BookTableSeeder.php b/database/seeds/BookTableSeeder.php index 1f01c281..b312ebf4 100644 --- a/database/seeds/BookTableSeeder.php +++ b/database/seeds/BookTableSeeder.php @@ -27,10 +27,15 @@ class BookTableSeeder extends Seeder 'bank_address' => 'cyber', 'swift_code' => 'qwe123', 'cnap' => '123asd', - 'term' => 'x1', - 'amount' => 1.2, + 'term' => 'x1_cash', + 'amount' => 200, + 'rmb_book_amount' => 200, + 'bia' => 189, + 'rate' => 1.2, 'rate_id' => $rate->id, 'user_id' => $user->id, + 'status' => 2, + 'admin_status' => 1, 'created_at' => Carbon::now()->format('Y-m-d H:i:s'), 'updated_at' => Carbon::now()->format('Y-m-d H:i:s'), ]); diff --git a/database/seeds/SettingCreditSeeder.php b/database/seeds/SettingCreditSeeder.php index 0087203e..a79c1e2d 100644 --- a/database/seeds/SettingCreditSeeder.php +++ b/database/seeds/SettingCreditSeeder.php @@ -15,7 +15,7 @@ class SettingCreditSeeder extends Seeder DB::table('setting_credits')->insert([ 'rmb_credit_limit' => '4000', 'usd_credit_limit' => '5000', - 'time_limit' => '600' + 'time_limit' => '6000' ]); } }