Commit Graph

160 Commits

Author SHA1 Message Date
glovetleong ae392dd052 debtor 2022-02-21 08:57:39 +08:00
omair saleh 33fff4189f Merge remote-tracking branch 'origin/development' into development 2022-02-17 20:00:44 +08:00
omair saleh 99a3a11267 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
#	routes/web.php
2022-02-17 20:00:29 +08:00
edmondlang 61eda2291a add back missing codes from - update payment and billings documents 2022-02-15 23:56:34 +08:00
omair saleh a6038a47ba fix Supplier delivery order 2022-02-13 15:36:16 +08:00
omair saleh 2cfeea79cc fix Supplier delivery order 2022-02-13 14:54:07 +08:00
omair saleh 1585dcfa5a clean up wallet 2022-02-10 10:28:26 +08:00
omair saleh 799829f58d wallet batch polishing 2022-02-07 13:10:15 +08:00
omair saleh 3459667f76 wallet batch polishing 2022-02-06 21:51:57 +08:00
edmondlang c52621c405 Merge branch 'wallet-ui' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-up-with-api
# Conflicts:
#	resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
#	routes/web.php
2022-02-05 21:39:31 +08:00
edmondlang a5c96f4e89 implement api wallets for customer 2022-02-05 18:02:36 +08:00
edmondlang e3e4b490b0 Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui
# Conflicts:
#	resources/views/partials/header.blade.php
#	routes/web.php
2022-02-04 22:22:07 +08:00
omair saleh ffefea75c0 fix duplicated bill plz problem 2022-01-22 14:00:13 +08:00
omair saleh ec4ef36cce fix duplicated bill plz problem 2022-01-22 13:59:55 +08:00
edmondlang 9cf30d559e wallets ui 2022-01-16 22:45:36 +08:00
edmondlang 0a0da91c21 update wallet-ui 2022-01-16 20:33:55 +08:00
omair saleh ce885693e1 export random products to excel 2022-01-14 19:32:39 +08:00
edmondlang 0579be05d8 wallet updates 2022-01-10 00:33:35 +08:00
omair saleh 5332bace52 1688 data 2022-01-03 18:23:03 +08:00
omair saleh 4f405fdec0 1688 data 2022-01-03 18:18:03 +08:00
omair saleh 7e3ff2b7cd 1688 data 2022-01-03 18:17:07 +08:00
omair saleh d9e9c5029a 1688 data 2022-01-03 18:14:16 +08:00
omair saleh a099164524 1688 data 2022-01-03 18:00:49 +08:00
omair saleh 22b4cf2f14 1688 data 2022-01-03 14:39:41 +08:00
omair saleh 2ffd59fd17 1688 data 2022-01-03 14:35:53 +08:00
omair saleh 6b21e162b6 Merge branch 'development' into 'master'
base_portal.blade

See merge request CIEFWorldwideSdnBhd/exchange-2.0!70
2021-12-23 03:56:10 +00:00
omair saleh 5033bda8cd fix transfers list 2021-12-22 16:00:15 +08:00
glovetleong 44ed2f55e9 delete transaction 2021-12-22 14:22:38 +08:00
omair saleh 11fb3a6913 add redirect web route back 2021-12-21 20:54:36 +08:00
omair saleh 5eee532ff7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Http/Resources/TransactionResource.php
#	resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
#	routes/web.php
2021-12-21 19:42:28 +08:00
edmondlang 19588f4cba Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui
# Conflicts:
#	app/Http/Resources/TransactionResource.php
#	routes/web.php
2021-12-16 20:22:15 +08:00
edmondlang fb4d17b46f rename performa to proforma 2021-11-28 21:10:46 +08:00
edmondlang bcbb3f53f6 create proforma invoice transaction 2021-11-28 20:51:30 +08:00
omair saleh f8f8833994 currency orders page 2021-11-28 13:40:11 +08:00
omair saleh f4ae3c3cf2 currency orders page 2021-11-28 13:00:56 +08:00
edmondlang 2153774cde Merge branch 'change-booking-price' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2021-11-25 15:20:34 +08:00
omair saleh 7d9fed43eb fix route namespace 2021-11-21 23:48:06 +08:00
omair saleh 49c4362ba1 fix payment gateway & add regenerate invoices button 2021-11-21 23:30:59 +08:00
omair saleh 419f3ca88b Merge branch 'regenerate-invoice' into 'development'
regenerate booking invoice

See merge request CIEFWorldwideSdnBhd/exchange-2.0!65
2021-11-19 05:52:54 +00:00
omair saleh d2ad5c3d9a download do's for vt 2021-11-11 16:30:25 +08:00
omair saleh 1a3566e62a download do's for vt 2021-11-11 16:25:10 +08:00
omair saleh 617afb4379 download do's for vt 2021-11-11 16:24:45 +08:00
omair saleh e0ffcdb0e4 download do's for vt 2021-11-11 16:23:27 +08:00
ahmedsophyudden b4c1a2e333 Merge branch 'task/EXC-353' into development 2021-11-08 16:15:05 +08:00
ahmedsophyudden 39a8ac83b2 Merge branch 'online-payment-billplz-integration' into development 2021-11-08 09:43:09 +08:00
edmondlang 87614bdcec tidy up change booking price 2021-11-05 12:24:00 +08:00
glovetleong c907903244 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into task/EXC-353
# Conflicts:
#	app/Models/Company.php
2021-10-25 21:43:55 +08:00
glovetleong 30884201bd regenerate booking invoice 2021-10-19 21:51:47 +08:00
omair saleh d7bbb6a65e separate customers list in a new page 2021-10-09 13:44:33 +08:00
Fairuz 004e56cd2e Wallet approval / reject 2021-10-08 21:56:37 +08:00