Commit Graph

128 Commits

Author SHA1 Message Date
edmondlang 6b97a58ab1 Merge branch 'export-booking-analytic' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-05-01 16:52:18 +08:00
edmondlang 960b46daea export booking analytic 2022-05-01 16:49:57 +08:00
Leong Chee Siong 1d640e5d03 Merge branch 'debtor' into 'development'
no file error

See merge request CIEFWorldwideSdnBhd/exchange-2.0!106
2022-04-29 01:11:14 +00:00
glovetleong 7756726ea8 no file error 2022-04-29 09:09:58 +08:00
edmondlang e345b019cd Merge branch 'export-booking-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	routes/web.php
2022-04-26 21:55:42 +08:00
edmondlang 6a546ea80f export booking transaction 2022-04-26 19:45:30 +08:00
ahmedsophyudden 63ad9abc3c Update supplier's status (front-end & back-end) 2022-04-23 06:52:23 +08:00
edmondlang ff1a8bda57 Merge branch 'delete-group-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:04:16 +08:00
edmondlang f28f6f003a Merge branch 'notification-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:04:04 +08:00
edmondlang 5795c4b499 create and intergrate api for update group transaction 2022-04-18 00:02:19 +08:00
edmondlang 29b1f87966 move notification API and UI from shipping portal 2022-04-16 23:53:12 +08:00
edmondlang 5647957e9f delete group transaction 2022-04-10 21:31:20 +08:00
edmondlang 8b3b97167f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
2022-04-08 20:16:51 +08:00
omair saleh e34d72f128 Merge branch 'wallet-stats-ui' into 'development'
Wallet stats ui

See merge request CIEFWorldwideSdnBhd/exchange-2.0!99
2022-04-06 05:32:06 +00:00
omair saleh bfd3d87977 debug file type 2022-04-04 18:15:17 +08:00
omair saleh 72e645c426 add supplier filter to exchange 2022-03-31 13:09:02 +08:00
omair saleh 2795e5f107 update debtor export format 2022-03-22 14:06:38 +08:00
edmondlang ce60f96eb6 create API and update wallet component statistics 2022-03-20 23:50:54 +08:00
omair saleh edc8d3b3aa update debtors import 2022-03-19 16:00:18 +08:00
omair saleh 646de8b66c update debtors import 2022-03-19 15:41:16 +08:00
omair saleh b93a7163f1 update debtors import 2022-03-19 15:40:59 +08:00
omair saleh 35ee839d12 update debtors import 2022-03-19 15:28:12 +08:00
omair saleh e159537ff9 update debtors import 2022-03-19 15:27:21 +08:00
omair saleh d70fc0cdb1 update debtors import 2022-03-19 15:26:27 +08:00
omair saleh 9c86bfcbbf update debtors import 2022-03-19 15:23:48 +08:00
omair saleh 739b9af57d update debtors import 2022-03-19 15:19:13 +08:00
omair saleh a38fb04a01 update debtors import 2022-03-19 14:11:39 +08:00
omair saleh f9b055e56d update debtors import 2022-03-18 18:02:16 +08:00
edmondlang 7c362c93c3 admin suspend user's bank account - UI & API 2022-03-14 11:55:49 +08:00
omair saleh a72780573d update export documents 2022-03-13 12:32:32 +08:00
omair saleh 481426bec9 clean up development 2022-03-12 17:02:21 +08:00
edmondlang 36d6d03836 Create Mock Up White Form - ui and API 2022-03-11 22:35:59 +08:00
Leong Chee Siong cc8a4b14ba Merge branch 'debtor' into 'development'
Debtor

See merge request CIEFWorldwideSdnBhd/exchange-2.0!90
2022-03-03 02:07:27 +00:00
glovetleong a4f442d681 payment name 2022-03-03 10:05:37 +08:00
glovetleong 62e2e3be2d transaction invoice export 2022-03-02 23:27:46 +08:00
glovetleong 37ac87a8de Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into debtor 2022-03-02 22:48:30 +08:00
omair saleh 1858faef0d Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	app/Classes/Modules/Wallets/ControllersLogic/CreditWalletLogic.php
2022-03-02 21:01:01 +08:00
omair saleh 5da012330b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-02 20:58:33 +08:00
omair saleh 9fa522f105 fix wallet bug 2022-03-02 11:43:20 +08:00
omair saleh 2685d11a07 fix wallet bug 2022-03-02 11:41:34 +08:00
Leong Chee Siong 234e2a8c5d Merge branch 'debtor' into 'development'
Debtor

See merge request CIEFWorldwideSdnBhd/exchange-2.0!87
2022-03-02 01:57:23 +00:00
glovetleong 6d624d3196 export and import 2022-03-02 09:54:12 +08:00
omair saleh 70a2979d2d download billing documents 2022-03-02 04:31:51 +08:00
omair saleh abc449dd83 download billing documents 2022-03-02 04:27:58 +08:00
omair saleh be6ebdfde8 download billing documents 2022-03-02 03:50:47 +08:00
omair saleh 1446a8b34e download billing documents 2022-03-02 03:47:21 +08:00
ahmedsophyudden 016de0cd47 Create update refund status api and credit wallet processor 2022-03-01 16:04:38 +08:00
ahmedsophyudden e6ecf74379 Merge branch 'add-transaction-service-charge' into development 2022-02-28 22:50:13 +08:00
ahmedsophyudden af3ff46a20 Grab service charge from setting for calculate supplier transaction 2022-02-28 22:40:16 +08:00
ahmedsophyudden 5eb24878f9 Create download api for booking document (invoice, purchase order, deliver order, supplier deliver order) 2022-02-27 23:09:12 +08:00