cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-31 18:34:10 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,494 Commits 175 Branches 0 Tags
3bc3e10ddc6b8ab9a3eee7d0fd7735922e57281d
Commit Graph

2494 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
edmondlang 3bc3e10ddc Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-06-03 19:20:53 +08:00
edmondlang 763902879d update send email payment proof, send email only in production 2023-06-03 19:19:35 +08:00
edmondlang dc5b96403c update email payment proof 2023-06-03 19:02:41 +08:00
edmondlang 1a7109b892 Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-06-03 17:01:35 +08:00
edmondlang ec85ec07ab send email payment proof 2023-06-03 17:01:15 +08:00
edmondlang 8f7ab425d2 Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-06-03 15:58:41 +08:00
edmondlang f1ce5c6a86 update email payment proof 2023-06-03 15:58:13 +08:00
edmondlang 920b994b36 Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	routes/web.php
 2023-06-03 15:49:16 +08:00
edmondlang 6b73f31993 email payment proof 2023-06-03 15:48:33 +08:00
edmondlang a98ac9b3ce Merge branch 'company-name-warning-text' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-06-03 14:43:00 +08:00
edmondlang 4218a4e398 company name warning text 2023-06-03 14:42:37 +08:00
Omair Saleh 6fed2d47e0 Merge remote-tracking branch 'origin/master' 2023-06-01 23:52:57 +08:00
Omair Saleh 585ce66e3c xpo 03-2023 2023-06-01 23:52:18 +08:00
Dillon ffe16baebc Merge branch 'dillon/voucherify-35' into development 2023-06-01 21:21:17 +08:00
Dillon f6cbb52bee Merge branch 'dillon/debug-and-fixes-3-36' into dillon/voucherify-35 2023-06-01 21:20:53 +08:00
Dillon cf09d3db9d Fix a problem based on logs: Illegal string offset 'message' 2023-06-01 21:20:27 +08:00
Dillon ca38ba9688 Merge branch 'dillon/voucherify-35' into development 2023-06-01 18:58:47 +08:00
Dillon c323d416da Fix double loading icons showing when validating voucher 2023-06-01 18:58:29 +08:00
Dillon d98685f867 Merge branch 'dillon/voucherify-35' into development 2023-06-01 17:40:48 +08:00
Dillon eb8dfea254 Update voucher details into pdfs i.e invoice, purchase order, delivery order 2023-06-01 17:40:13 +08:00
edmondlang 6aea566760 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-31 17:57:14 +08:00
edmondlang 619ebc7269 update SegmentCompanyComponent 2023-05-31 17:56:25 +08:00
edmondlang 672bcde0ee update SegmentCompanyComponent 2023-05-31 17:54:01 +08:00
edmondlang 38fc12e86b Merge branch 'register-honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
 2023-05-31 08:25:06 +08:00
edmondlang 209c843b2d add segment 'honey trap new registration' to new registered customer 2023-05-31 08:21:47 +08:00
Dillon 455ce0fe08 Vourcherify manual merged conflict resolved 2023-05-30 22:33:26 +08:00
Dillon 20d6ca47dc Vourcherify 2023-05-30 22:02:09 +08:00
edmondlang 4bd28e3cca add company id in support 2023-05-30 19:38:45 +08:00
edmondlang 94b1b045c9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-30 19:06:47 +08:00
edmondlang f37d775e97 honey trap changes 2023-05-30 19:06:28 +08:00
edmondlang 839cce3320 honey trap changes 2023-05-30 18:09:20 +08:00
Omair Saleh b89b911f71 Merge remote-tracking branch 'origin/master' 2023-05-30 12:32:46 +08:00
Omair Saleh 1f105421a1 xpo 04-2023 2023-05-30 12:32:29 +08:00
Dillon 44deab4542 Merge branch 'master' into promo-code 2023-05-25 14:16:12 +08:00
edmondlang 744494c336 Merge branch 'recalculate-wallet-balance' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-18 19:32:36 +08:00
edmondlang 27509f5937 recalculate wallet balance 2023-05-18 19:31:51 +08:00
edmondlang b452cf0027 recalculate wallet balance 2023-05-18 19:22:58 +08:00
edmondlang c79d9e916c Merge branch 'recalculate-wallet-balance' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-18 00:07:40 +08:00
edmondlang 35edc807a8 recalculate wallet balance 2023-05-18 00:07:20 +08:00
edmondlang f2619d3c4c Merge branches 'development' and 'recalculate-wallet-balance' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-17 23:49:50 +08:00
edmondlang 43a9bf6742 AuditAndUpdateWallletBalance 2023-05-17 23:49:32 +08:00
edmondlang d5b04b9b81 AuditAndUpdateWallletBalance 2023-05-17 23:44:49 +08:00
edmondlang 629a27c2bf Merge branch 'recalculate-wallet-balance' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-17 23:37:02 +08:00
edmondlang 96193a2880 recalculate wallet balance 2023-05-17 23:36:32 +08:00
omair saleh 591725daef Merge branch 'dillon/accounting-bank-mapping' into 'development' 
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!136
 2023-05-16 04:38:49 +00:00
Omair Saleh 86c0383864 add owner reference for bank statement transaction owners 2023-05-16 12:37:48 +08:00
omair saleh 1a1469ab3b Merge branch 'dillon/accounting-bank-mapping' into 'development' 
add owner reference for bank statement transaction owners

See merge request CIEFWorldwideSdnBhd/exchange-2.0!135
 2023-05-16 04:20:24 +00:00
Omair Saleh 93fd645bf6 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping 
 Conflicts:
	routes/web.php
 2023-05-16 12:17:43 +08:00
Omair Saleh 63511f4582 add owner reference for bank statement transaction owners 2023-05-16 12:15:21 +08:00
omair saleh 0129a9e11a Merge branch 'dillon/accounting-bank-mapping' into 'development' 
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!134
 2023-05-16 03:34:26 +00:00