From 1bad5dbd8e3f083f8341dba570a63757c7ef8450 Mon Sep 17 00:00:00 2001 From: Mouhamed Lamine Date: Fri, 22 Jun 2018 16:53:53 +0800 Subject: [PATCH 001/125] Small Updates to Package.Json --- package-lock.json | 530 ------------------ .../assets/js/pages/booking/confirmation.vue | 2 +- 2 files changed, 1 insertion(+), 531 deletions(-) diff --git a/package-lock.json b/package-lock.json index 3a29f0c4..30a8ef90 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2861,7 +2861,6 @@ "anymatch": "2.0.0", "async-each": "1.0.1", "braces": "2.3.2", - "fsevents": "1.2.4", "glob-parent": "3.1.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -6127,535 +6126,6 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, - "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "2.1.2" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", diff --git a/resources/assets/js/pages/booking/confirmation.vue b/resources/assets/js/pages/booking/confirmation.vue index 58812c71..6c45366b 100644 --- a/resources/assets/js/pages/booking/confirmation.vue +++ b/resources/assets/js/pages/booking/confirmation.vue @@ -35,7 +35,7 @@
- BankinSlip + Banking Slip
From 5151f9163f73e52bf516e7a8c94a6dd5c5e6a2bb Mon Sep 17 00:00:00 2001 From: Too Date: Sun, 1 Jul 2018 00:56:21 +0800 Subject: [PATCH 002/125] 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 003/125] 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 004/125] 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 @@
- +
\ No newline at end of file + + + \ No newline at end of file diff --git a/resources/assets/js/pages/settings/admin-credit-setting.vue b/resources/assets/js/pages/settings/admin-credit-setting.vue index 57307154..4d2c793e 100644 --- a/resources/assets/js/pages/settings/admin-credit-setting.vue +++ b/resources/assets/js/pages/settings/admin-credit-setting.vue @@ -17,7 +17,6 @@ Update -
@@ -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 043/125] 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 044/125] 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 045/125] 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 046/125] 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 047/125] 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 048/125] 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 049/125] 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 a35e4fd3c8c00f2dc52b4e91946ce3d7515366cb Mon Sep 17 00:00:00 2001 From: Mouhamed Lamine Date: Tue, 10 Jul 2018 15:32:22 +0800 Subject: [PATCH 050/125] Showing Completed Orders To Admin --- app/Http/Controllers/BookingController.php | 19 + package-lock.json | 535 +----------------- .../assets/js/pages/admin/complete-order.vue | 54 +- resources/assets/js/pages/admin/home.vue | 3 +- routes/api.php | 2 + vendor/composer/autoload_static.php | 18 +- 6 files changed, 70 insertions(+), 561 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index 6048e53c..49436178 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -754,4 +754,23 @@ class BookingController extends Controller } } + public function adminShowCompletedOrders() + { + $user = Auth::user(); + $bookings = Booking::select('id', 'company_name','created_at', 'amount', 'admin_status') + ->where('admin_status', 1) + ->orderBy('id', 'desc') + ->take(10) + ->get(); + + foreach ($bookings as $booking) { + $booking->id = $id; + $booking->company_name = $company_name; + $booking->created_at = $created_at; + $booking->amount = $amount; + $booking->admin_status = $admin_status; + } + return $bookings; + } + } diff --git a/package-lock.json b/package-lock.json index e6eb4ff2..1e311d6b 100644 --- a/package-lock.json +++ b/package-lock.json @@ -2814,7 +2814,6 @@ "anymatch": "2.0.0", "async-each": "1.0.1", "braces": "2.3.2", - "fsevents": "1.2.4", "glob-parent": "3.1.0", "inherits": "2.0.3", "is-binary-path": "1.0.1", @@ -5924,535 +5923,6 @@ "integrity": "sha1-FQStJSMVjKpA20onh8sBQRmU6k8=", "dev": true }, - "fsevents": { - "version": "1.2.4", - "resolved": "https://registry.npmjs.org/fsevents/-/fsevents-1.2.4.tgz", - "integrity": "sha512-z8H8/diyk76B7q5wg+Ud0+CqzcAF3mBBI/bA5ne5zrRUUIvNkJY//D3BqyH571KuAC4Nr7Rw7CjWX4r0y9DvNg==", - "dev": true, - "optional": true, - "requires": { - "nan": "2.10.0", - "node-pre-gyp": "0.10.0" - }, - "dependencies": { - "abbrev": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "ansi-regex": { - "version": "2.1.1", - "bundled": true, - "dev": true - }, - "aproba": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - }, - "are-we-there-yet": { - "version": "1.1.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "delegates": "1.0.0", - "readable-stream": "2.3.6" - } - }, - "balanced-match": { - "version": "1.0.0", - "bundled": true, - "dev": true - }, - "brace-expansion": { - "version": "1.1.11", - "bundled": true, - "dev": true, - "requires": { - "balanced-match": "1.0.0", - "concat-map": "0.0.1" - } - }, - "chownr": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "code-point-at": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "concat-map": { - "version": "0.0.1", - "bundled": true, - "dev": true - }, - "console-control-strings": { - "version": "1.1.0", - "bundled": true, - "dev": true - }, - "core-util-is": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "debug": { - "version": "2.6.9", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ms": "2.0.0" - } - }, - "deep-extend": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "optional": true - }, - "delegates": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "detect-libc": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "fs-minipass": { - "version": "1.2.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "fs.realpath": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "gauge": { - "version": "2.7.4", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "aproba": "1.2.0", - "console-control-strings": "1.1.0", - "has-unicode": "2.0.1", - "object-assign": "4.1.1", - "signal-exit": "3.0.2", - "string-width": "1.0.2", - "strip-ansi": "3.0.1", - "wide-align": "1.1.2" - } - }, - "glob": { - "version": "7.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "fs.realpath": "1.0.0", - "inflight": "1.0.6", - "inherits": "2.0.3", - "minimatch": "3.0.4", - "once": "1.4.0", - "path-is-absolute": "1.0.1" - } - }, - "has-unicode": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "iconv-lite": { - "version": "0.4.21", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safer-buffer": "2.1.2" - } - }, - "ignore-walk": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minimatch": "3.0.4" - } - }, - "inflight": { - "version": "1.0.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "once": "1.4.0", - "wrappy": "1.0.2" - } - }, - "inherits": { - "version": "2.0.3", - "bundled": true, - "dev": true - }, - "ini": { - "version": "1.3.5", - "bundled": true, - "dev": true, - "optional": true - }, - "is-fullwidth-code-point": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "requires": { - "number-is-nan": "1.0.1" - } - }, - "isarray": { - "version": "1.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "minimatch": { - "version": "3.0.4", - "bundled": true, - "dev": true, - "requires": { - "brace-expansion": "1.1.11" - } - }, - "minimist": { - "version": "0.0.8", - "bundled": true, - "dev": true - }, - "minipass": { - "version": "2.2.4", - "bundled": true, - "dev": true, - "requires": { - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "minizlib": { - "version": "1.1.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "minipass": "2.2.4" - } - }, - "mkdirp": { - "version": "0.5.1", - "bundled": true, - "dev": true, - "requires": { - "minimist": "0.0.8" - } - }, - "ms": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "needle": { - "version": "2.2.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "debug": "2.6.9", - "iconv-lite": "0.4.21", - "sax": "1.2.4" - } - }, - "node-pre-gyp": { - "version": "0.10.0", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "detect-libc": "1.0.3", - "mkdirp": "0.5.1", - "needle": "2.2.0", - "nopt": "4.0.1", - "npm-packlist": "1.1.10", - "npmlog": "4.1.2", - "rc": "1.2.7", - "rimraf": "2.6.2", - "semver": "5.5.0", - "tar": "4.4.1" - } - }, - "nopt": { - "version": "4.0.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "abbrev": "1.1.1", - "osenv": "0.1.5" - } - }, - "npm-bundled": { - "version": "1.0.3", - "bundled": true, - "dev": true, - "optional": true - }, - "npm-packlist": { - "version": "1.1.10", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "ignore-walk": "3.0.1", - "npm-bundled": "1.0.3" - } - }, - "npmlog": { - "version": "4.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "are-we-there-yet": "1.1.4", - "console-control-strings": "1.1.0", - "gauge": "2.7.4", - "set-blocking": "2.0.0" - } - }, - "number-is-nan": { - "version": "1.0.1", - "bundled": true, - "dev": true - }, - "object-assign": { - "version": "4.1.1", - "bundled": true, - "dev": true, - "optional": true - }, - "once": { - "version": "1.4.0", - "bundled": true, - "dev": true, - "requires": { - "wrappy": "1.0.2" - } - }, - "os-homedir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "os-tmpdir": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "osenv": { - "version": "0.1.5", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "os-homedir": "1.0.2", - "os-tmpdir": "1.0.2" - } - }, - "path-is-absolute": { - "version": "1.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "process-nextick-args": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "rc": { - "version": "1.2.7", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "deep-extend": "0.5.1", - "ini": "1.3.5", - "minimist": "1.2.0", - "strip-json-comments": "2.0.1" - }, - "dependencies": { - "minimist": { - "version": "1.2.0", - "bundled": true, - "dev": true, - "optional": true - } - } - }, - "readable-stream": { - "version": "2.3.6", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "core-util-is": "1.0.2", - "inherits": "2.0.3", - "isarray": "1.0.0", - "process-nextick-args": "2.0.0", - "safe-buffer": "5.1.1", - "string_decoder": "1.1.1", - "util-deprecate": "1.0.2" - } - }, - "rimraf": { - "version": "2.6.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "glob": "7.1.2" - } - }, - "safe-buffer": { - "version": "5.1.1", - "bundled": true, - "dev": true - }, - "safer-buffer": { - "version": "2.1.2", - "bundled": true, - "dev": true, - "optional": true - }, - "sax": { - "version": "1.2.4", - "bundled": true, - "dev": true, - "optional": true - }, - "semver": { - "version": "5.5.0", - "bundled": true, - "dev": true, - "optional": true - }, - "set-blocking": { - "version": "2.0.0", - "bundled": true, - "dev": true, - "optional": true - }, - "signal-exit": { - "version": "3.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "string-width": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "requires": { - "code-point-at": "1.1.0", - "is-fullwidth-code-point": "1.0.0", - "strip-ansi": "3.0.1" - } - }, - "string_decoder": { - "version": "1.1.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "safe-buffer": "5.1.1" - } - }, - "strip-ansi": { - "version": "3.0.1", - "bundled": true, - "dev": true, - "requires": { - "ansi-regex": "2.1.1" - } - }, - "strip-json-comments": { - "version": "2.0.1", - "bundled": true, - "dev": true, - "optional": true - }, - "tar": { - "version": "4.4.1", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "chownr": "1.0.1", - "fs-minipass": "1.2.5", - "minipass": "2.2.4", - "minizlib": "1.1.0", - "mkdirp": "0.5.1", - "safe-buffer": "5.1.1", - "yallist": "3.0.2" - } - }, - "util-deprecate": { - "version": "1.0.2", - "bundled": true, - "dev": true, - "optional": true - }, - "wide-align": { - "version": "1.1.2", - "bundled": true, - "dev": true, - "optional": true, - "requires": { - "string-width": "1.0.2" - } - }, - "wrappy": { - "version": "1.0.2", - "bundled": true, - "dev": true - }, - "yallist": { - "version": "3.0.2", - "bundled": true, - "dev": true - } - } - }, "fstream": { "version": "1.0.11", "resolved": "https://registry.npmjs.org/fstream/-/fstream-1.0.11.tgz", @@ -22412,6 +21882,11 @@ "integrity": "sha1-IpnwLG3tMNSllhsLn3RSShj2NPw=", "dev": true }, + "vee-validate": { + "version": "2.1.0-beta.5", + "resolved": "https://registry.npmjs.org/vee-validate/-/vee-validate-2.1.0-beta.5.tgz", + "integrity": "sha512-XN0FCHBEWKbxKprjzIwIr7ff5U+aFaJZlkoKr1ReuncMwHgG/6iW0hEI4bDuNXx1YKPmm4SyhoXkAOBHIUIwTA==" + }, "vendors": { "version": "1.0.2", "resolved": "https://registry.npmjs.org/vendors/-/vendors-1.0.2.tgz", diff --git a/resources/assets/js/pages/admin/complete-order.vue b/resources/assets/js/pages/admin/complete-order.vue index 7c5f05f8..9e5a6839 100644 --- a/resources/assets/js/pages/admin/complete-order.vue +++ b/resources/assets/js/pages/admin/complete-order.vue @@ -1,13 +1,24 @@ \ No newline at end of file diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue index 26f27f52..2a8eb369 100644 --- a/resources/assets/js/pages/admin/home.vue +++ b/resources/assets/js/pages/admin/home.vue @@ -1,7 +1,8 @@ @@ -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 053/125] 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) => { From 39d564615509a735d4427d9f6139f1163942c5b7 Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Thu, 12 Jul 2018 00:52:46 +0800 Subject: [PATCH 054/125] dynamically show malaysia bank acc for booking step --- .../SettingBeneficiaryController.php | 12 +- app/SettingBeneficiaries.php | 10 + app/SettingBeneficiary.php | 10 - app/SettingMalaysiaBank.php | 2 +- .../factories/SettingBeneficiaryFactory.php | 2 +- ...pdate_accno_to_id_setting_active_table.php | 51 ++ database/seeds/SettingActiveBankSeeder.php | 12 +- .../js/pages/booking/uploadUserBankSlip.vue | 499 ++++++++++-------- routes/api.php | 10 +- 9 files changed, 360 insertions(+), 248 deletions(-) create mode 100644 app/SettingBeneficiaries.php delete mode 100644 app/SettingBeneficiary.php create mode 100644 database/migrations/2018_07_11_150423_update_accno_to_id_setting_active_table.php diff --git a/app/Http/Controllers/SettingBeneficiaryController.php b/app/Http/Controllers/SettingBeneficiaryController.php index fdec75f7..5b43d86b 100644 --- a/app/Http/Controllers/SettingBeneficiaryController.php +++ b/app/Http/Controllers/SettingBeneficiaryController.php @@ -2,36 +2,36 @@ namespace App\Http\Controllers; -use App\SettingBeneficiary; +use App\SettingBeneficiaries; use Illuminate\Http\Request; class SettingBeneficiaryController extends Controller { public function index() { - return SettingBeneficiary::all(); + return SettingBeneficiaries::all(); } - public function show(SettingBeneficiary $beneficiary) + public function show(SettingBeneficiaries $beneficiary) { return $beneficiary; } public function store(Request $request) { - $beneficiary = SettingBeneficiary::create($request->all()); + $beneficiary = SettingBeneficiaries::create($request->all()); return response()->json($beneficiary, 201); } - public function update(Request $request, SettingBeneficiary $beneficiary) + public function update(Request $request, SettingBeneficiaries $beneficiary) { $beneficiary->update($request->all()); return response()->json($beneficiary, 200); } - public function delete(SettingBeneficiary $beneficiary) + public function delete(SettingBeneficiaries $beneficiary) { $beneficiary->delete(); diff --git a/app/SettingBeneficiaries.php b/app/SettingBeneficiaries.php new file mode 100644 index 00000000..a37325fd --- /dev/null +++ b/app/SettingBeneficiaries.php @@ -0,0 +1,10 @@ +define(App\SettingBeneficiary::class, function (Faker $faker) { +$factory->define(App\SettingBeneficiaries::class, function (Faker $faker) { return [ // ]; diff --git a/database/migrations/2018_07_11_150423_update_accno_to_id_setting_active_table.php b/database/migrations/2018_07_11_150423_update_accno_to_id_setting_active_table.php new file mode 100644 index 00000000..148134b9 --- /dev/null +++ b/database/migrations/2018_07_11_150423_update_accno_to_id_setting_active_table.php @@ -0,0 +1,51 @@ +dropForeign('setting_active_banks_x1_bank_id_foreign'); + $table->dropForeign('setting_active_banks_x2_bank_id_foreign'); + $table->dropForeign('setting_active_banks_beneficiary_id_foreign'); + $table->dropColumn('x1_bank_id'); + $table->dropColumn('x2_bank_id'); + $table->dropColumn('beneficiary_id'); + }); + + Schema::table('setting_active_banks', function(Blueprint $table) + { + $table->unsignedInteger('x1_bank_id')->unique(); + $table->foreign('x1_bank_id') + ->references('id')->on('setting_malaysia_banks'); + + $table->unsignedInteger('x2_bank_id')->unique(); + $table->foreign('x2_bank_id') + ->references('id')->on('setting_malaysia_banks'); + + $table->unsignedInteger('beneficiary_id')->unique(); + $table->foreign('beneficiary_id') + ->references('id')->on('setting_beneficiaries'); + }); + } + + /** + * Reverse the migrations. + * + * @return void + */ + public function down() + { + // + } +} diff --git a/database/seeds/SettingActiveBankSeeder.php b/database/seeds/SettingActiveBankSeeder.php index feed9792..40560300 100644 --- a/database/seeds/SettingActiveBankSeeder.php +++ b/database/seeds/SettingActiveBankSeeder.php @@ -1,6 +1,8 @@ first(); + $bankx2 = SettingMalaysiaBank::where('acc_no', "=",'malaysiaacc02')->first(); + $chinabank = SettingBeneficiaries::where('acc_no', "=" ,'123456789')->first(); + DB::table('setting_active_banks')->truncate(); DB::table('setting_active_banks')->insert([ - 'x1_bank_id' => 'malaysiaacc01', - 'x2_bank_id' => 'malaysiaacc02', - 'beneficiary_id' => '123456789' + 'x1_bank_id' => $bankx1->id, + 'x2_bank_id' => $bankx2->id, + 'beneficiary_id' => $chinabank->id ]); } } diff --git a/resources/assets/js/pages/booking/uploadUserBankSlip.vue b/resources/assets/js/pages/booking/uploadUserBankSlip.vue index 5071cf96..705131cc 100644 --- a/resources/assets/js/pages/booking/uploadUserBankSlip.vue +++ b/resources/assets/js/pages/booking/uploadUserBankSlip.vue @@ -1,103 +1,103 @@ diff --git a/routes/api.php b/routes/api.php index ef3d2af0..b4f689ee 100644 --- a/routes/api.php +++ b/routes/api.php @@ -46,6 +46,10 @@ Route::group(['middleware' => 'auth:api'], function () { Route::get('user', 'UserController@show'); Route::patch('settings/profile', 'Settings\ProfileController@update'); Route::patch('settings/password', 'Settings\PasswordController@update'); + + // for both user and admin + Route::get('setting-active-bank', 'SettingActiveBankController@index'); + Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); }); @@ -70,7 +74,6 @@ 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::put('setting-active-bank', 'SettingActiveBankController@update'); Route::get('setting-supplier', 'SettingSupplierController@index'); @@ -86,7 +89,6 @@ Route::group(['middleware' => ['role:admin']], function() { Route::delete('setting-beneficiary/{beneficiary}', 'SettingBeneficiaryController@delete'); Route::get('setting-malaysia-bank', 'SettingMalaysiaBankController@index'); - Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); Route::post('setting-malaysia-bank', 'SettingMalaysiaBankController@store'); Route::put('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@update'); Route::delete('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@delete'); @@ -108,5 +110,9 @@ Route::group(['middleware' => ['role:admin']], function() { Route::get('booking/{id}/po', 'BookingController@showPurchaseOrder'); Route::post('booking/{id}/upload-invoice', 'BookingController@uploadInvoice'); Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice'); + + // for both user and admin + // Route::get('setting-active-bank', 'SettingActiveBankController@index'); + // Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); }); \ No newline at end of file From 1535b54f04536aeb9f3add8e1c0bd831778ab696 Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Thu, 12 Jul 2018 01:09:49 +0800 Subject: [PATCH 055/125] revert back changes during debug --- resources/assets/js/pages/booking/uploadUserBankSlip.vue | 6 +++--- routes/api.php | 8 ++++---- 2 files changed, 7 insertions(+), 7 deletions(-) diff --git a/resources/assets/js/pages/booking/uploadUserBankSlip.vue b/resources/assets/js/pages/booking/uploadUserBankSlip.vue index 705131cc..593af081 100644 --- a/resources/assets/js/pages/booking/uploadUserBankSlip.vue +++ b/resources/assets/js/pages/booking/uploadUserBankSlip.vue @@ -257,7 +257,7 @@ export default { this.start = true; }, updateBankDetail(){ - axios.get('/api/setting-active-bank') + axios.get('/api/active-bank') .then((response) => { this.active_bank_setting = response.data; console.log(this.active_bank_setting.x1_bank_id); @@ -276,10 +276,10 @@ export default { getBankDetailWithTerm(){ var url = ''; if(this.booking.term === 'x1_cash' || this.booking.term === 'x1_cheque' ||this.booking.term === 'x1_ba'){ - url = '/api/setting-malaysia-bank/' + this.active_bank_setting.x1_bank_id; + url = '/api/malaysia-bank/' + this.active_bank_setting.x1_bank_id; } else if(this.booking.term === 'x2_cash' || this.booking.term === 'x2_cheque' ||this.booking.term === 'x2_ba'){ - url = '/api/setting-malaysia-bank/' + this.active_bank_setting.x2_bank_id; + url = '/api/malaysia-bank/' + this.active_bank_setting.x2_bank_id; } axios.get(url) diff --git a/routes/api.php b/routes/api.php index b4f689ee..75d54e38 100644 --- a/routes/api.php +++ b/routes/api.php @@ -48,8 +48,8 @@ Route::group(['middleware' => 'auth:api'], function () { Route::patch('settings/password', 'Settings\PasswordController@update'); // for both user and admin - Route::get('setting-active-bank', 'SettingActiveBankController@index'); - Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); + Route::get('active-bank', 'SettingActiveBankController@index'); + Route::get('malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); }); @@ -112,7 +112,7 @@ Route::group(['middleware' => ['role:admin']], function() { Route::post('booking/{id}/confirm-invoice', 'BookingController@confirmInvoice'); // for both user and admin - // Route::get('setting-active-bank', 'SettingActiveBankController@index'); - // Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); + Route::get('setting-active-bank', 'SettingActiveBankController@index'); + Route::get('setting-malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); }); \ No newline at end of file From ad5f8df8af952d4caf9ba530407e2e0ededec73c Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Thu, 12 Jul 2018 01:12:26 +0800 Subject: [PATCH 056/125] revert back changes during debug --- app/SettingBeneficiaries.php | 2 +- app/SettingMalaysiaBank.php | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/app/SettingBeneficiaries.php b/app/SettingBeneficiaries.php index a37325fd..26c09e31 100644 --- a/app/SettingBeneficiaries.php +++ b/app/SettingBeneficiaries.php @@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model; class SettingBeneficiaries extends Model { - protected $fillable = ['id','company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch']; + protected $fillable = ['company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch']; } diff --git a/app/SettingMalaysiaBank.php b/app/SettingMalaysiaBank.php index a8153451..ccd71e62 100644 --- a/app/SettingMalaysiaBank.php +++ b/app/SettingMalaysiaBank.php @@ -6,5 +6,5 @@ use Illuminate\Database\Eloquent\Model; class SettingMalaysiaBank extends Model { - protected $fillable = ['id','company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch']; + protected $fillable = ['company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch']; } From 19ea22141e287706d91a38341f583d35ff7ac763 Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Thu, 12 Jul 2018 22:42:16 +0800 Subject: [PATCH 057/125] dynamically show chinabank in supplier report --- .../js/pages/admin/booking/supplierReport.vue | 381 ++++++++++-------- routes/api.php | 2 - 2 files changed, 211 insertions(+), 172 deletions(-) diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index 41400042..ce6dca4b 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -270,13 +270,23 @@ }, supplier_booking:{ }, + active_bank_setting: { + x1_bank_id: null, + x2_bank_id: null, + beneficiary_id: null + }, + beneficiaryDetail:{ + company_name: '奕继椿', + bank_name: '民生银行 深川红荔支行', + acc_no: '123456789', + }, supplier: null, supplier_options: null, exampleContent: "This is TEXT" - } }, beforeCreate() { + const loading = this.$loading({ lock: true, text: 'Please wait..', @@ -297,8 +307,7 @@ }) }) - axios - .get('/api/supplier-booking/' + this.$route.params.id) + axios.get('/api/supplier-booking/' + this.$route.params.id) .then((response) => { loading.close() this.supplier_booking = response.data @@ -310,18 +319,45 @@ }) }) - - + axios.get('/api/active-bank') + .then((response) => { + axios.get('/api/setting-beneficiary/' + response.data.beneficiary_id) + .then((response) => { + this.supplier_booking.china_bank_name = response.data.bank_name; + this.supplier_booking.china_company_name = response.data.company_name; + this.supplier_booking.china_acc_no = response.data.acc_no; + console.log(this.supplier_booking); + }) + .catch((error) => { + console.log(error); + this.$message({ + showClose: true, + message: 'Fetch data fail', + type: 'error', + duration: 10000 + }); + }); + }) + .catch((error) => { + console.log(error); + this.$message({ + showClose: true, + message: 'Fetch data fail', + type: 'error', + duration: 10000 + }); + }); + }, methods: { downloadReport(){ let canvas = document.getElementById('myCanvas') - var dataString = canvas.toDataURL("image/png"); - console.log(dataString) - var link = document.createElement("a"); - link.download = 'image'; - link.href = dataString; - link.click(); + var dataString = canvas.toDataURL("image/png"); + console.log(dataString) + var link = document.createElement("a"); + link.download = 'image'; + link.href = dataString; + link.click(); }, goToSupplierBooking(){ this.$router.push({ @@ -330,7 +366,7 @@ }) }, completeReport() { - // TODO : send request to change status + // TODO : send request to change status this.loading_btn = true axios .post('/api/booking/' + this.$route.params.id + '/confirm-supplier') @@ -362,174 +398,179 @@ id: this.$route.params.id } }) - } - + }, }, directives: { insertMessage: function (canvasElement, binding) { - ////////////////// variable ////////////////////////// - var canvasWidth = 450; - var rowHeight = [20, 40, 60, 80, 100, 120, 140, 170, 190, 210, 230, 250, 270, 290, 310, 330, 350, 390, 410, - 470, 490, 510, 610, 630 - ] - const canvasHeight = rowHeight[rowHeight.length - 1]; + setTimeout(function (canvasElement, binding) { + ////////////////// variable ////////////////////////// + var canvasWidth = 450; + var rowHeight = [20, 40, 60, 80, 100, 120, 140, 170, 190, 210, 230, 250, 270, 290, 310, 330, 350, 390, 410, + 470, 490, 510, 610, 630 + ] + const canvasHeight = rowHeight[rowHeight.length - 1]; - var column1X = 220; - var column2X = 320; - var column3X = 420; + var column1X = 220; + var column2X = 320; + var column3X = 420; - ///////////////////Canvast Init//////////////////// - var canvas = document.getElementById("myCanvas"); - canvas.width = canvasWidth; - canvas.height = canvasHeight; - // Get canvas context - var ctx = canvasElement.getContext("2d"); - // Clear the canvas - ctx.clearRect(0, 0, 300, 150); + ///////////////////Canvast Init//////////////////// + var canvas = document.getElementById("myCanvas"); + canvas.width = canvasWidth; + canvas.height = canvasHeight; + // Get canvas context + var ctx = canvasElement.getContext("2d"); + // Clear the canvas + ctx.clearRect(0, 0, 300, 150); - ctx.fillStyle = "#FFFFFF"; - ctx.fillRect(0, 0, canvasWidth, rowHeight[0]); - for (var i = 1; i < rowHeight.length; i++) { - if (i % 2 == 1) - ctx.fillStyle = "#A9D08E"; - else ctx.fillStyle = "#FFFFFF"; - ctx.fillRect(0, rowHeight[i - 1], canvasWidth, rowHeight[i]); - } - ///////////// fillup with text//////////////// - //// config canvas - ctx.fillStyle = "#000000"; - ctx.font = "13px Arial"; - ctx.textAlign = "right"; - //// Row 1 - ctx.fillText("Payment Voucher :", column1X, rowHeight[1] - 5); - ctx.fillText(binding.value.id, column3X, rowHeight[1] - 5); - //// Row 2 - ctx.fillText("Date :", column1X, rowHeight[2] - 5); - ctx.fillText(binding.value.date, column3X, rowHeight[2] - 5); - //// Row 3 - ctx.fillText("Marking :", column1X, rowHeight[3] - 5); - ctx.font = "bold 14px Arial"; - ctx.fillStyle = "#0070D5"; - ctx.fillText("CIEF/605HOS", column3X, rowHeight[3] - 5); - ctx.fillStyle = "#000000"; - ctx.font = "13px Arial"; - //// Row 4 - ctx.fillText("Payment For(Order No.) :", column1X, rowHeight[4] - 5); - ctx.fillText(binding.value.id, column3X, rowHeight[4] - 5); - //// Row 4 - ctx.fillText("Payment For :", column1X, rowHeight[5] - 5); - ctx.fillText("Full Payment", column3X, rowHeight[5] - 5); - //// Row 5 - ctx.fillText("Payment Method :", column1X, rowHeight[6] - 5); - ctx.fillText(binding.value.payment_method, column3X, rowHeight[6] - 5); - //// Row 6 - ctx.fillText("Remark :", column1X, rowHeight[7] - 10); - //// Row 7 - // Empty - //// Row 8 - ctx.fillText("MYR/RM :", column1X, rowHeight[9] - 5); - ctx.fillText("MYR", column2X, rowHeight[9] - 5); - ctx.font = "bold 14px Arial"; - ctx.fillText(binding.value.transfer_amount, column3X, rowHeight[9] - 5); - ctx.font = "13px Arial"; - //// Row 8 - ctx.fillText("* RATE :", column1X, rowHeight[10] - 5); - ctx.fillText(binding.value.rate, column3X, rowHeight[10] - 5); - //// Row 9 - // Empty - //// Row 10 - ctx.font = "bold 14px Arial"; - ctx.fillText("CNY", column2X, rowHeight[12] - 5); - ctx.fillText(binding.value.amountInRMB, column3X, rowHeight[12] - 5); - ctx.font = "13px Arial"; - //line - ctx.beginPath(); - ctx.lineWidth = 1; - ctx.moveTo(column1X + 30, rowHeight[11]); - ctx.lineTo(column3X + 20, rowHeight[11]); - ctx.stroke(); - ctx.beginPath(); - ctx.lineWidth = 2; - ctx.moveTo(column1X + 30, rowHeight[12]); - ctx.lineTo(column3X + 20, rowHeight[12]); - ctx.stroke(); - //// Row 11 - ctx.fillText("MYR/RM :", column1X, rowHeight[14] - 5); - ctx.fillText("MYR", column2X, rowHeight[14] - 5); - ctx.fillText("4830.68", column3X, rowHeight[14] - 5); - //// Row 12 - ctx.fillText("Billing(1.0%) :", column1X, rowHeight[15] - 5); - ctx.fillText("MYR", column2X, rowHeight[15] - 5); - ctx.fillText(binding.value.billing_amount, column3X, rowHeight[15] - 5); - //// Row 13 - ctx.fillText("+ SALES TAX (10%) :", column1X, rowHeight[16] - 5); - ctx.fillText("MYR", column2X, rowHeight[16] - 5); - ctx.fillText(binding.value.salestax_amount, column3X, rowHeight[16] - 5); - //// Row 14 - ctx.fillText("+ GST 6% :", column1X, rowHeight[17] - 15); - ctx.fillText("MYR", column2X, rowHeight[17] - 15); - ctx.fillText("289.84", column3X, rowHeight[17] - 15); - //// Row 15 - ctx.font = "bold 14px Arial"; - ctx.fillText("Customer Bank In Amount :", column1X, rowHeight[18] - 5); - ctx.fillStyle = "#0070D5"; - ctx.fillText("MYR", column2X, rowHeight[18] - 5); - ctx.fillText(binding.value.amountInRMB, column3X, rowHeight[18] - 5); - ctx.fillStyle = "#000000"; - ctx.font = "13px Arial"; - //line - ctx.lineWidth = 1; - ctx.beginPath(); - ctx.moveTo(column1X + 30, rowHeight[17]); - ctx.lineTo(column3X + 20, rowHeight[17]); - ctx.stroke(); - ctx.beginPath(); - ctx.moveTo(column1X + 30, rowHeight[18] + 1); - ctx.lineTo(column3X + 20, rowHeight[18] + 1); - ctx.stroke(); - ctx.beginPath(); - ctx.moveTo(column1X + 30, rowHeight[18] - 2); - ctx.lineTo(column3X + 20, rowHeight[18] - 2); - ctx.stroke(); - //// Row 16 - ctx.fillText("Rebate :", column1X, rowHeight[19] - 25); - ctx.fillText("CNY", column2X, rowHeight[19] - 25); - ctx.fillText("224.68", column3X, rowHeight[19] - 25); - //// Row 16 - ctx.font = "bold 14px Arial"; - ctx.fillText("Bank In to Account Below :", column1X, rowHeight[20] - 5); - ctx.font = "bold italic 15px Arial"; - ctx.fillStyle = "#0070D5"; - ctx.fillText("CNY", column2X, rowHeight[20] - 5); - ctx.fillText("7692.17", column3X - 20, rowHeight[20] - 5); - ctx.fillStyle = "#000000"; - ctx.font = "13px Arial"; - //// Row 17 - //// Row 18 - //// Row 19 - var img = new Image(); - img.src = "/banklogo.png"; - img.crossOrigin = "anonymous"; - var maxwidth = 70; - var ratio = maxwidth / img.width; - var offset = ((rowHeight[22] - rowHeight[21]) / 2) - (img.height * ratio / 2); - var y = rowHeight[21] + offset; // to make it always center + ctx.fillRect(0, 0, canvasWidth, rowHeight[0]); + for (var i = 1; i < rowHeight.length; i++) { + if (i % 2 == 1) + ctx.fillStyle = "#A9D08E"; + else + ctx.fillStyle = "#FFFFFF"; + ctx.fillRect(0, rowHeight[i - 1], canvasWidth, rowHeight[i]); + } + ///////////// fillup with text//////////////// + //// config canvas + ctx.fillStyle = "#000000"; + ctx.font = "13px Arial"; + ctx.textAlign = "right"; + //// Row 1 + ctx.fillText("Payment Voucher :", column1X, rowHeight[1] - 5); + ctx.fillText(binding.value.id, column3X, rowHeight[1] - 5); + //// Row 2 + ctx.fillText("Date :", column1X, rowHeight[2] - 5); + ctx.fillText(binding.value.date, column3X, rowHeight[2] - 5); + //// Row 3 + ctx.fillText("Marking :", column1X, rowHeight[3] - 5); + ctx.font = "bold 14px Arial"; + ctx.fillStyle = "#0070D5"; + ctx.fillText("CIEF/605HOS", column3X, rowHeight[3] - 5); + ctx.fillStyle = "#000000"; + ctx.font = "13px Arial"; + //// Row 4 + ctx.fillText("Payment For(Order No.) :", column1X, rowHeight[4] - 5); + ctx.fillText(binding.value.id, column3X, rowHeight[4] - 5); + //// Row 4 + ctx.fillText("Payment For :", column1X, rowHeight[5] - 5); + ctx.fillText("Full Payment", column3X, rowHeight[5] - 5); + //// Row 5 + ctx.fillText("Payment Method :", column1X, rowHeight[6] - 5); + ctx.fillText(binding.value.payment_method, column3X, rowHeight[6] - 5); + //// Row 6 + ctx.fillText("Remark :", column1X, rowHeight[7] - 10); + //// Row 7 + // Empty + //// Row 8 + ctx.fillText("MYR/RM :", column1X, rowHeight[9] - 5); + ctx.fillText("MYR", column2X, rowHeight[9] - 5); + ctx.font = "bold 14px Arial"; + ctx.fillText(binding.value.transfer_amount, column3X, rowHeight[9] - 5); + ctx.font = "13px Arial"; + //// Row 8 + ctx.fillText("* RATE :", column1X, rowHeight[10] - 5); + ctx.fillText(binding.value.rate, column3X, rowHeight[10] - 5); + //// Row 9 + // Empty + //// Row 10 + ctx.font = "bold 14px Arial"; + ctx.fillText("CNY", column2X, rowHeight[12] - 5); + ctx.fillText(binding.value.amountInRMB, column3X, rowHeight[12] - 5); + ctx.font = "13px Arial"; + //line + ctx.beginPath(); + ctx.lineWidth = 1; + ctx.moveTo(column1X + 30, rowHeight[11]); + ctx.lineTo(column3X + 20, rowHeight[11]); + ctx.stroke(); + ctx.beginPath(); + ctx.lineWidth = 2; + ctx.moveTo(column1X + 30, rowHeight[12]); + ctx.lineTo(column3X + 20, rowHeight[12]); + ctx.stroke(); + //// Row 11 + ctx.fillText("MYR/RM :", column1X, rowHeight[14] - 5); + ctx.fillText("MYR", column2X, rowHeight[14] - 5); + ctx.fillText("4830.68", column3X, rowHeight[14] - 5); + //// Row 12 + ctx.fillText("Billing(1.0%) :", column1X, rowHeight[15] - 5); + ctx.fillText("MYR", column2X, rowHeight[15] - 5); + ctx.fillText(binding.value.billing_amount, column3X, rowHeight[15] - 5); + //// Row 13 + ctx.fillText("+ SALES TAX (10%) :", column1X, rowHeight[16] - 5); + ctx.fillText("MYR", column2X, rowHeight[16] - 5); + ctx.fillText(binding.value.salestax_amount, column3X, rowHeight[16] - 5); + //// Row 14 + ctx.fillText("+ GST 6% :", column1X, rowHeight[17] - 15); + ctx.fillText("MYR", column2X, rowHeight[17] - 15); + ctx.fillText("289.84", column3X, rowHeight[17] - 15); + //// Row 15 + ctx.font = "bold 14px Arial"; + ctx.fillText("Customer Bank In Amount :", column1X, rowHeight[18] - 5); + ctx.fillStyle = "#0070D5"; + ctx.fillText("MYR", column2X, rowHeight[18] - 5); + ctx.fillText(binding.value.amountInRMB, column3X, rowHeight[18] - 5); + ctx.fillStyle = "#000000"; + ctx.font = "13px Arial"; + //line + ctx.lineWidth = 1; + ctx.beginPath(); + ctx.moveTo(column1X + 30, rowHeight[17]); + ctx.lineTo(column3X + 20, rowHeight[17]); + ctx.stroke(); + ctx.beginPath(); + ctx.moveTo(column1X + 30, rowHeight[18] + 1); + ctx.lineTo(column3X + 20, rowHeight[18] + 1); + ctx.stroke(); + ctx.beginPath(); + ctx.moveTo(column1X + 30, rowHeight[18] - 2); + ctx.lineTo(column3X + 20, rowHeight[18] - 2); + ctx.stroke(); + //// Row 16 + ctx.fillText("Rebate :", column1X, rowHeight[19] - 25); + ctx.fillText("CNY", column2X, rowHeight[19] - 25); + ctx.fillText("224.68", column3X, rowHeight[19] - 25); + //// Row 16 + ctx.font = "bold 14px Arial"; + ctx.fillText("Bank In to Account Below :", column1X, rowHeight[20] - 5); + ctx.font = "bold italic 15px Arial"; + ctx.fillStyle = "#0070D5"; + ctx.fillText("CNY", column2X, rowHeight[20] - 5); + ctx.fillText("7692.17", column3X - 20, rowHeight[20] - 5); + ctx.fillStyle = "#000000"; + ctx.font = "13px Arial"; + //// Row 17 + //// Row 18 + //// Row 19 + var img = new Image(); + img.src = "/banklogo.png"; + img.crossOrigin = "anonymous"; + var maxwidth = 70; + var ratio = maxwidth / img.width; + var offset = ((rowHeight[22] - rowHeight[21]) / 2) - (img.height * ratio / 2); + var y = rowHeight[21] + offset; // to make it always center - img.onload=function(){ - ctx.drawImage(img, 50, 530, 80, 50); - }; - - // text - ctx.font = "bold 14px Arial"; - ctx.textAlign = "center"; - ctx.fillText("China beneficiary Account", column2X - 40, rowHeight[22] - 80); - ctx.fillText("户名 : 奕继椿", column2X - 40, rowHeight[22] - 60); - ctx.fillText("6226 1906 8014 3314", column2X - 40, rowHeight[22] - 40); - ctx.fillText("民生银行 深川红荔支行", column2X - 40, rowHeight[22] - 20); - ctx.font = "13px Arial"; + img.onload=function(){ + ctx.drawImage(img, 50, 530, 80, 50); + }; + // text + ctx.font = "bold 14px Arial"; + ctx.textAlign = "center"; + console.log(binding.value.amountInRMB); + console.log(binding.value); + ctx.fillText("China beneficiary Account", column2X - 40, rowHeight[22] - 80); + ctx.fillText("户名 : " + binding.value.china_company_name, column2X - 40, rowHeight[22] - 60); + ctx.fillText(binding.value.china_acc_no, column2X - 40, rowHeight[22] - 40); + ctx.fillText(binding.value.china_bank_name , column2X - 40, rowHeight[22] - 20); + + ctx.font = "13px Arial"; + }, 1000,canvasElement,binding); + } } + } \ No newline at end of file diff --git a/routes/api.php b/routes/api.php index 75d54e38..5e860f45 100644 --- a/routes/api.php +++ b/routes/api.php @@ -52,8 +52,6 @@ Route::group(['middleware' => 'auth:api'], function () { Route::get('malaysia-bank/{malaysiaBank}', 'SettingMalaysiaBankController@show'); }); - - Route::group(['middleware' => 'guest:api'], function () { Route::post('login', 'Auth\LoginController@login')->name('login'); Route::post('register', 'Auth\RegisterController@create'); From 62e8a9b9b6090a125e03f2aba753d4efdb71c86d Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Thu, 12 Jul 2018 22:59:16 +0800 Subject: [PATCH 058/125] close loading only when all resource load finish --- .../assets/js/pages/admin/booking/supplierReport.vue | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index ce6dca4b..33b1a5d2 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -297,11 +297,9 @@ axios .get('/api/admin/booking/' + this.$route.params.id) .then((response) => { - loading.close() this.booking_details = response.data }).catch((error) => { console.log(error) - loading.close() this.$router.push({ name: 'notfound' }) @@ -309,11 +307,9 @@ axios.get('/api/supplier-booking/' + this.$route.params.id) .then((response) => { - loading.close() this.supplier_booking = response.data }).catch((error) => { console.log(error) - loading.close() this.$router.push({ name: 'notfound' }) @@ -323,12 +319,13 @@ .then((response) => { axios.get('/api/setting-beneficiary/' + response.data.beneficiary_id) .then((response) => { + loading.close(); this.supplier_booking.china_bank_name = response.data.bank_name; this.supplier_booking.china_company_name = response.data.company_name; this.supplier_booking.china_acc_no = response.data.acc_no; - console.log(this.supplier_booking); }) .catch((error) => { + loading.close(); console.log(error); this.$message({ showClose: true, @@ -339,6 +336,7 @@ }); }) .catch((error) => { + loading.close(); console.log(error); this.$message({ showClose: true, @@ -347,7 +345,6 @@ duration: 10000 }); }); - }, methods: { downloadReport(){ From d9dfe84c2e0504fd08fa767651d5ab205ddc5cdf Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Fri, 13 Jul 2018 09:58:32 +0800 Subject: [PATCH 059/125] rename beneficiaries tobeneficiary --- .../Controllers/SettingBeneficiaryController.php | 12 ++++++------ ...ttingBeneficiaries.php => SettingBeneficiary.php} | 2 +- database/factories/SettingBeneficiaryFactory.php | 2 +- database/seeds/DatabaseSeeder.php | 2 +- ...ciaresSeeder.php => SettingBeneficiarySeeder.php} | 2 +- 5 files changed, 10 insertions(+), 10 deletions(-) rename app/{SettingBeneficiaries.php => SettingBeneficiary.php} (81%) rename database/seeds/{SettingBeneficiaresSeeder.php => SettingBeneficiarySeeder.php} (94%) diff --git a/app/Http/Controllers/SettingBeneficiaryController.php b/app/Http/Controllers/SettingBeneficiaryController.php index 5b43d86b..fdec75f7 100644 --- a/app/Http/Controllers/SettingBeneficiaryController.php +++ b/app/Http/Controllers/SettingBeneficiaryController.php @@ -2,36 +2,36 @@ namespace App\Http\Controllers; -use App\SettingBeneficiaries; +use App\SettingBeneficiary; use Illuminate\Http\Request; class SettingBeneficiaryController extends Controller { public function index() { - return SettingBeneficiaries::all(); + return SettingBeneficiary::all(); } - public function show(SettingBeneficiaries $beneficiary) + public function show(SettingBeneficiary $beneficiary) { return $beneficiary; } public function store(Request $request) { - $beneficiary = SettingBeneficiaries::create($request->all()); + $beneficiary = SettingBeneficiary::create($request->all()); return response()->json($beneficiary, 201); } - public function update(Request $request, SettingBeneficiaries $beneficiary) + public function update(Request $request, SettingBeneficiary $beneficiary) { $beneficiary->update($request->all()); return response()->json($beneficiary, 200); } - public function delete(SettingBeneficiaries $beneficiary) + public function delete(SettingBeneficiary $beneficiary) { $beneficiary->delete(); diff --git a/app/SettingBeneficiaries.php b/app/SettingBeneficiary.php similarity index 81% rename from app/SettingBeneficiaries.php rename to app/SettingBeneficiary.php index 26c09e31..b6ea22e1 100644 --- a/app/SettingBeneficiaries.php +++ b/app/SettingBeneficiary.php @@ -4,7 +4,7 @@ namespace App; use Illuminate\Database\Eloquent\Model; -class SettingBeneficiaries extends Model +class SettingBeneficiary extends Model { protected $fillable = ['company_name','bank_name','acc_no','bank_address','swift','cnap','bank_branch']; } diff --git a/database/factories/SettingBeneficiaryFactory.php b/database/factories/SettingBeneficiaryFactory.php index f3d95095..79204254 100644 --- a/database/factories/SettingBeneficiaryFactory.php +++ b/database/factories/SettingBeneficiaryFactory.php @@ -2,7 +2,7 @@ use Faker\Generator as Faker; -$factory->define(App\SettingBeneficiaries::class, function (Faker $faker) { +$factory->define(App\SettingBeneficiary::class, function (Faker $faker) { return [ // ]; diff --git a/database/seeds/DatabaseSeeder.php b/database/seeds/DatabaseSeeder.php index 32544630..2c2e3c17 100644 --- a/database/seeds/DatabaseSeeder.php +++ b/database/seeds/DatabaseSeeder.php @@ -24,7 +24,7 @@ class DatabaseSeeder extends Seeder $this->call(MarkingSeeder::class); DB::statement('SET FOREIGN_KEY_CHECKS=0;'); $this->call(SettingMalaysiaBankSeeder::class); - $this->call(SettingBeneficiaresSeeder::class); + $this->call(SettingBeneficiarySeeder::class); $this->call(SettingActiveBankSeeder::class); DB::statement('SET FOREIGN_KEY_CHECKS=1;'); } diff --git a/database/seeds/SettingBeneficiaresSeeder.php b/database/seeds/SettingBeneficiarySeeder.php similarity index 94% rename from database/seeds/SettingBeneficiaresSeeder.php rename to database/seeds/SettingBeneficiarySeeder.php index c7da261c..3cb2758b 100644 --- a/database/seeds/SettingBeneficiaresSeeder.php +++ b/database/seeds/SettingBeneficiarySeeder.php @@ -2,7 +2,7 @@ use Illuminate\Database\Seeder; -class SettingBeneficiaresSeeder extends Seeder +class SettingBeneficiarySeeder extends Seeder { /** * Run the database seeds. From 1c9a9aca208a5b46b3660851cdd4b07f53eef1a5 Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Fri, 13 Jul 2018 18:31:29 +0800 Subject: [PATCH 060/125] missing change beneficiaries to beneficiary in seeder --- database/seeds/SettingActiveBankSeeder.php | 4 ++-- database/seeds/SettingBeneficiarySeeder.php | 1 + 2 files changed, 3 insertions(+), 2 deletions(-) diff --git a/database/seeds/SettingActiveBankSeeder.php b/database/seeds/SettingActiveBankSeeder.php index 40560300..59ed5afd 100644 --- a/database/seeds/SettingActiveBankSeeder.php +++ b/database/seeds/SettingActiveBankSeeder.php @@ -2,7 +2,7 @@ use Illuminate\Database\Seeder; use App\SettingMalaysiaBank; -use App\SettingBeneficiaries; +use App\SettingBeneficiary; class SettingActiveBankSeeder extends Seeder { @@ -15,7 +15,7 @@ class SettingActiveBankSeeder extends Seeder { $bankx1 = SettingMalaysiaBank::where('acc_no', "=" ,'malaysiaacc01')->first(); $bankx2 = SettingMalaysiaBank::where('acc_no', "=",'malaysiaacc02')->first(); - $chinabank = SettingBeneficiaries::where('acc_no', "=" ,'123456789')->first(); + $chinabank = SettingBeneficiary::where('acc_no', "=" ,'123456789')->first(); DB::table('setting_active_banks')->truncate(); DB::table('setting_active_banks')->insert([ diff --git a/database/seeds/SettingBeneficiarySeeder.php b/database/seeds/SettingBeneficiarySeeder.php index 3cb2758b..ff34fbc4 100644 --- a/database/seeds/SettingBeneficiarySeeder.php +++ b/database/seeds/SettingBeneficiarySeeder.php @@ -1,6 +1,7 @@ Date: Sat, 14 Jul 2018 17:31:21 +0800 Subject: [PATCH 061/125] add new branch for booking flow for x2_chequeand x2_ba --- app/Http/Controllers/BookingController.php | 27 ++++++++++++++----- .../js/components/AdminProgressTrack.vue | 7 +++-- .../js/pages/admin/booking/completed.vue | 9 ++++--- .../pages/admin/booking/supplierBooking.vue | 8 ++++-- .../js/pages/admin/booking/supplierReport.vue | 8 ++++-- .../admin/booking/uploadChinaBankslip.vue | 10 ++++--- .../js/pages/admin/booking/uploadInvoice.vue | 9 ++++--- .../js/pages/admin/booking/verification.vue | 12 ++++++--- resources/assets/js/pages/admin/home.vue | 1 + 9 files changed, 64 insertions(+), 27 deletions(-) diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php index ad63ff84..372e762f 100644 --- a/app/Http/Controllers/BookingController.php +++ b/app/Http/Controllers/BookingController.php @@ -97,7 +97,15 @@ class BookingController extends Controller // TODO : transfer_amount change name to bia $booking->transfer_amount = $booking->bia; - $booking->track_status = "(". $booking->admin_status ."/7)"; + $term = $booking->term; + if($term == "x1_ba" || $term == "x2_cheque"){ + $status = $booking->admin_status > 2 ? $booking->admin_status - 2 : $booking->admin_status; + $booking->track_status = "(". $status ."/5)"; + } + else{ + $booking->track_status = "(". $booking->admin_status ."/7)"; + } + switch ($booking->admin_status) { case 1: $status_desc = "Waiting customer upload bank slip"; @@ -106,11 +114,15 @@ class BookingController extends Controller $status_desc = "Verify user bank slip"; break; case 3: - $status_desc = "Generate supplier booking report"; - break; + if($term !== "x1_ba" || $term !== "x2_cheque"){ + $status_desc = "Generate supplier booking report"; + break; + } case 4: - $status_desc = "Supplier booking report. Please confirm with your booking."; - break; + if($term !== "x1_ba" || $term !== "x2_cheque"){ + $status_desc = "Supplier booking report. Please confirm with your booking."; + break; + } case 5: $status_desc = "Please, upload China Bankslip"; break; @@ -619,7 +631,10 @@ class BookingController extends Controller // update booking status $booking->status = 4; - $booking->admin_status = 3; + if($booking->term !== "x1_ba" || $booking->term !== "x2_cheque") + $booking->admin_status = 3; + else + $booking->admin_status = 5; $booking->save(); return response()->json(['message'=>'Success'],200); diff --git a/resources/assets/js/components/AdminProgressTrack.vue b/resources/assets/js/components/AdminProgressTrack.vue index bf3330c6..3a0a6507 100644 --- a/resources/assets/js/components/AdminProgressTrack.vue +++ b/resources/assets/js/components/AdminProgressTrack.vue @@ -1,10 +1,10 @@