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
45e8ce8620
updated supplier calculation with latest format
2018-07-26 10:56:28 +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
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
81bf3ac585
add migration for notification. update booking confirmation
2018-07-21 14:15:42 +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
32278095bf
beautified user home page
...
added order number and payment for field in user booking
2018-07-20 18:04:30 +08:00
20cc501f0e
make beneficiary nullable
2018-07-20 15:08:48 +08:00
4ab9a0a640
make booking auto increment start from 2000
2018-07-18 17:50:20 +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
1bc2ab91c0
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into too/fixsettingvalidationbug
2018-07-11 01:43:42 +08:00
edbd8887c5
fix bug for validation. Remove nullable for malaysia bank table
2018-07-11 01:39:35 +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
2a8f5c0b3c
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into fix/marking
2018-07-07 10:32:43 +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
503e3aec5b
added marking to user table
...
added marking on registration
2018-07-05 17:56:49 +08:00
07c4f9ed92
fixed register issue
2018-07-05 13:37:00 +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
0f9a9581fd
Removing gitignore mess
2018-07-04 15:14:55 +08:00
43306d8c36
Uploaded Images made responsive
2018-07-04 15:06:44 +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
9ae80ed013
fix migration down database integrity contraints
2018-07-04 10:56:43 +08:00
3d9e7054d7
Final changes
2018-07-03 18:14:45 +08:00
4da5cfd7be
added relationship between marking and user
...
added billing_amount and salestax_amount to supplierbooking table
2018-07-03 09:58:06 +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
647c42a30e
renamed booking supplier book_id to booking_id
...
updated bookingSupplier to supplierBooking
updated get supplier api in supplier report
added download button to download report
2018-07-02 21:26:12 +08:00
2c2c3928e9
remove username from controller and migration
2018-07-02 10:31:42 +08:00
eec356f22d
fix wrong timeout
...
fix seeder info to newer info
2018-06-30 10:29:03 +08:00
536c67bbc6
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange into integration/upload-invoice
...
# Conflicts:
# database/migrations/2018_06_28_011717_rename_booking_foreignkey_in_po_table.php
# database/seeds/DatabaseSeeder.php
2018-06-28 15:55:58 +08:00
265887f0d7
Merge branch 'integration/confirmation-n-transfer' into 'master'
...
update confirmation and transfer page
See merge request CIEFWorldwideSdnBhd/exchange!42
2018-06-28 07:51:03 +00:00
651f762237
update confirmation and transfer page
...
- update booking controller
2018-06-28 15:40:27 +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
7fc0696099
fix conflit
2018-06-28 12:45:02 +08:00
2b4ddadfcb
rename book_id in po table to booking_id to perform ORM relantionship
...
added relationship between booking and po
updated settings shows for different role
added function to display po for admin
2018-06-28 10:06:26 +08:00
206a637a88
Add test for setting supplier
2018-06-27 23:34:35 +08:00
cea2857d0f
added booking foreign key to china bankslip
...
updated upload china bankslip routes
2018-06-27 16:16:48 +08:00
Jack Goh
weiweitoo
Mouhamed Lamine
Mohd Arief