Commit Graph

Select branches

Hide Pull Requests

Lingges/Fix/uploadPictureInStep2User

Lingges/feature/addCancelBooking

Lingges/fixpoFormat

deployment/staging

feature/email-verification

feature/notification

fix/bank-branch

fix/billing-charge

fix/bookingtable-bankname

fix/bug

fix/download-report

fix/forgot-password

fix/importer-notification

fix/notification

fix/register-error-message

fix/slice-error

fix/uploadBankSlip

fix/uploadPicture

fix/user-responsive-page

fix/x2-status

fixAdminHomeBug

fixBugBankinSlip

frontend/input-validation

frontend/making-every-admin-page-responsive

master

too/gitlabci

too/gitlabciTest

too/supplierbookingreport

Mono Color

• aaf0decd97 removed amount from uploadpo added confirmpo after user upload their po completed uploadpo integration Jack Goh 2018-06-21 15:48:24 +08:00
• c4e85d0e6d Merge branch 'bug/bookinglist-timeout-countdown' into 'master' Jack Goh 2018-06-21 07:05:48 +00:00
• 1e6d38646e update ignore file Jack Goh 2018-06-21 15:05:16 +08:00
• de7161369c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into bug/bookinglist-timeout-countdown Jack Goh 2018-06-21 14:48:48 +08:00
• 46873c7107 added handlecountdowned function Jack Goh 2018-06-21 14:48:17 +08:00
• b405f05369 Merge branch 'too/uploadinvoice' into 'master' Jack Goh 2018-06-21 06:40:54 +00:00
• 453852c7ea rename image_url to image_path in user_bank_slip,invoice,purchase_order Too 2018-06-21 14:36:33 +08:00
• 3c263b56ea fix 404 not found for upload user bankslip added display term on booking table Jack Goh 2018-06-21 14:31:53 +08:00
• de45782ae3 fix conflit with master Too 2018-06-21 13:26:18 +08:00
• db7e30ea95 add upload invoice and test Too 2018-06-21 13:15:36 +08:00
• 23b024c2fb fixed status description not found removed timeout on home page added timeout handling in upload user bankslip Jack Goh 2018-06-21 12:45:05 +08:00
• 5a4c4b14ee updated create booking status to 2 Jack Goh 2018-06-21 10:58:47 +08:00
• 6bbf271a36 added status tracking in booking Jack Goh 2018-06-21 10:58:16 +08:00
• d06b8ac359 added status column to booking table Jack Goh 2018-06-21 10:49:45 +08:00
• a650879977 completed list booking TBD implement status feature Jack Goh 2018-06-21 10:43:52 +08:00
• 7eb8c7bafc create booking with rate Jack Goh 2018-06-20 22:55:29 +08:00
• 385372e3dd added rate to booking table Jack Goh 2018-06-20 22:54:31 +08:00
• a30fd2a0b1 added booking list controller Jack Goh 2018-06-20 22:21:45 +08:00
• bc637adcab Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange Jack Goh 2018-06-20 18:41:31 +08:00
• 498fafd502 added booking lists controller and routes Jack Goh 2018-06-20 18:39:55 +08:00
• c3558eb39b Merge branch 'too/registerwithmarking' into 'master' Jack Goh 2018-06-20 09:37:21 +00:00
• 93d866f432 Revert back changes during debug. Remove Auto login after register. Too 2018-06-20 17:30:53 +08:00
• 3245497378 fix conflict Nazri Hamzah 2018-06-20 17:19:58 +08:00
• a7970e2d72 fix conflict Nazri Hamzah 2018-06-20 17:17:22 +08:00
• e6d58004bc fix error response code Too 2018-06-20 17:04:50 +08:00
• e3c104f902 Done checking marking before register user Too 2018-06-20 16:57:47 +08:00
• 3959c8c8b2 pull from master Too 2018-06-20 15:56:08 +08:00
• 6e51b18058 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerwithmarking Too 2018-06-20 15:54:36 +08:00
• a2dad37758 Check marking before create user Too 2018-06-20 15:43:04 +08:00
• 32bf2f4375 fix discussion 2 Nazri Hamzah 2018-06-20 12:15:33 +08:00
• 8fa4f15818 WIP: fix discussion Nazri Hamzah 2018-06-20 12:08:15 +08:00
• 40d6eb7ead Merge branch 'too/marking' into 'master' Jack Goh 2018-06-20 00:50:07 +00:00
• 01f6c78619 Merge branch 'too/adminmiddleware' into 'master' Jack Goh 2018-06-20 00:48:46 +00:00
• b1843c0b9b Revert back unnessary changes during debug Too 2018-06-20 02:04:05 +08:00
• 3f2d9fbfb8 Add controller and table for marking Too 2018-06-20 00:38:32 +08:00
• 95f4f25dd3 Add test for settingcredit and rate Too 2018-06-19 18:56:31 +08:00
• 118ce0f819 fix tracking status number Jack Goh 2018-06-19 17:36:39 +08:00
• f9e94cc148 added loading for upload user bankinslip Jack Goh 2018-06-19 17:33:17 +08:00
• a5633b7754 supplier booking Nazri Hamzah 2018-06-19 17:26:37 +08:00
• 77f861472a updated dynamic switch pages on dummny table data Jack Goh 2018-06-19 17:10:34 +08:00
• 1b39ee8bda Add admin auth middleware Too 2018-06-19 16:46:32 +08:00
• 5cb3d6a33d Merge branch 'too/rejectuserbankslip' into 'master' Jack Goh 2018-06-19 06:21:38 +00:00
• 6a025a6bac Fix conflit of variable name with master branch. Too 2018-06-19 13:32:09 +08:00
• a019ae2616 Fix conflit Too 2018-06-19 02:52:21 +08:00
• 64d8ffed7c Fix variable name Too 2018-06-19 00:15:28 +08:00
• 7398ce73d6 updated timeout from 60 seconds to 10 minutes Jack Goh 2018-06-18 22:51:33 +08:00
• 44563624ee Merge branch 'fix/booking-integration' into 'master' Jack Goh 2018-06-18 14:49:29 +00:00
• e7c63bb4e9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration Jack Goh 2018-06-18 22:42:16 +08:00
• cc881cc5c7 added updatebankslip test Jack Goh 2018-06-18 22:39:15 +08:00
• 4a4e147072 fix running routes:cache error fix UserBankSlip class not found fix undefined book_id added loading when confirm booking added confirm booking success redirect with correct page added error handling for upload user bankslip completed upload user bankslip flow Jack Goh 2018-06-18 22:37:33 +08:00
• 012fef948e Reject user bank slip with reason. Add migration for userbankslip. Too 2018-06-18 18:57:27 +08:00
• c303fb0c5f added update transfer amount function changed bankslip_url to file for upload user bankslip Jack Goh 2018-06-18 18:39:30 +08:00
• 50492ef1a3 Merge branch 'too/verifybankslip' into 'master' Jack Goh 2018-06-18 09:47:14 +00:00
• 97062480d5 added get one booking function in controller update routes with booking id pramas fixed not found routes fixed count down with real data moved bookings routes into autenticated route Jack Goh 2018-06-18 17:34:20 +08:00
• 39c30065f1 Approved user bankslip Too 2018-06-18 14:05:08 +08:00
• f201f33f28 update dockerfile with gd to fix test error update create booking controller to accept rmb to myr only Jack Goh 2018-06-18 12:10:58 +08:00
• 83c05e1064 update get calculation rate Jack Goh 2018-06-18 11:18:21 +08:00
• d10837c068 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration Jack Goh 2018-06-18 11:16:38 +08:00
• 2aaa11e98c removed some comments, beautified the file Jack Goh 2018-06-18 11:14:12 +08:00
• 857b9c5fde update get caluclation for booking Jack Goh 2018-06-18 11:00:00 +08:00
• 3d7016281b fix loading button after get calculation Jack Goh 2018-06-18 10:26:29 +08:00
• b3f94ecc89 Merge branch 'too/cancelbooking' into 'master' Jack Goh 2018-06-16 09:40:31 +00:00
• 8f431ed090 New Route for booking cancel. Fix bookingTest hardcoded link. Add Cancel function to bookingcontroller. Get Latest Rate for bookingController@store. Too 2018-06-16 14:40:39 +08:00
• 5eb4f46275 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/booking-integration Jack Goh 2018-06-15 23:21:37 +08:00
• 7299685a40 update calculation function in booking controller Jack Goh 2018-06-15 23:21:30 +08:00
• e3fb93fbae Merge branch 'too/userbankslip' into 'master' Jack Goh 2018-06-15 15:18:03 +00:00
• 82b2c0104e Remove unused bookingtest.php Too 2018-06-15 21:13:11 +08:00
• a449d4f30c TBD calculation feature updated bookingconfirmationTable frontend Jack Goh 2018-06-15 18:54:03 +08:00
• 67b966f40f add file checking in bookingtest. optimize some code. Too 2018-06-15 18:21:12 +08:00
• 3060aa1c1f Fix wrong variable name. Add auth check before upload bankslip and PO. Optimize some code stlye Too 2018-06-15 17:13:53 +08:00
• eeaffe9018 remove alert on form submission Jack Goh 2018-06-15 11:39:53 +08:00
• 031cf4897f added validation for input bank details Jack Goh 2018-06-15 11:07:52 +08:00
• 0ca14574d4 fix conflit Too 2018-06-14 23:49:27 +08:00
• fb944428a5 fix conflit Too 2018-06-14 23:46:39 +08:00
• 3b2b4617cc Fix conflit Too 2018-06-14 23:02:24 +08:00
• c5a509e7b1 Merge branch 'fix/booking-frontend' into 'master' Jack Goh 2018-06-14 14:02:11 +00:00
• 2c0b1a4a92 updated order complete title Jack Goh 2018-06-14 21:56:48 +08:00
• fdfc6aa278 updated copy right updated onclick image open new tab Jack Goh 2018-06-14 21:54:09 +08:00
• 5e0ce6319d updated complete order plage Jack Goh 2018-06-14 21:50:41 +08:00
• 6307381c0d added submit po button function Jack Goh 2018-06-14 21:36:26 +08:00
• 19d69adad2 added po complete page Jack Goh 2018-06-14 21:23:34 +08:00
• 1f5d2db2b8 completed transfer frontend completed upload po frontend Jack Goh 2018-06-14 18:54:00 +08:00
• ae0cbb9952 completed order confirmation page Jack Goh 2018-06-14 18:22:45 +08:00
• 062350cc60 recommit last commit Jack Goh 2018-06-14 17:39:12 +08:00
• f47e9408a1 changed "bookings" folder name to "booking" updated routes Jack Goh 2018-06-14 17:38:52 +08:00
• dc56029522 changed step two from "waiting payment" to "payment" added few empty page component updated confirmation routes Jack Goh 2018-06-14 17:35:37 +08:00
• 415f8bb437 updated dynamic progress status Jack Goh 2018-06-14 17:25:54 +08:00
• 9eed12bc3d added switch case for booking status TBD step 2-6 page beautified code from home Jack Goh 2018-06-14 16:25:34 +08:00
• 83dfca2ae1 fix conflit Too 2018-06-14 16:02:33 +08:00
• 053ea0e874 added transfer amount and exchange amount to upload user bank slip added complete steps for user added empty get booking status Jack Goh 2018-06-14 15:32:24 +08:00
• 5ce817cd33 remove duplicate getting banksli_url. add user bank slip into database in uploadbankslip. save image_url in uploadpurchaseorder Too 2018-06-14 15:08:00 +08:00
• 274ebe3490 added progress tracker Jack Goh 2018-06-14 11:56:22 +08:00
• 9ba6b2aba8 fix bookingconfirmation data Jack Goh 2018-06-14 11:35:45 +08:00
• 09a2fe36e8 make booking number and status clickable Jack Goh 2018-06-14 11:26:12 +08:00
• a2b58b6d10 updated table structure Jack Goh 2018-06-14 10:45:21 +08:00
• 5d1e7ffd7b added tooltips for X1 and X2 Jack Goh 2018-06-14 10:09:30 +08:00
• b867474445 updated link for upload later Jack Goh 2018-06-13 22:23:36 +08:00
• c0b9e446d5 changed upload to upload-user-bankslip Jack Goh 2018-06-13 22:17:01 +08:00
• fde70b744f fix login loading screen Jack Goh 2018-06-13 21:50:06 +08:00
• b622d81d94 added prevent user from book if amount is empty fixed some variable duplication added getcalculationvalue function Jack Goh 2018-06-13 18:27:36 +08:00