Commit Graph

287 Commits

Author SHA1 Message Date
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
edmondlang a704408677 copy sign up to a new page 2022-04-28 01:08:56 +08:00
edmondlang d9d0c8f9c1 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-26 21:55:57 +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
Uwais Al-Qarni fce22ab2af Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-26 21:52:53 +08:00
Uwais Al-Qarni 27e25a38f1 refactoring InvoiceTransactionProcessor.php part II 2022-04-26 21:52:42 +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 8678ac7b5e push crisp 2022-04-25 15:14:50 +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 3cff7a671a update UI for transaction group 2022-04-17 20:34:02 +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 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 b6dbd6c517 update jack suppliers 2022-04-15 10:47:58 +08:00
omair saleh f89db64bea fix rack do's 2022-04-14 11:59:54 +08:00
omair saleh 89865302e3 update jack suppliers 2022-04-13 15:50:49 +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 1b45965bc5 fix destination account admin 2022-04-05 12:14:52 +08:00
omair saleh bfd3d87977 debug file type 2022-04-04 18:15:17 +08:00
edmondlang 727ebb99ed Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-24 11:38:36 +08:00
omair saleh 68dff304a0 fix payment proof issuer ids 2022-03-22 20:28:32 +08:00
omair saleh b3a1fff11c fix payment proof issuer ids 2022-03-22 19:53:00 +08:00
edmondlang 15cde500d1 tidy up transactions exports 2022-03-22 00:23:24 +08:00
edmondlang 7857063a56 move 'UPLOAD DEBTORS' to settings
- can only de seen by superAdmin
2022-03-21 21:32:33 +08:00
omair saleh 739b9af57d update debtors import 2022-03-19 15:19:13 +08:00
omair saleh d251952efb update urgent list 2022-03-17 10:06:27 +08:00
omair saleh be0aa22607 clean up development 2022-03-12 20:21:01 +08:00
omair saleh 89069a8afe clean up development 2022-03-12 19:32:45 +08:00
omair saleh 481426bec9 clean up development 2022-03-12 17:02:21 +08:00
edmondlang 3c2686bbf2 update currency vendor order blade 2022-03-11 19:56:40 +08:00
edmondlang a7646fb4eb update refund section 2022-03-11 10:27:40 +08:00
azumiru 08d22a59ce refund-ui-tab update refund component 2022-03-10 17:35:30 +08:00
azumiru 9fa5b3d7cb add refund component 2022-03-08 23:29:17 +08:00
azumiru 5b744503a7 Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-ui-tab 2022-03-08 23:27:11 +08:00
azumiru 5d4dc26263 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into refund-ui-tab 2022-03-07 01:53:17 +08:00
edmondlang 4e3365ba97 Update copyright year using php to get current year 2022-03-05 17:01:57 +08:00
omair saleh 984b3ce9a9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-05 09:47:31 +08:00
omair saleh ed17418ac9 filter out wallet payment from payment list 2022-03-04 12:52:35 +08:00
omair saleh c126731960 filter out wallet payment from payment list 2022-03-04 12:51:33 +08:00
omair saleh 58f3d85f8d filter out wallet payment from payment list 2022-03-04 12:50:39 +08:00
edmondlang bc43a54194 fix bug on payments and refund section - showing both section on first load 2022-03-03 22:10:45 +08:00
edmondlang f086036099 update booking type in refund 2022-03-03 21:39:55 +08:00
azumiru 0c317a1139 add refund tab in dashboard 2022-03-03 00:21: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