cief/exchange
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange.git synced 2026-08-19 04:14:04 +00:00
Code Issues Packages Projects Releases Wiki Activity
764 Commits 33 Branches 0 Tags
fix/register-error-message
Commit Graph

764 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
Jack Goh 5eb4f46275 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration 2018-06-15 23:21:37 +08:00
Jack Goh 7299685a40 update calculation function in booking controller 2018-06-15 23:21:30 +08:00
Jack Goh e3fb93fbae Merge branch 'too/userbankslip' into 'master' 
Too/userbankslip

See merge request CIEFWorldwideSdnBhd/exchange!14
 2018-06-15 15:18:03 +00:00
Too 82b2c0104e Remove unused bookingtest.php 2018-06-15 21:13:11 +08:00
Jack Goh a449d4f30c TBD calculation feature 
updated bookingconfirmationTable frontend
 2018-06-15 18:54:03 +08:00
Too 67b966f40f add file checking in bookingtest. optimize some code. 2018-06-15 18:21:12 +08:00
Too 3060aa1c1f Fix wrong variable name. Add auth check before upload bankslip and PO. Optimize some code stlye 2018-06-15 17:13:53 +08:00
Jack Goh eeaffe9018 remove alert on form submission 2018-06-15 11:39:53 +08:00
Jack Goh 031cf4897f added validation for input bank details 2018-06-15 11:07:52 +08:00
Too 0ca14574d4 fix conflit 2018-06-14 23:49:27 +08:00
Too fb944428a5 fix conflit 2018-06-14 23:46:39 +08:00
Too 3b2b4617cc Fix conflit 2018-06-14 23:02:24 +08:00
Jack Goh c5a509e7b1 Merge branch 'fix/booking-frontend' into 'master' 
Fix/booking frontend

See merge request CIEFWorldwideSdnBhd/exchange!15
 2018-06-14 14:02:11 +00:00
Jack Goh 2c0b1a4a92 updated order complete title 2018-06-14 21:56:48 +08:00
Jack Goh fdfc6aa278 updated copy right 
updated onclick image open new tab
 2018-06-14 21:54:09 +08:00
Jack Goh 5e0ce6319d updated complete order plage 2018-06-14 21:50:41 +08:00
Jack Goh 6307381c0d added submit po button function 2018-06-14 21:36:26 +08:00
Jack Goh 19d69adad2 added po complete page 2018-06-14 21:23:34 +08:00
Jack Goh 1f5d2db2b8 completed transfer frontend 
completed upload po frontend
 2018-06-14 18:54:00 +08:00
Jack Goh ae0cbb9952 completed order confirmation page 2018-06-14 18:22:45 +08:00
Jack Goh 062350cc60 recommit last commit 2018-06-14 17:39:12 +08:00
Jack Goh f47e9408a1 changed "bookings" folder name to "booking" 
updated routes
 2018-06-14 17:38:52 +08:00
Jack Goh dc56029522 changed step two from "waiting payment" to "payment" 
added few empty page component
updated confirmation routes
 2018-06-14 17:35:37 +08:00
Jack Goh 415f8bb437 updated dynamic progress status 2018-06-14 17:25:54 +08:00
Jack Goh 9eed12bc3d added switch case for booking status 
TBD step 2-6 page
beautified code from home
 2018-06-14 16:25:34 +08:00
Too 83dfca2ae1 fix conflit 2018-06-14 16:02:33 +08:00
Jack Goh 053ea0e874 added transfer amount and exchange amount to upload user bank slip 
added complete steps for user
added empty get booking status
 2018-06-14 15:32:24 +08:00
Too 5ce817cd33 remove duplicate getting banksli_url. add user bank slip into database in uploadbankslip. save image_url in uploadpurchaseorder 2018-06-14 15:08:00 +08:00
Jack Goh 274ebe3490 added progress tracker 2018-06-14 11:56:22 +08:00
Jack Goh 9ba6b2aba8 fix bookingconfirmation data 2018-06-14 11:35:45 +08:00
Jack Goh 09a2fe36e8 make booking number and status clickable 2018-06-14 11:26:12 +08:00
Jack Goh a2b58b6d10 updated table structure 2018-06-14 10:45:21 +08:00
Jack Goh 5d1e7ffd7b added tooltips for X1 and X2 2018-06-14 10:09:30 +08:00
Jack Goh b867474445 updated link for upload later 2018-06-13 22:23:36 +08:00
Jack Goh c0b9e446d5 changed upload to upload-user-bankslip 2018-06-13 22:17:01 +08:00
Jack Goh fde70b744f fix login loading screen 2018-06-13 21:50:06 +08:00
Jack Goh b622d81d94 added prevent user from book if amount is empty 
fixed some variable duplication
added getcalculationvalue function
 2018-06-13 18:27:36 +08:00
Jack Goh 9fa55b3394 Merge branch 'feature/booking' into 'master' 
Feature/booking

See merge request CIEFWorldwideSdnBhd/exchange!12
 2018-06-13 09:06:41 +00:00
Jack Goh 993ac2817f rollback reset password 2018-06-13 16:44:57 +08:00
Jack Goh d2ca59eb96 fix loading screen on login 2018-06-13 16:09:47 +08:00
Jack Goh 87442520a9 Fix test 
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking

# Conflicts:
#	app/Http/Controllers/BookingController.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php
 2018-06-13 15:57:08 +08:00
Jack Goh 84019bace1 ignore some vendorfiles 2018-06-13 14:44:41 +08:00
Jack Goh 90fcbcda73 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/booking 
# Conflicts:
#	app/Http/Controllers/Auth/ResetPasswordController.php
#	vendor/composer/autoload_classmap.php
#	vendor/composer/autoload_static.php
 2018-06-13 14:43:30 +08:00
Jack Goh d71fff0b9d Merge branch 'arief/user-frontend' into 'master' 
Arief/user frontend

See merge request CIEFWorldwideSdnBhd/exchange!11
 2018-06-12 08:31:33 +00:00
Mohd Arief 31813d627e Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into arief/user-frontend 2018-06-12 12:08:02 +08:00
Mohd Arief ec4d72c316 solve merge conflict 2018-06-12 12:05:07 +08:00
Jack Goh bdb6ebcb2f rollback readme 2018-06-12 09:48:11 +08:00
Jack Goh dac3e600db Update readme.md 2018-06-12 01:47:30 +00:00
Jack Goh a3cb5344ee updated readme 2018-06-12 09:46:42 +08:00
Mohd Arief a2262ee3c9 Update loading features to login page 2018-06-11 16:29:30 +08:00