293dfd6cd2
temporary commented out rate and transfer amount from supplier booking
2018-07-25 22:33:14 +08:00
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
017f70391e
fix admin completed order function not found error
2018-07-22 18:30:23 +08:00
46b349b189
added order_no and payment_for in booking controller store function
2018-07-22 18:09:28 +08:00
1d23e913d5
added order_no and patment_for to calculation controller function
2018-07-22 15:42:48 +08:00
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
1b874d0800
Fix conflit
2018-07-21 01:43:10 +08:00
3e60ec8e86
fix conflit
2018-07-21 00:15:43 +08:00
c4962e4655
git pull origin master
2018-07-20 22:12:48 +08:00
65c65ef257
Fix calculation
2018-07-20 21:47:23 +08:00
21c13d3e60
change billingcharge rate and tax rate table to double. Modify Customer calculation table
2018-07-20 21:16:36 +08:00
73c36dd8e3
Add setting for taxrate and billingcharge
2018-07-20 18:47:19 +08:00
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
1cccefdb8a
Discussion Fixed
2018-07-20 17:42:27 +08:00
e2cf3fecdd
fix term1 no service charge
...
fix navbar extra </li>
2018-07-20 11:12:20 +08:00
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
a35c07a794
Add admin page 1. show error when upload wrong file in upload po and invoice
2018-07-18 14:35:05 +08:00
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
fb102df36c
Fixed Merge Conflicts
2018-07-16 19:32:56 +08:00
e868c99440
Added the track status thing
2018-07-16 19:26:09 +08:00
d29d3c49eb
Adding Completed Orders Link on Admin Nav Bar
2018-07-16 19:15:01 +08:00
b21eaf4522
add new branch for booking flow for x2_chequeand x2_ba
2018-07-14 17:31:21 +08:00
d9dfe84c2e
rename beneficiaries tobeneficiary
2018-07-13 09:58:32 +08:00
39d5646155
dynamically show malaysia bank acc for booking step
2018-07-12 00:52:46 +08:00
d38d801638
Showing Completed Orders Task Done
2018-07-11 16:24:55 +08:00
28a6f43b0a
Showing Completed Orders To Admin Done Except Making Table Sortable
2018-07-10 18:08:59 +08:00
a35e4fd3c8
Showing Completed Orders To Admin
2018-07-10 15:32:22 +08:00
72a4f6645f
Added marking to admin home page
...
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking
# Please enter a commit message to explain why this merge is necessary,
# especially if it merges an updated upstream into a topic branch.
#
# Lines starting with '#' will be ignored, and an empty message aborts
# the commit.
2018-07-08 10:53:24 +08:00
538adc7366
added marking to bookings api
...
changed hard coded marking in booking details to dynamic for frontend
2018-07-07 16:15:32 +08:00
71e11fa034
added marking to admin booking index
...
hide roles in user model
hide user from booking model
2018-07-07 12:12:27 +08:00
59fc234ea0
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
2018-07-07 12:06:21 +08:00
2a8f5c0b3c
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking
2018-07-07 10:32:43 +08:00
77a2168832
fix update bug at activebankcontroller when empty record
2018-07-07 01:57:30 +08:00
bddef7d16f
make acc_no unique in malaysiabank and china bank. integrate active bank page. add seeder for beneficiares and active bank. add table setting_active_bank
2018-07-07 01:52:35 +08:00
84fc15adce
fix update and delete at settingmalaysiacontroller
2018-07-06 13:22:44 +08:00
36917cbd60
add malaysia bank page and integrate it with backend
2018-07-06 13:12:18 +08:00
38515c055b
Add setting malaysia bank table and controller
2018-07-05 19:10:17 +08:00
503e3aec5b
added marking to user table
...
added marking on registration
2018-07-05 17:56:49 +08:00
0180694d72
gitignored autoload_classmap
...
removed setting-credit for post, delete and get one routes
completed admin credit limit and time out update feature
fixed drop down rate issue
fixed the controller show and update issue
2018-07-05 15:47:19 +08:00
d5c7597307
added back name field to user table
...
fixed unable to login issue
2018-07-05 13:27:38 +08:00
560035be09
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
...
# Conflicts:
# package-lock.json
# package.json
# resources/assets/js/pages/settings/admin-supplier.vue
# vendor/composer/autoload_static.php
2018-07-05 11:52:38 +08:00
340381d0b3
half fix registration page
2018-07-05 10:09:30 +08:00
ab3cba389d
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/suppliersetting
2018-07-04 17:31:21 +08:00
55455b89d7
integrate delete supplier
2018-07-04 14:35:42 +08:00
232baf76cd
fix validation error
2018-07-04 12:01:32 +08:00
54f6722472
fix npm issue
...
added name validation to register controller
fixed register frontend validator issue
2018-07-04 11:54:28 +08:00
8798c83b97
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/registerpage
...
# Conflicts:
# package-lock.json
# package.json
# vendor/composer/autoload_static.php
# yarn.lock
2018-07-04 11:17:44 +08:00
35dfa58a14
Merge branch 'fix/bug' into 'master'
...
Fix/bug
See merge request CIEFWorldwideSdnBhd/exchange!55
2018-07-04 03:13:33 +00:00
29576dcc60
comment name column in oauthctroller
2018-07-03 23:08:34 +08:00
dae26ccb83
add validation of registeration form
2018-07-03 22:27:26 +08:00
Jack Goh
weiweitoo
Mouhamed Lamine