From 503e3aec5b79b22643fefad4e377be7f82a7d259 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Thu, 5 Jul 2018 17:56:49 +0800 Subject: [PATCH 1/4] added marking to user table added marking on registration --- .../Controllers/Auth/RegisterController.php | 1 + ...07_05_095441_add_marking_to_user_table.php | 31 +++++++++++++++++++ 2 files changed, 32 insertions(+) create mode 100644 database/migrations/2018_07_05_095441_add_marking_to_user_table.php diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 7f0e1e90..e86685b1 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -78,6 +78,7 @@ class RegisterController extends Controller $user = new User(); $user->name = $data['name']; $user->email = $data['email']; + $user->marking = $marking->marking; $user->password = bcrypt($data['password']); $user->save(); diff --git a/database/migrations/2018_07_05_095441_add_marking_to_user_table.php b/database/migrations/2018_07_05_095441_add_marking_to_user_table.php new file mode 100644 index 00000000..d8824ab7 --- /dev/null +++ b/database/migrations/2018_07_05_095441_add_marking_to_user_table.php @@ -0,0 +1,31 @@ +string('marking'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} From 59fc234ea04e75de0b0accfa31ce588c9f71525c Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Sat, 7 Jul 2018 12:06:21 +0800 Subject: [PATCH 2/4] updated user has many booking to bookings added index booking with user marking added turncate marking when seeding added turncate settingmalaysiabank when seeding added marking to user seeder --- app/Booking.php | 4 ++-- app/Http/Controllers/BookingController.php | 9 ++++----- app/User.php | 2 +- database/seeds/BookTableSeeder.php | 2 +- database/seeds/MarkingSeeder.php | 1 + database/seeds/SettingMalaysiaBankSeeder.php | 1 + database/seeds/UsersTableSeeder.php | 4 ++-- 7 files changed, 12 insertions(+), 11 deletions(-) diff --git a/app/Booking.php b/app/Booking.php index c63969cc..ee0b5126 100644 --- a/app/Booking.php +++ b/app/Booking.php @@ -7,7 +7,7 @@ use Illuminate\Database\Eloquent\Model; class Booking extends Model { // protected $guarded = []; - protected $hidden = array('user_id', + protected $hidden = array("user_id", "rate_id", "rmb_book_amount", "rmb_book_pay_method", @@ -29,7 +29,7 @@ class Booking extends Model public $timestamps = true; public function user(){ - return $this->belongsTo('app\User'); + return $this->belongsTo(User::class); } public function supplierBooking(){ diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index f38cb4f9..95b24562 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -20,12 +20,11 @@ class BookingController extends Controller public function index(){ $user = Auth::user(); - $bookings = Booking::select('id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') + $bookings = Booking::select('user_id', 'id', 'created_at', 'status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->where('user_id', $user->id) ->orderby('updated_at','desc') ->paginate(10); - // reformat to fit frontend structure foreach ($bookings as $booking) { // set timeout @@ -42,7 +41,7 @@ class BookingController extends Controller // TODO : transfer_amount change name to bia $booking->transfer_amount = $booking->bia; - + $booking->track_status = "(". $booking->status ."/7)"; switch ($booking->status) { case 1: @@ -69,9 +68,9 @@ class BookingController extends Controller default: $status_desc = ""; } - $booking->status_desc = $status_desc; + $booking->marking = $booking->user->marking; } - + return $bookings; } diff --git a/app/User.php b/app/User.php index 27b460ef..ae87b308 100644 --- a/app/User.php +++ b/app/User.php @@ -98,7 +98,7 @@ class User extends Authenticatable implements JWTSubject return []; } - public function booking(){ + public function bookings(){ return $this->hasMany(Booking::class); } diff --git a/database/seeds/BookTableSeeder.php b/database/seeds/BookTableSeeder.php index b312ebf4..5dfc3fd9 100644 --- a/database/seeds/BookTableSeeder.php +++ b/database/seeds/BookTableSeeder.php @@ -35,7 +35,7 @@ class BookTableSeeder extends Seeder 'rate_id' => $rate->id, 'user_id' => $user->id, 'status' => 2, - 'admin_status' => 1, + 'admin_status' => 2, '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/MarkingSeeder.php b/database/seeds/MarkingSeeder.php index eab923a7..6686060a 100644 --- a/database/seeds/MarkingSeeder.php +++ b/database/seeds/MarkingSeeder.php @@ -11,6 +11,7 @@ class MarkingSeeder extends Seeder */ public function run() { + DB::table('markings')->truncate(); DB::table('markings')->insert([ 'marking' => 'hehe', 'email' => 'hehe@gmail.com' diff --git a/database/seeds/SettingMalaysiaBankSeeder.php b/database/seeds/SettingMalaysiaBankSeeder.php index 5fe33b9c..c53dd640 100644 --- a/database/seeds/SettingMalaysiaBankSeeder.php +++ b/database/seeds/SettingMalaysiaBankSeeder.php @@ -11,6 +11,7 @@ class SettingMalaysiaBankSeeder extends Seeder */ public function run() { + DB::table('setting_malaysia_banks')->truncate(); DB::table('setting_malaysia_banks')->insert([ 'company_name' => 'CIEF', 'bank_name' => 'Maybank', diff --git a/database/seeds/UsersTableSeeder.php b/database/seeds/UsersTableSeeder.php index ac5c6584..51ea3589 100644 --- a/database/seeds/UsersTableSeeder.php +++ b/database/seeds/UsersTableSeeder.php @@ -16,8 +16,8 @@ class UsersTableSeeder extends Seeder DB::table('users')->delete(); $users = array( - ['name' => 'User', 'email' => 'user@example.com', 'password' => Hash::make('secret')], - ['name' => 'Admin', 'email' => 'admin@example.com', 'password' => Hash::make('secret')], + ['name' => 'User', 'marking'=> 'X9', 'email' => 'user@example.com', 'password' => Hash::make('secret')], + ['name' => 'Admin', 'marking'=> 'X10', 'email' => 'admin@example.com', 'password' => Hash::make('secret')], ); foreach ($users as $user) From 71e11fa0349b79da3012b5b59c4d416b4e2e7ad9 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Sat, 7 Jul 2018 12:12:27 +0800 Subject: [PATCH 3/4] added marking to admin booking index hide roles in user model hide user from booking model --- app/Booking.php | 3 ++- app/Http/Controllers/BookingController.php | 5 +++-- app/User.php | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/app/Booking.php b/app/Booking.php index ee0b5126..5a1c2e0e 100644 --- a/app/Booking.php +++ b/app/Booking.php @@ -7,7 +7,8 @@ use Illuminate\Database\Eloquent\Model; class Booking extends Model { // protected $guarded = []; - protected $hidden = array("user_id", + protected $hidden = array( "user", + "user_id", "rate_id", "rmb_book_amount", "rmb_book_pay_method", diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 95b24562..3b5f2b39 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -76,7 +76,7 @@ class BookingController extends Controller public function adminIndex(){ $user = Auth::user(); - $bookings = Booking::select('id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status') + $bookings = Booking::select('user_id', 'id', 'created_at', 'admin_status', 'rate', 'term', 'amount', 'bia', 'verification_status') ->orderby('updated_at','desc') ->get(); @@ -125,7 +125,8 @@ class BookingController extends Controller break; default: $status_desc = ""; - } + } + $booking->marking = $booking->user->marking; $booking->status_desc = $status_desc; } return $bookings; diff --git a/app/User.php b/app/User.php index ae87b308..351e75a4 100644 --- a/app/User.php +++ b/app/User.php @@ -29,7 +29,7 @@ class User extends Authenticatable implements JWTSubject * @var array */ protected $hidden = [ - 'password', 'remember_token', + 'password', 'remember_token', 'roles' ]; /** From 538adc736670a520eaa1f78c9e251f66b744c70c Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Sat, 7 Jul 2018 16:15:32 +0800 Subject: [PATCH 4/4] added marking to bookings api changed hard coded marking in booking details to dynamic for frontend --- app/Http/Controllers/BookingController.php | 7 ++++--- resources/assets/js/pages/admin/booking/completed.vue | 2 +- .../assets/js/pages/admin/booking/supplierBooking.vue | 2 +- resources/assets/js/pages/admin/booking/supplierReport.vue | 2 +- .../assets/js/pages/admin/booking/uploadChinaBankslip.vue | 2 +- resources/assets/js/pages/admin/booking/uploadInvoice.vue | 2 +- resources/assets/js/pages/admin/booking/verification.vue | 2 +- resources/assets/js/pages/booking/completed.vue | 2 +- resources/assets/js/pages/booking/confirmation.vue | 2 +- resources/assets/js/pages/booking/po.vue | 2 +- resources/assets/js/pages/booking/poComplete.vue | 2 +- resources/assets/js/pages/booking/transfer.vue | 2 +- resources/assets/js/pages/booking/uploadPo.vue | 2 +- 13 files changed, 16 insertions(+), 15 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 3b5f2b39..ad63ff84 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -169,6 +169,7 @@ class BookingController extends Controller $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; + $booking->marking = $booking->user->marking; if (!$booking){ return response()->json(['success'=>false, 'message'=>'not found'], 404); @@ -214,6 +215,7 @@ class BookingController extends Controller $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; + $booking->marking = $booking->user->marking; if (!$booking){ return response()->json(['success'=>false, 'message'=>'not found'], 404); @@ -524,6 +526,7 @@ class BookingController extends Controller $term = $request->input('term'); $china_beneficiary = $request->input('china_beneficiary'); $rates = Rate::orderby('updated_at','desc')->first(); + $marking = $user = Auth::user()->marking; $creditLimit = SettingCredit::orderby('updated_at','desc')->first(); @@ -534,9 +537,7 @@ class BookingController extends Controller if($amount > $creditLimit->rmb_credit_limit){ return response()->json(["message" => "Exceed credit limit, please contact our sales team for larger quantitiy"], 400); } - - // TODO : get marking - $marking = "123X"; + switch ($term) { case "x1_cash": diff --git a/resources/assets/js/pages/admin/booking/completed.vue b/resources/assets/js/pages/admin/booking/completed.vue index 1854f3d7..17501670 100644 --- a/resources/assets/js/pages/admin/booking/completed.vue +++ b/resources/assets/js/pages/admin/booking/completed.vue @@ -114,7 +114,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue index f83004c3..091cfaa9 100644 --- a/resources/assets/js/pages/admin/booking/supplierBooking.vue +++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue @@ -48,7 +48,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index 1d96b517..41400042 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -48,7 +48,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue index f8e1261e..0e626004 100644 --- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue +++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue @@ -48,7 +48,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue index 8b00f363..dc0397c7 100644 --- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue +++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue @@ -55,7 +55,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue index 5ad41ab0..1dce14bc 100644 --- a/resources/assets/js/pages/admin/booking/verification.vue +++ b/resources/assets/js/pages/admin/booking/verification.vue @@ -50,7 +50,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/completed.vue b/resources/assets/js/pages/booking/completed.vue index 7b46e04f..69808a3a 100644 --- a/resources/assets/js/pages/booking/completed.vue +++ b/resources/assets/js/pages/booking/completed.vue @@ -112,7 +112,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/confirmation.vue b/resources/assets/js/pages/booking/confirmation.vue index f02e9ab1..d1de4156 100644 --- a/resources/assets/js/pages/booking/confirmation.vue +++ b/resources/assets/js/pages/booking/confirmation.vue @@ -60,7 +60,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/po.vue b/resources/assets/js/pages/booking/po.vue index 2375a6a6..f7ba1050 100644 --- a/resources/assets/js/pages/booking/po.vue +++ b/resources/assets/js/pages/booking/po.vue @@ -112,7 +112,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/poComplete.vue b/resources/assets/js/pages/booking/poComplete.vue index 7f472ae4..5bb61d5d 100644 --- a/resources/assets/js/pages/booking/poComplete.vue +++ b/resources/assets/js/pages/booking/poComplete.vue @@ -112,7 +112,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/transfer.vue b/resources/assets/js/pages/booking/transfer.vue index 693401f7..5fac361e 100644 --- a/resources/assets/js/pages/booking/transfer.vue +++ b/resources/assets/js/pages/booking/transfer.vue @@ -60,7 +60,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}
diff --git a/resources/assets/js/pages/booking/uploadPo.vue b/resources/assets/js/pages/booking/uploadPo.vue index 24f4a72a..5ce467b5 100644 --- a/resources/assets/js/pages/booking/uploadPo.vue +++ b/resources/assets/js/pages/booking/uploadPo.vue @@ -97,7 +97,7 @@
Customer Marking :
-
CIEF/150ECE
+
{{ booking_details.marking }}