Commit Graph

583 Commits

Author SHA1 Message Date
edmondlang 22aa003777 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-05-13 23:04:57 +08:00
omair saleh 4b12ea3fc5 update po day limit notice 2022-05-11 13:25:54 +08:00
omair saleh 60936ffadf update po day limit notice 2022-05-11 13:15:06 +08:00
omair saleh 1526f36e92 remove raya announcement 2022-05-06 13:53:47 +08:00
omair saleh 06dd1efa24 remove raya announcement 2022-05-06 13:49:37 +08:00
edmondlang 134868029a Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Exports/Services/ExportsTransactions.php
2022-04-28 19:59:05 +08:00
omair saleh d21daa1a67 update signup page 2022-04-28 13:25:21 +08:00
omair saleh 83f030f0f6 update raya announcement 2022-04-27 12:58:10 +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 ef77463c06 export booking transaction ui 2022-04-26 21:52:38 +08:00
edmondlang 0940b94895 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-26 19:53:29 +08:00
edmondlang dcea71dbf4 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into export-booking-transaction 2022-04-26 19:46:29 +08:00
edmondlang 6a546ea80f export booking transaction 2022-04-26 19:45:30 +08:00
omair saleh 67615168f8 fix password reset redirect bug 2022-04-26 13:21:11 +08:00
omair saleh 8e10d68257 fix password reset redirect bug 2022-04-26 12:49:31 +08:00
omair saleh 4a15e022a7 fix password reset redirect bug 2022-04-26 12:49:17 +08:00
omair saleh 0f86a514b0 fix password reset redirect bug 2022-04-26 12:47:41 +08:00
omair saleh 95bf0a5873 fix password reset redirect bug 2022-04-26 12:42:37 +08:00
omair saleh 95c538e66b fix password reset redirect bug 2022-04-26 12:28:56 +08:00
omair saleh 2dddc2299f push crisp 2022-04-25 15:18:52 +08:00
omair saleh 474caac039 push crisp 2022-04-25 15:17:30 +08:00
omair saleh 8678ac7b5e push crisp 2022-04-25 15:14:50 +08:00
ahmedsophyudden 5592634ab4 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-25 08:42:15 +08:00
ahmedsophyudden 32cea19480 Fix bug reference in supplier (Settings Ui & Pending Order Ui & API) 2022-04-25 07:19:03 +08:00
Leong Chee Siong dfe6b162ff Merge branch 'debtor' into 'development'
Invoice + PO + DO

See merge request CIEFWorldwideSdnBhd/exchange-2.0!104
2022-04-24 04:25:24 +00:00
glovetleong ac690be428 Invoice + PO + DO
Invoice + PO + DO + SDO
2022-04-24 12:24:01 +08:00
ahmedsophyudden e2faeb4bff Add reference in supplier (Settings Ui & Pending Order Ui & API) 2022-04-23 17:20:07 +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 34c03edb4a Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:03:48 +08:00
edmondlang 5795c4b499 create and intergrate api for update group transaction 2022-04-18 00:02:19 +08:00
edmondlang b9760d8739 update notification ui, display no result found if no notification 2022-04-17 21:11:11 +08:00
edmondlang 3cff7a671a update UI for transaction group 2022-04-17 20:34:02 +08:00
edmondlang d0c054bb0f create update UI for transaction group 2022-04-17 20:24:03 +08:00
edmondlang 2b3fe22cb6 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into delete-group-transaction 2022-04-17 10:18:54 +08:00
edmondlang 2865f2ef2c remove debug message in BookingConfirmationComponent 2022-04-17 10:18:23 +08:00
edmondlang 911b928619 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into delete-group-transaction 2022-04-17 10:03:09 +08:00
edmondlang 9631f70350 update icon color when notification center is open 2022-04-17 09:51:45 +08:00
edmondlang 779f7643fb update responsive notification ui 2022-04-17 00:49:33 +08:00
edmondlang 29b1f87966 move notification API and UI from shipping portal 2022-04-16 23:53:12 +08:00
omair saleh 8aa853c7c4 add border to payment proof 2022-04-13 12:38:37 +08:00
glovetleong 0bf3b1b353 refund bug 2022-04-11 23:50:15 +08:00
edmondlang 5647957e9f delete group transaction 2022-04-10 21:31:20 +08:00
glovetleong eee77325f7 back 2022-04-10 00:24:22 +08:00
glovetleong 17f6333030 refund bug 2022-04-10 00:23:23 +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
Leong Chee Siong 20c5ab08e8 Merge branch 'debtor' into 'development'
bank log

See merge request CIEFWorldwideSdnBhd/exchange-2.0!97
2022-04-03 15:34:09 +00:00
glovetleong 4deb5845e3 bank log 2022-04-03 23:32:50 +08:00