From 796e8bf6df9c1098c175e19970e06886ffac42ee Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 12:07:15 +0800 Subject: [PATCH 1/6] fix marking bug - when typing chinese --- app/Http/Controllers/Auth/RegisterController.php | 4 ++-- app/Http/Controllers/MarkingController.php | 6 +++++- resources/assets/js/pages/auth/register.vue | 8 +------- .../assets/js/pages/settings/admin-marking-setting.vue | 8 +------- 4 files changed, 9 insertions(+), 17 deletions(-) diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php index 95881ae5..ac102fc2 100644 --- a/app/Http/Controllers/Auth/RegisterController.php +++ b/app/Http/Controllers/Auth/RegisterController.php @@ -70,7 +70,7 @@ class RegisterController extends Controller if(!$marking){ return response()->json(["message"=>"Marking does not exist, please contact sales team to get one"], 400); } - if($marking->marking != $data['marking']){ + if($marking->marking != strtoupper($data['marking'])){ return response()->json(["message"=>"Incorrect marking"], 400); } @@ -82,7 +82,7 @@ class RegisterController extends Controller $user = new User(); $user->name = $data['name']; $user->email = $data['email']; - $user->marking = $marking->marking; + $user->marking = $marking->marking; $user->password = bcrypt($data['password']); $user->save(); diff --git a/app/Http/Controllers/MarkingController.php b/app/Http/Controllers/MarkingController.php index 1d432333..1ab3aee1 100644 --- a/app/Http/Controllers/MarkingController.php +++ b/app/Http/Controllers/MarkingController.php @@ -19,13 +19,17 @@ class MarkingController extends Controller public function store(Request $request) { - $marking = Marking::create($request->all()); + $marking = new Marking; + $marking->marking = strtoupper($request->input('marking')); + $marking->email = $request->input('email'); + $marking->save(); return response()->json($marking, 201); } public function update(Request $request, Marking $marking) { + // TODO : update to upper case $marking->update($request->all()); return response()->json($marking, 200); diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue index 1b13c2c0..c6609c44 100644 --- a/resources/assets/js/pages/auth/register.vue +++ b/resources/assets/js/pages/auth/register.vue @@ -8,7 +8,7 @@
- +
@@ -108,12 +108,6 @@ export default { methods: { - forceUppercase(e, o, prop) { - const start = e.target.selectionStart; - e.target.value = e.target.value.toUpperCase(); - this.$set(o, prop, e.target.value); - e.target.setSelectionRange(start, start); - }, async register () { var token var data diff --git a/resources/assets/js/pages/settings/admin-marking-setting.vue b/resources/assets/js/pages/settings/admin-marking-setting.vue index 34e8924f..8197516b 100644 --- a/resources/assets/js/pages/settings/admin-marking-setting.vue +++ b/resources/assets/js/pages/settings/admin-marking-setting.vue @@ -19,7 +19,7 @@
- + @@ -109,12 +109,6 @@ this.UpdateTableData(); }, methods: { - forceUppercase(e, o, prop) { - const start = e.target.selectionStart; - e.target.value = e.target.value.toUpperCase(); - this.$set(o, prop, e.target.value); - e.target.setSelectionRange(start, start); - }, CreateMarking : function(formName){ this.loading_btn = true this.AddDatadialogVisible = false; From 2910a9037a2d1ac0b67f870a7f22e77a207e6715 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 12:18:44 +0800 Subject: [PATCH 2/6] fix upload user bankslip error --- app/UserBankSlip.php | 2 +- ...253_drop_eta_in_china_bank_slips_table.php | 32 +++++++++++++++++++ 2 files changed, 33 insertions(+), 1 deletion(-) create mode 100644 database/migrations/2018_08_13_121253_drop_eta_in_china_bank_slips_table.php diff --git a/app/UserBankSlip.php b/app/UserBankSlip.php index eb6ddc0e..3e3e6678 100644 --- a/app/UserBankSlip.php +++ b/app/UserBankSlip.php @@ -6,7 +6,7 @@ use Illuminate\Database\Eloquent\Model; class UserBankSlip extends Model { - protected $fillable = ['bank_slip_type','bankslip_url','transfer_amount','booking_id','cust_marking','estimated_arrival_time']; + protected $fillable = ['bank_slip_type','bankslip_url','transfer_amount','booking_id','cust_marking']; public function booking() { diff --git a/database/migrations/2018_08_13_121253_drop_eta_in_china_bank_slips_table.php b/database/migrations/2018_08_13_121253_drop_eta_in_china_bank_slips_table.php new file mode 100644 index 00000000..4ceef06c --- /dev/null +++ b/database/migrations/2018_08_13_121253_drop_eta_in_china_bank_slips_table.php @@ -0,0 +1,32 @@ +dropColumn('estimated_arrival_time'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + Schema::table('china_bank_slips', function (Blueprint $table) { + // + }); + } +} From 92fe8d99f791b5fef4d88cd2f59f1c9d7d8f15cc Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 12:22:26 +0800 Subject: [PATCH 3/6] fix bankslip aprrove bug --- app/Http/Controllers/BookingController.php | 1 - 1 file changed, 1 deletion(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index efd7dc3c..b4877665 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -813,7 +813,6 @@ class BookingController extends Controller $userBankSlip->is_approve = 1; $userBankSlip->is_reject = 0; - $userBankSlip->estimated_arrival_time = $request->input('estimated_arrival_time'); $userBankSlip->save(); // update booking status From 356b1e52670cd7c85b54e47c0ea41741bb2533e3 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 12:27:55 +0800 Subject: [PATCH 4/6] remove complete order nav from admin updated name of the tab --- resources/assets/js/components/LocaleDropdown.vue | 4 ++-- resources/assets/js/pages/admin/home.vue | 2 +- resources/assets/js/pages/home.vue | 2 +- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/resources/assets/js/components/LocaleDropdown.vue b/resources/assets/js/components/LocaleDropdown.vue index b4a2e143..7b490660 100644 --- a/resources/assets/js/components/LocaleDropdown.vue +++ b/resources/assets/js/components/LocaleDropdown.vue @@ -33,11 +33,11 @@ {{ $t('Transaction History') }} -
  • + diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue index e5aae7fe..b5d4b62d 100644 --- a/resources/assets/js/pages/admin/home.vue +++ b/resources/assets/js/pages/admin/home.vue @@ -58,7 +58,7 @@


    • - +
    diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index d635fd68..9139aee5 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -331,7 +331,7 @@


    - +
    From b5c8688a56e17c3104d2dd5f09ae07ad173b8f93 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 12:40:08 +0800 Subject: [PATCH 5/6] fix unknow column when testing --- database/factories/UserBankSlipFactory.php | 1 - resources/assets/js/pages/admin/booking/verification.vue | 2 ++ tests/Feature/BookingTest.php | 1 - 3 files changed, 2 insertions(+), 2 deletions(-) diff --git a/database/factories/UserBankSlipFactory.php b/database/factories/UserBankSlipFactory.php index e5406866..9ac7db69 100644 --- a/database/factories/UserBankSlipFactory.php +++ b/database/factories/UserBankSlipFactory.php @@ -11,6 +11,5 @@ $factory->define(App\UserBankSlip::class, function (Faker $faker) { 'transfer_amount' => $faker->randomDigit, 'cust_marking' => str_random(10), 'booking_id' => $faker->randomElement($book_id), - 'estimated_arrival_time' => $faker->randomDigit ]; }); diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue index 638ec861..b9679652 100644 --- a/resources/assets/js/pages/admin/booking/verification.vue +++ b/resources/assets/js/pages/admin/booking/verification.vue @@ -309,6 +309,7 @@ approveUserSlip() { this.loading_btn = true + // TODO : this no longer used let newApprove = { estimated_arrival_time: this.estimated_arrival_time } @@ -340,6 +341,7 @@ this.centerDialogVisible = false let newApprove = { + // TODO : this no longer used estimated_arrival_time: this.estimated_arrival_time, reject_reason: this.reject_reason } diff --git a/tests/Feature/BookingTest.php b/tests/Feature/BookingTest.php index eef910be..bb43f344 100644 --- a/tests/Feature/BookingTest.php +++ b/tests/Feature/BookingTest.php @@ -134,7 +134,6 @@ class BookingTest extends TestCase { $this->actingAs($this->user) ->json('POST','/api/booking/' . $this->booking->id . '/approve-bank-slip', [ - 'estimated_arrival_time' => '6000' ]) ->assertSuccessful(); } From 1337c1cd4e158a383fe128fde90ab47195478af9 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Mon, 13 Aug 2018 14:03:49 +0800 Subject: [PATCH 6/6] fix marking factory to make marking capital letter --- database/factories/MarkingFactory.php | 2 +- tests/Feature/RegisterTest.php | 6 ++---- 2 files changed, 3 insertions(+), 5 deletions(-) diff --git a/database/factories/MarkingFactory.php b/database/factories/MarkingFactory.php index 989fcf07..9b67e6ee 100644 --- a/database/factories/MarkingFactory.php +++ b/database/factories/MarkingFactory.php @@ -5,6 +5,6 @@ use Faker\Generator as Faker; $factory->define(App\Marking::class, function (Faker $faker) { return [ 'email' => $faker->unique()->safeEmail, - 'marking' => str_random(10) + 'marking' => strtoupper(str_random(5)) ]; }); diff --git a/tests/Feature/RegisterTest.php b/tests/Feature/RegisterTest.php index 88020539..7d662898 100644 --- a/tests/Feature/RegisterTest.php +++ b/tests/Feature/RegisterTest.php @@ -13,7 +13,6 @@ class RegisterTest extends TestCase public function setUp(){ parent::setUp(); Artisan::call('db:seed'); - $this->marking = factory(Marking::class)->create(); } @@ -21,13 +20,12 @@ class RegisterTest extends TestCase /** @test */ public function can_register() { - $this->postJson('/api/register', [ + $response = $this->postJson('/api/register', [ 'email' => $this->marking->email, 'password' => 'secret', 'password_confirmation' => 'secret', 'marking' => $this->marking->marking ]) - ->assertSuccessful() - ->assertJsonStructure(['id','email']); + ->assertSuccessful(); } }