From 5151f9163f73e52bf516e7a8c94a6dd5c5e6a2bb Mon Sep 17 00:00:00 2001 From: Too Date: Sun, 1 Jul 2018 00:56:21 +0800 Subject: [PATCH 01/36] Register page, add marking input. Register page, change text to icon. Register page, add password visibility toggle function. --- resources/assets/js/pages/auth/register.vue | 75 ++++++++++++++++++--- vendor/composer/autoload_static.php | 10 +-- 2 files changed, 71 insertions(+), 14 deletions(-) diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue index 9792e4ec..4b707091 100644 --- a/resources/assets/js/pages/auth/register.vue +++ b/resources/assets/js/pages/auth/register.vue @@ -3,38 +3,81 @@
+ +
+ +
+ + + + + * Please contact vendor to get your marking + +
+
+
- +
- + +
- +
- + +
- +
- + + + + + +
- +
- + + + + + +
@@ -78,7 +121,9 @@ export default { email: '', password: '', password_confirmation: '' - }) + }), + password_visible : false, + password_confirmation_visible : false }), methods: { @@ -105,3 +150,15 @@ export default { } } + + \ No newline at end of file diff --git a/vendor/composer/autoload_static.php b/vendor/composer/autoload_static.php index 0238e370..2cb62280 100644 --- a/vendor/composer/autoload_static.php +++ b/vendor/composer/autoload_static.php @@ -4,7 +4,7 @@ namespace Composer\Autoload; -class ComposerStaticInit186bbd0d0f979469b3a193511536d69e +class ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2 { public static $files = array ( '6124b4c8570aa390c21fafd04a26c69f' => __DIR__ . '/..' . '/myclabs/deep-copy/src/DeepCopy/deep_copy.php', @@ -4767,10 +4767,10 @@ class ComposerStaticInit186bbd0d0f979469b3a193511536d69e public static function getInitializer(ClassLoader $loader) { return \Closure::bind(function () use ($loader) { - $loader->prefixLengthsPsr4 = ComposerStaticInit186bbd0d0f979469b3a193511536d69e::$prefixLengthsPsr4; - $loader->prefixDirsPsr4 = ComposerStaticInit186bbd0d0f979469b3a193511536d69e::$prefixDirsPsr4; - $loader->prefixesPsr0 = ComposerStaticInit186bbd0d0f979469b3a193511536d69e::$prefixesPsr0; - $loader->classMap = ComposerStaticInit186bbd0d0f979469b3a193511536d69e::$classMap; + $loader->prefixLengthsPsr4 = ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2::$prefixLengthsPsr4; + $loader->prefixDirsPsr4 = ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2::$prefixDirsPsr4; + $loader->prefixesPsr0 = ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2::$prefixesPsr0; + $loader->classMap = ComposerStaticInit0bbff1eca0c8c05eacbd8478d22c7dd2::$classMap; }, null, ClassLoader::class); } From b9b19f292d0e40198daee9ffe545bd0a504ad060 Mon Sep 17 00:00:00 2001 From: Too Date: Sun, 1 Jul 2018 01:18:07 +0800 Subject: [PATCH 02/36] Show marking message when empty input --- resources/assets/js/pages/auth/register.vue | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue index 4b707091..850d28fe 100644 --- a/resources/assets/js/pages/auth/register.vue +++ b/resources/assets/js/pages/auth/register.vue @@ -12,7 +12,7 @@ - + * Please contact vendor to get your marking
@@ -146,6 +146,10 @@ export default { } else { this.$router.push({ name: 'home' }) } + }, + missingMarking:function(){ + console.log(this.form.marking); + return this.form.marking === undefined || this.form.marking === ''; } } } From d232fad6016c9a29c614d5e140cf6ccee41acae5 Mon Sep 17 00:00:00 2001 From: Too Date: Mon, 2 Jul 2018 09:50:03 +0800 Subject: [PATCH 03/36] remove username and icon --- resources/assets/js/pages/auth/register.vue | 29 +++------------------ 1 file changed, 4 insertions(+), 25 deletions(-) diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue index 850d28fe..d0711f86 100644 --- a/resources/assets/js/pages/auth/register.vue +++ b/resources/assets/js/pages/auth/register.vue @@ -5,9 +5,7 @@
- +
@@ -18,23 +16,9 @@
- -
- -
- - - -
-
-
- +
@@ -44,9 +28,7 @@
- +
@@ -38,7 +37,7 @@ }; }, mounted() { - this.getCreditSetting() + this.getCreditSetting(); }, methods: { getCreditSetting() { diff --git a/routes/api.php b/routes/api.php index 90e7be8b..36cc5155 100644 --- a/routes/api.php +++ b/routes/api.php @@ -70,6 +70,9 @@ Route::group(['middleware' => ['role:admin']], function() { Route::get('setting-credit', 'SettingCreditController@index'); Route::put('setting-credit', 'SettingCreditController@update'); + Route::get('setting-active-bank', 'SettingActiveBankController@index'); + + Route::get('setting-supplier', 'SettingSupplierController@index'); Route::get('setting-supplier/{supplier}', 'SettingSupplierController@show'); Route::post('setting-supplier', 'SettingSupplierController@store'); @@ -106,4 +109,6 @@ Route::group(['middleware' => ['role:admin']], function() { Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice'); Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice'); -}); \ No newline at end of file +}); + +Route::put('setting-active-bank', 'SettingActiveBankController@update'); \ No newline at end of file From 77a216883260c0a074d99b529c73c17538e29fe6 Mon Sep 17 00:00:00 2001 From: Too Date: Sat, 7 Jul 2018 01:57:30 +0800 Subject: [PATCH 28/36] fix update bug at activebankcontroller when empty record --- app/Http/Controllers/SettingActiveBankController.php | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/app/Http/Controllers/SettingActiveBankController.php b/app/Http/Controllers/SettingActiveBankController.php index 8fc9ae52..97c84dd6 100644 --- a/app/Http/Controllers/SettingActiveBankController.php +++ b/app/Http/Controllers/SettingActiveBankController.php @@ -15,8 +15,10 @@ class SettingActiveBankController extends Controller public function update(Request $request) { - $active_bank_setting = SettingActiveBank::latest()->first(); - $active_bank_setting->update($request->all()); + if($active_bank_setting = SettingActiveBank::latest()->first()) + $active_bank_setting->update($request->all()); + else + $active_bank_setting = SettingActiveBank::create($request->all()); return response()->json($active_bank_setting, 200); } From 59fc234ea04e75de0b0accfa31ce588c9f71525c Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Sat, 7 Jul 2018 12:06:21 +0800 Subject: [PATCH 29/36] 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 30/36] 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 31/36] 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 }}
From bb633916a292c38f360029ba694d03137401531c Mon Sep 17 00:00:00 2001 From: Too Date: Sun, 8 Jul 2018 01:57:19 +0800 Subject: [PATCH 32/36] revert back changes during debug --- routes/api.php | 6 ++---- 1 file changed, 2 insertions(+), 4 deletions(-) diff --git a/routes/api.php b/routes/api.php index 36cc5155..bc8e8885 100644 --- a/routes/api.php +++ b/routes/api.php @@ -71,7 +71,7 @@ Route::group(['middleware' => ['role:admin']], function() { Route::put('setting-credit', 'SettingCreditController@update'); Route::get('setting-active-bank', 'SettingActiveBankController@index'); - + Route::put('setting-active-bank', 'SettingActiveBankController@update'); Route::get('setting-supplier', 'SettingSupplierController@index'); Route::get('setting-supplier/{supplier}', 'SettingSupplierController@show'); @@ -109,6 +109,4 @@ Route::group(['middleware' => ['role:admin']], function() { Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice'); Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice'); -}); - -Route::put('setting-active-bank', 'SettingActiveBankController@update'); \ No newline at end of file +}); \ No newline at end of file From 766316572ca67fe3107a89a152c4e510b59ef627 Mon Sep 17 00:00:00 2001 From: Jack Goh Date: Sun, 8 Jul 2018 11:50:36 +0800 Subject: [PATCH 33/36] fix seed contraints error --- ...ge_foreignkey_type_in_activebank_table.php | 41 +++++++++++++++++++ database/seeds/DatabaseSeeder.php | 4 ++ database/seeds/SettingActiveBankSeeder.php | 1 + database/seeds/SettingBeneficiaresSeeder.php | 1 + database/seeds/SettingMalaysiaBankSeeder.php | 1 + 5 files changed, 48 insertions(+) create mode 100644 database/migrations/2018_07_08_033026_change_foreignkey_type_in_activebank_table.php diff --git a/database/migrations/2018_07_08_033026_change_foreignkey_type_in_activebank_table.php b/database/migrations/2018_07_08_033026_change_foreignkey_type_in_activebank_table.php new file mode 100644 index 00000000..ad518a6c --- /dev/null +++ b/database/migrations/2018_07_08_033026_change_foreignkey_type_in_activebank_table.php @@ -0,0 +1,41 @@ +dropForeign('setting_active_banks_x1_bank_id_foreign'); + $table->foreign('x1_bank_id') + ->references('acc_no')->on('setting_malaysia_banks'); + + $table->dropForeign('setting_active_banks_x2_bank_id_foreign'); + $table->foreign('x2_bank_id') + ->references('acc_no')->on('setting_malaysia_banks'); + + $table->dropForeign('setting_active_banks_beneficiary_id_foreign'); + $table->foreign('beneficiary_id') + ->references('acc_no')->on('setting_beneficiaries'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index b2e3cd03..32544630 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -12,6 +12,8 @@ class DatabaseSeeder extends Seeder */ public function run() { + Eloquent::unguard(); + $this->call(UsersTableSeeder::class); $this->call(RolesAndPermissionsSeeder::class); $this->call(UserRoleSeeder::class); @@ -20,8 +22,10 @@ class DatabaseSeeder extends Seeder $this->call(SettingCreditSeeder::class); $this->call(SuppliersTableSeeder::class); $this->call(MarkingSeeder::class); + DB::statement('SET FOREIGN_KEY_CHECKS=0;'); $this->call(SettingMalaysiaBankSeeder::class); $this->call(SettingBeneficiaresSeeder::class); $this->call(SettingActiveBankSeeder::class); + DB::statement('SET FOREIGN_KEY_CHECKS=1;'); } } diff --git a/database/seeds/SettingActiveBankSeeder.php b/database/seeds/SettingActiveBankSeeder.php index e808aca2..feed9792 100644 --- a/database/seeds/SettingActiveBankSeeder.php +++ b/database/seeds/SettingActiveBankSeeder.php @@ -11,6 +11,7 @@ class SettingActiveBankSeeder extends Seeder */ public function run() { + DB::table('setting_active_banks')->truncate(); DB::table('setting_active_banks')->insert([ 'x1_bank_id' => 'malaysiaacc01', 'x2_bank_id' => 'malaysiaacc02', diff --git a/database/seeds/SettingBeneficiaresSeeder.php b/database/seeds/SettingBeneficiaresSeeder.php index dd4c3963..c7da261c 100644 --- a/database/seeds/SettingBeneficiaresSeeder.php +++ b/database/seeds/SettingBeneficiaresSeeder.php @@ -11,6 +11,7 @@ class SettingBeneficiaresSeeder extends Seeder */ public function run() { + DB::table('setting_beneficiaries')->truncate(); DB::table('setting_beneficiaries')->insert([ 'company_name' => 'CIEF2', 'bank_name' => 'Mayban222k', diff --git a/database/seeds/SettingMalaysiaBankSeeder.php b/database/seeds/SettingMalaysiaBankSeeder.php index 0b9f302e..21cc374a 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_active_banks')->truncate(); DB::table('setting_malaysia_banks')->truncate(); DB::table('setting_malaysia_banks')->insert([ 'company_name' => 'CIEF', From 97453bb0843195117030a7a71bb469b6d8a8d5f1 Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Mon, 9 Jul 2018 20:47:55 +0800 Subject: [PATCH 34/36] add marking setting page and integrate it --- .../pages/settings/admin-marking-setting.vue | 75 +++++++++++++++++++ resources/assets/js/pages/settings/index.vue | 8 +- resources/assets/js/router/routes.js | 4 +- routes/api.php | 10 +-- 4 files changed, 90 insertions(+), 7 deletions(-) create mode 100644 resources/assets/js/pages/settings/admin-marking-setting.vue diff --git a/resources/assets/js/pages/settings/admin-marking-setting.vue b/resources/assets/js/pages/settings/admin-marking-setting.vue new file mode 100644 index 00000000..8cfb4f23 --- /dev/null +++ b/resources/assets/js/pages/settings/admin-marking-setting.vue @@ -0,0 +1,75 @@ + + + + + + diff --git a/resources/assets/js/pages/settings/index.vue b/resources/assets/js/pages/settings/index.vue index a7eb4dcc..878e7c8f 100644 --- a/resources/assets/js/pages/settings/index.vue +++ b/resources/assets/js/pages/settings/index.vue @@ -63,7 +63,7 @@ role: 'admin' }, { - icon: 'flag', + icon: 'flag', name: this.$t('CIEF Malaysia Bank'), route: 'settings.admin-malaysia-bank', role: 'admin' @@ -74,6 +74,12 @@ route: 'settings.admin-bank-setting', role: 'admin' }, + { + icon: 'building', + name: this.$t('Marking Setting'), + route: 'settings.admin-marking-setting', + role: 'admin' + }, ] } } diff --git a/resources/assets/js/router/routes.js b/resources/assets/js/router/routes.js index 7be29f11..4e2231a0 100644 --- a/resources/assets/js/router/routes.js +++ b/resources/assets/js/router/routes.js @@ -14,6 +14,7 @@ const SettingsAdminCreditSetting = () => import('~/pages/settings/admin-credit-s const SettingsAdminChinaBank = () => import('~/pages/settings/admin-china-bank').then(m => m.default || m) const SettingsAdminMalaysiaBank = () => import('~/pages/settings/admin-malaysia-bank').then(m => m.default || m) const SettingsAdminBankSetting = () => import('~/pages/settings/admin-bank-setting').then(m => m.default || m) +const SettingsAdminMarkingSetting = () => import('~/pages/settings/admin-marking-setting').then(m => m.default || m) // Booking const Upload = () => import('~/pages/booking/uploadUserBankSlip').then(m => m.default || m) @@ -57,7 +58,8 @@ export default [ { path: 'admin-credit-setting', name: 'settings.admin-credit-setting', component: SettingsAdminCreditSetting }, { path: 'admin-china-bank', name: 'settings.admin-china-bank', component: SettingsAdminChinaBank }, { path: 'admin-malaysia-bank', name: 'settings.admin-malaysia-bank', component: SettingsAdminMalaysiaBank }, - { path: 'admin-bank-setting', name: 'settings.admin-bank-setting', component: SettingsAdminBankSetting } + { path: 'admin-bank-setting', name: 'settings.admin-bank-setting', component: SettingsAdminBankSetting }, + { path: 'admin-marking-setting', name: 'settings.admin-marking-setting', component: SettingsAdminMarkingSetting } ] }, // Booking diff --git a/routes/api.php b/routes/api.php index bc8e8885..ef3d2af0 100644 --- a/routes/api.php +++ b/routes/api.php @@ -91,11 +91,11 @@ Route::group(['middleware' => ['role:admin']], function() { Route::put('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@update'); Route::delete('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@delete'); - Route::get('marking', 'MarkingController@index'); - Route::post('marking', 'MarkingController@store'); - Route::get('marking/{beneficiary}', 'MarkingController@show'); - Route::put('marking/{beneficiary}', 'MarkingController@update'); - Route::delete('marking/{beneficiary}', 'MarkingController@delete'); + Route::get('setting-marking', 'MarkingController@index'); + Route::post('setting-marking', 'MarkingController@store'); + Route::get('setting-marking/{beneficiary}', 'MarkingController@show'); + Route::put('setting-marking/{beneficiary}', 'MarkingController@update'); + Route::delete('setting-marking/{beneficiary}', 'MarkingController@delete'); Route::get('supplier-booking', 'BookingSupplierController@index'); Route::get('supplier-booking/{id}', 'BookingSupplierController@show'); From edbd8887c5a919521b72569525e05b3629d3a7bd Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Wed, 11 Jul 2018 01:39:35 +0800 Subject: [PATCH 35/36] fix bug for validation. Remove nullable for malaysia bank table --- ...t_nullable_setting_malaysia_bank_table.php | 36 +++++++++++++++++++ resources/assets/js/app.js | 20 ++++++++++- resources/assets/js/pages/auth/register.vue | 5 +-- .../js/pages/settings/admin-china-bank.vue | 5 ++- .../pages/settings/admin-credit-setting.vue | 10 ++++++ .../js/pages/settings/admin-malaysia-bank.vue | 16 ++++----- .../pages/settings/admin-marking-setting.vue | 4 +-- .../js/pages/settings/admin-supplier.vue | 6 ++-- 8 files changed, 81 insertions(+), 21 deletions(-) create mode 100644 database/migrations/2018_07_10_173148_add_not_nullable_setting_malaysia_bank_table.php diff --git a/database/migrations/2018_07_10_173148_add_not_nullable_setting_malaysia_bank_table.php b/database/migrations/2018_07_10_173148_add_not_nullable_setting_malaysia_bank_table.php new file mode 100644 index 00000000..1deef39e --- /dev/null +++ b/database/migrations/2018_07_10_173148_add_not_nullable_setting_malaysia_bank_table.php @@ -0,0 +1,36 @@ +string('company_name')->nullable(false)->change(); + $table->string('bank_name')->nullable(false)->change(); + $table->string('acc_no')->nullable()->change(); // reference key at select active bank + $table->string('bank_address')->nullable(false)->change(); + $table->string('swift')->nullable(false)->change(); + $table->string('cnap')->nullable(false)->change(); + $table->string('bank_branch')->nullable(false)->change(); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/resources/assets/js/app.js b/resources/assets/js/app.js index f2a29c9d..5b2beb01 100644 --- a/resources/assets/js/app.js +++ b/resources/assets/js/app.js @@ -11,7 +11,25 @@ import '~/plugins' import '~/components' import VeeValidate from 'vee-validate'; -Vue.use(VeeValidate); +const config = { + errorBagName: 'errors', // change if property conflicts. + fieldsBagName: 'fields', + delay: 0, + // locale: 'zh_CN', + strict: true, + enableAutoClasses: false, + classNames: { + touched: 'touched', // the control has been blurred + untouched: 'untouched', // the control hasn't been blurred + valid: 'valid', // model is valid + invalid: 'invalid', // model is invalid + pristine: 'pristine', // control has not been interacted with + dirty: 'dirty' // control has been interacted with + }, + events: 'blur', + inject: true +}; +Vue.use(VeeValidate, config); Vue.config.productionTip = false diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue index 51355f13..272c25f0 100644 --- a/resources/assets/js/pages/auth/register.vue +++ b/resources/assets/js/pages/auth/register.vue @@ -59,8 +59,6 @@
- -
@@ -105,7 +103,6 @@ export default { password_confirmation: '' }), email : '', - formError: [], password_visible : false, password_confirmation_visible : false }), @@ -124,7 +121,7 @@ export default { .then( (response) => { data = response.data this.$message({ - message: "Sucess. Logging in..", + message: "Success. Logging in..", type: 'success' }) }) diff --git a/resources/assets/js/pages/settings/admin-china-bank.vue b/resources/assets/js/pages/settings/admin-china-bank.vue index cf57765f..6ae7529f 100644 --- a/resources/assets/js/pages/settings/admin-china-bank.vue +++ b/resources/assets/js/pages/settings/admin-china-bank.vue @@ -53,7 +53,7 @@
Cancel - OK + OK
* Please key in the data in Chinese @@ -100,7 +100,7 @@
Cancel - Submit + Submit
* Please key in the data in Chinese @@ -157,7 +157,6 @@ methods: { CreateBeneficiaries : function(){ this.AddDatadialogVisible = false; - console.log(this.beneficiariesForm); client.post('api/setting-beneficiary', this.beneficiariesForm) .then((response) => { this.DoneAddDatadialogVisible = true; diff --git a/resources/assets/js/pages/settings/admin-credit-setting.vue b/resources/assets/js/pages/settings/admin-credit-setting.vue index 4d2c793e..21b74e01 100644 --- a/resources/assets/js/pages/settings/admin-credit-setting.vue +++ b/resources/assets/js/pages/settings/admin-credit-setting.vue @@ -40,12 +40,22 @@ this.getCreditSetting(); }, methods: { + ValidateAll : function(){ + var working; + this.$validator.validateAll().then((result) => { + working = result; + }).catch(() => { + }); + }, getCreditSetting() { axios.get('/api/setting-credit').then(response => { this.credit_setting = response.data }) }, updateCreditSetting (){ + if(this.ValidateAll()) + return; + this.loading_btn = true axios.put('/api/setting-credit', this.credit_setting) .then((response) => { diff --git a/resources/assets/js/pages/settings/admin-malaysia-bank.vue b/resources/assets/js/pages/settings/admin-malaysia-bank.vue index b94130b6..192ca756 100644 --- a/resources/assets/js/pages/settings/admin-malaysia-bank.vue +++ b/resources/assets/js/pages/settings/admin-malaysia-bank.vue @@ -53,7 +53,7 @@
Cancel - OK + OK
* Please key in the data in Chinese @@ -100,7 +100,7 @@
Cancel - Submit + Submit
* Please key in the data in Chinese @@ -151,12 +151,12 @@ currentEdit : -1, } }, - beforeMount(){ - this.UpdateTableData(); - }, + mounted(){ + this.UpdateTableData(); + }, methods: { CreateMalaysiaBank : function(){ - this.AddDatadialogVisible = false; + this.AddDatadialogVisible = false; client.post('api/setting-malaysia-bank', this.malaysiaBankForm) .then((response) => { this.DoneAddDatadialogVisible = true; @@ -190,7 +190,6 @@ }) }, DeleteMalaysiaBank : function(malaysiaBank_id){ - console.log('delete'+malaysiaBank_id); this.DeleteAdddialogVisible = true; client.delete('api/setting-malaysia-bank/' + malaysiaBank_id) .then((response) => { @@ -209,7 +208,6 @@ EditMalaysiaBank : function(){ this.EditDatadialogVisible = false; this.DoneUpdateDatadialogVisible = true; - client.put('api/setting-malaysia-bank/' + this.currentEdit, this.malaysiaBankForm) .then((response) => { this.UpdateTableData(); @@ -227,6 +225,8 @@ PopOutAddMalaysiaBank : function(){ this.AddDatadialogVisible = true; this.ClearMalaysiaBankForm(); + this.$validator.validateAll(); + console.log(this.errors.count()); }, PopOutEditMalaysiaBank : function(tableDataRow){ this.EditDatadialogVisible = true; diff --git a/resources/assets/js/pages/settings/admin-marking-setting.vue b/resources/assets/js/pages/settings/admin-marking-setting.vue index 8cfb4f23..bb3047a8 100644 --- a/resources/assets/js/pages/settings/admin-marking-setting.vue +++ b/resources/assets/js/pages/settings/admin-marking-setting.vue @@ -12,7 +12,7 @@
- Add New Data + Add New Data
@@ -61,7 +61,7 @@ ClearMarkingForm : function(){ this.markingForm.marking = ''; this.markingForm.email = ''; - } + }, } } diff --git a/resources/assets/js/pages/settings/admin-supplier.vue b/resources/assets/js/pages/settings/admin-supplier.vue index 41387a1a..323df9dd 100644 --- a/resources/assets/js/pages/settings/admin-supplier.vue +++ b/resources/assets/js/pages/settings/admin-supplier.vue @@ -43,7 +43,7 @@
Cancel - OK + OK
@@ -79,13 +79,13 @@
Cancel - OK + OK
Supplier's Details Updated Successfully

- OK + OK
From 6a892e093cd6c412e00dbb6dcb38e2e23f275e77 Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Wed, 11 Jul 2018 01:42:58 +0800 Subject: [PATCH 36/36] fix validation at register page --- resources/assets/js/pages/auth/register.vue | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/resources/assets/js/pages/auth/register.vue b/resources/assets/js/pages/auth/register.vue index 272c25f0..672f0539 100644 --- a/resources/assets/js/pages/auth/register.vue +++ b/resources/assets/js/pages/auth/register.vue @@ -62,7 +62,7 @@
- + {{ $t('register') }} @@ -112,10 +112,6 @@ export default { async register () { var token var data - this.$validator.validateAll(); - if (this.errors.any()) { - return; - } // Register the user. await this.form.post('/api/register') .then( (response) => {