Commit Graph

229 Commits

Author SHA1 Message Date
edmondlang fcd57def34 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-11 19:52:52 +08:00
omair saleh 8a5a05f950 fix timer 2022-03-11 15:28:17 +08:00
omair saleh 4ba32b6e9f fix timer 2022-03-11 15:24:27 +08:00
edmondlang a7646fb4eb update refund section 2022-03-11 10:27:40 +08:00
omair saleh 881adb8495 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-10 19:45:32 +08:00
omair saleh 1a4cb0a743 update transaction timer 2022-03-10 19:17:36 +08:00
omair saleh cdbd59bb23 update transaction timer 2022-03-10 19:16:25 +08:00
omair saleh 621058855e update transaction timer 2022-03-10 19:14:45 +08:00
omair saleh ac43506539 update transaction timer 2022-03-10 19:13:30 +08:00
omair saleh 460912ebc3 update transaction timer 2022-03-10 19:11:49 +08:00
omair saleh 951a213597 update transaction timer 2022-03-10 19:09:03 +08:00
omair saleh b89647e732 update transaction timer 2022-03-10 19:08:03 +08:00
omair saleh 62494c812f update transaction timer 2022-03-10 19:07:44 +08:00
omair saleh f1dc50e22c update transaction timer 2022-03-10 19:06:20 +08:00
omair saleh f9f0c167f6 update transaction timer 2022-03-10 19:05:18 +08:00
omair saleh 4552c79618 update transaction timer 2022-03-10 19:04:34 +08:00
omair saleh 7e5a638d61 update transaction timer 2022-03-10 19:02:36 +08:00
omair saleh 525f2320ae update transaction timer 2022-03-10 19:01:14 +08:00
omair saleh 04cbc1514c update transaction timer 2022-03-10 19:00:44 +08:00
omair saleh 99cada8334 update transaction timer 2022-03-10 18:59:52 +08:00
omair saleh 12677d9d15 update transaction timer 2022-03-10 18:58:10 +08:00
omair saleh ba7ce44570 update transaction timer 2022-03-10 17:31:43 +08:00
omair saleh f852d11d12 update transaction timer 2022-03-10 17:30:30 +08:00
omair saleh 4d31c7244d exclude weekend for transaction time limit 2022-03-07 11:26:42 +08:00
omair saleh 3a27c80e7a exclude weekend for transaction time limit 2022-03-07 11:26:25 +08:00
edmondlang be3ed8ace0 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-03 22:12:03 +08:00
omair saleh 9ff3f3ab5b fix timer for transaction 2022-03-03 14:12:52 +08:00
omair saleh fc67c720f8 fix timer for transaction 2022-03-03 14:09:58 +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
omair saleh 07d1bbd921 fix billing page 2022-03-02 02:24:54 +08:00
edmondlang e816a3c8d0 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-01 22:08:11 +08:00
omair saleh 1aeacf731b update day limit and supplier name for currency roders 2022-03-01 21:30:20 +08:00
omair saleh 1865523bd9 update day limit and supplier name for currency roders 2022-03-01 21:29:16 +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
omair saleh a0501a94b6 fix wallets transaction lists 2022-02-28 12:03:19 +08:00