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
752 Commits 33 Branches 0 Tags
fix/forgot-password
Commit Graph

263 Commits

Author SHA1 Message Date
Jack Goh 9b78b8c669 temporary fix bank_branch not null 2018-08-09 15:04:03 +08:00
Jack Goh 114aab975b fix forgot-password 2018-08-09 14:37:47 +08:00
Jack Goh 594c6a74fe fix admin x2 status track 2018-08-08 17:11:08 +08:00
Jack Goh 06bacfcaf9 fixed x2 status for user side 2018-08-08 16:31:35 +08:00
Jack Goh f5809e8c8b fix billing charge for x2 to 0 2018-08-08 10:19:21 +08:00
Jack Goh b0557c220c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/gitlabci 
# Conflicts:
#	public/mix-manifest.json
 2018-08-07 12:44:13 +08:00
Jack Goh 0a672eda6e change test db connection to mysql 2018-08-02 12:22:02 +08:00
Jack Goh beb0cb8cd4 fix middleware not found 2018-08-01 16:25:28 +08:00
Jack Goh f789127c57 added bank branch to supplier booking report 2018-07-31 17:01:40 +08:00
Jack Goh 3f37b50c5c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/gitlabci 
# Conflicts:
#	app/Http/Controllers/BookingController.php
#	app/Http/Kernel.php
#	composer.lock
 2018-07-31 16:30:26 +08:00
Jack Goh cc2539d44c update max upload file size to 10mb 2018-07-30 14:48:48 +08:00
Jack Goh 1d3b8c2af7 temporary fix register page 2018-07-30 13:49:35 +08:00
Jack Goh 727374abb8 added back rate in supplierbooking 
changed back to 9000 in caddy server
 2018-07-27 11:02:06 +08:00
Jack Goh 438d9fa602 temporary added po format link in upload po page 
added back costing rate in supplier booking page
 2018-07-27 10:53:20 +08:00
Jack Goh f6cfd9a188 updat the login session to be 12 hours 
fix status description not showing
update user booking confirmation china beneficiary acc into one row
 2018-07-27 10:41:57 +08:00
weiweitoo 91c37778dc add load more pagination of notificaiton 2018-07-26 22:58:22 +08:00
Jack Goh fcfecb83d3 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug 
# Conflicts:
#	app/Http/Controllers/BookingController.php
#	resources/assets/js/pages/home.vue
 2018-07-26 15:50:49 +08:00
Jack Goh fa049bfa7e fixed incorrect calculation when storing booking 2018-07-26 15:15:18 +08:00
Jack Goh 665a4faa91 fix beneficiary name and acc number display on booking confirmation 2018-07-26 14:47:48 +08:00
Jack Goh a06f57712d fix user booking calculation 2018-07-26 12:26:34 +08:00
Jack Goh 4ae97df8c5 fixed term1 fixed charge bug 2018-07-26 11:42:17 +08:00
Jack Goh 8f7a4ee6b6 changed get active bank from backend instead of frontend 2018-07-26 11:22:03 +08:00
weiweitoo 2f63c27e67 Uodate store calculation 2018-07-26 11:06:28 +08:00
weiweitoo 74b84acf36 add time_interval feature in notification 2018-07-26 10:58:56 +08:00
Jack Goh 45e8ce8620 updated supplier calculation with latest format 2018-07-26 10:56:28 +08:00
Jack Goh 293dfd6cd2 temporary commented out rate and transfer amount from supplier booking 2018-07-25 22:33:14 +08:00
Jack Goh 4e0f1dbe0a removed vee-validate which causes cief bank details not showing in user upload bank slip 
added exception if userbankslip not save show error
added tax rate to supplier booking
added order number and payment for to booking seeder
 2018-07-25 16:22:53 +08:00
weiweitoo d9a818c05a Fix notification frontend 2018-07-25 15:02:43 +08:00
weiweitoo 336e5e4ed3 create notification for each step done. Make unread message bold. 2018-07-25 10:05:18 +08:00
weiweitoo ad5a9970ea git pull origin master 2018-07-24 17:05:38 +08:00
weiweitoo 563c0d42d7 Update UI and migration,seeder for notification. 2018-07-24 17:02:45 +08:00
lonetrinity 74e602836b fix pagination for admin booking table 2018-07-24 14:10:31 +08:00
Jack Goh 017f70391e fix admin completed order function not found error 2018-07-22 18:30:23 +08:00
Jack Goh 46b349b189 added order_no and payment_for in booking controller store function 2018-07-22 18:09:28 +08:00
Jack Goh 1d23e913d5 added order_no and patment_for to calculation controller function 2018-07-22 15:42:48 +08:00
Jack Goh 7229d71109 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/bug 
# Conflicts:
#	resources/assets/js/components/LocaleDropdown.vue
#	resources/assets/js/pages/home.vue
 2018-07-22 15:39:35 +08:00
weiweitoo 81bf3ac585 add migration for notification. update booking confirmation 2018-07-21 14:15:42 +08:00
weiweitoo 1b874d0800 Fix conflit 2018-07-21 01:43:10 +08:00
weiweitoo 3e60ec8e86 fix conflit 2018-07-21 00:15:43 +08:00
weiweitoo c4962e4655 git pull origin master 2018-07-20 22:12:48 +08:00
weiweitoo 65c65ef257 Fix calculation 2018-07-20 21:47:23 +08:00
weiweitoo 21c13d3e60 change billingcharge rate and tax rate table to double. Modify Customer calculation table 2018-07-20 21:16:36 +08:00
weiweitoo 73c36dd8e3 Add setting for taxrate and billingcharge 2018-07-20 18:47:19 +08:00
Jack Goh 1497c50da5 changed payment voucher in supplier booking report to Ref No. 
added dynamic marking to supplier booking
 2018-07-20 17:45:39 +08:00
Mouhamed Lamine 1cccefdb8a Discussion Fixed 2018-07-20 17:42:27 +08:00
Jack Goh e2cf3fecdd fix term1 no service charge 
fix navbar extra </li>
 2018-07-20 11:12:20 +08:00
weiweitoo 16205404e1 Fix upload issue. allow po to upload multiple and display multiple. Display download link when the uploaded file is not image 2018-07-19 17:45:25 +08:00
weiweitoo a35c07a794 Add admin page 1. show error when upload wrong file in upload po and invoice 2018-07-18 14:35:05 +08:00
weiweitoo 8c31bcc420 remove date option in supplier report. upload china bankslip detail should be optional. make accept for uploadpurchaseorder - frontend only 2018-07-17 16:31:37 +08:00
Mouhamed Lamine fb102df36c Fixed Merge Conflicts 2018-07-16 19:32:56 +08:00