5df307a165
make all test pass
...
updated seeder to be informative
fix seeder error on test
2018-08-01 15:30:19 +08:00
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
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
563c0d42d7
Update UI and migration,seeder for notification.
2018-07-24 17:02:45 +08:00
01fa0d07c3
fix active bank error
2018-07-22 18:28:45 +08:00
621fcc09e8
update seed for malaysia bank
2018-07-22 18:25:06 +08:00
81bf3ac585
add migration for notification. update booking confirmation
2018-07-21 14:15:42 +08:00
73c36dd8e3
Add setting for taxrate and billingcharge
2018-07-20 18:47:19 +08:00
1c9a9aca20
missing change beneficiaries to beneficiary in seeder
2018-07-13 18:31:29 +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
766316572c
fix seed contraints error
2018-07-08 11:50:36 +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
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
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
3752de2347
Add setting malaysia bank seeder
2018-07-06 14:07:07 +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
d5c7597307
added back name field to user table
...
fixed unable to login issue
2018-07-05 13:27:38 +08:00
c964e702a3
fix register page submit button. Check duplicated user register. Fix typo in register page.Add Marking seeder.
2018-07-02 22:44:41 +08:00
eec356f22d
fix wrong timeout
...
fix seeder info to newer info
2018-06-30 10:29:03 +08:00
0cf92b9936
added confirmSupplier booking
...
removed droptable due to database contraints issue
fixed rename booking foreight key in po table issue
added supplierstable seeder
updated supplierreport frontend
updated upload po frontend
2018-06-28 14:46:30 +08:00
c59aac1e4d
Merge branch 'feature/admin-home-frontend' into 'master'
...
Feature/admin home frontend
See merge request CIEFWorldwideSdnBhd/exchange!34
2018-06-27 01:36:22 +00:00
fdcaa31ffe
Add upload file maxsize checking in booking controller
2018-06-26 21:39:24 +08:00
2023050218
fix conflict
2018-06-26 14:44:48 +08:00
66b0c14f5e
Merge branch 'feature/admin-home-frontend' of gitlab.com:CIEFWorldwideSdnBhd/exchange into feature/admin-home-frontend
...
# Conflicts:
# app/Http/Controllers/BookingController.php
# database/seeds/DatabaseSeeder.php
# resources/assets/js/pages/admin/booking/verification.vue
2018-06-26 14:43:53 +08:00
f31f39caec
Add seeder and test for setting_credit
2018-06-26 11:47:48 +08:00
ffe1023bba
added credit limit seeder, it causes error when creating booking
2018-06-25 17:48:51 +08:00
2783e874bf
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into arief/booking
...
# Conflicts:
# database/seeds/DatabaseSeeder.php
2018-05-19 13:03:09 +08:00
3a9b949245
changed ordertest to bookingtest
...
updated databaseseeder to use class
updated booking seeder
2018-05-19 12:59:28 +08:00
315ed64520
added booking seeder
...
updated booking controller
added test for booking
2018-05-19 12:33:48 +08:00
d23d1defda
added user role seeder
...
updated user seeder for better memorization name
2018-05-19 10:54:14 +08:00
18d2ba4543
input data inside database using seeder
2018-05-17 15:13:29 +08:00
204af7cf5e
merge master
2018-05-15 12:35:52 +08:00
254077476e
edit the unit test
2018-05-15 11:18:06 +08:00
8da0cbceec
added seeder
...
added user to return role
2018-05-07 17:38:31 +08:00
3373524bc1
added entrust role based permission
2018-05-07 16:25:42 +08:00
cd217f9db8
init
2018-04-20 14:03:37 +08:00
Jack Goh
weiweitoo
jack
Mohd Arief