Commit Graph

1273 Commits

Author SHA1 Message Date
edmondlang be09c5aa5b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/voucherify-35 2023-06-27 18:08:47 +08:00
Omair Saleh f509b2e0a2 Merge remote-tracking branch 'origin/master' 2023-06-23 14:44:20 +08:00
Omair Saleh a74cda1ad7 include ref column to payment export for autocount 2023-06-23 14:43:46 +08:00
edmondlang 3065857295 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into register-honey-trap 2023-06-23 11:47:55 +08:00
edmondlang 32b9bfab1c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/voucherify-35
# Conflicts:
#	routes/api.php
2023-06-22 23:09:50 +08:00
edmondlang d4901ff7b7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping
# Conflicts:
#	app/Models/Transaction.php
2023-06-21 17:48:37 +08:00
Omair Saleh 7bec962e26 code clean up and fixes before push to production 2023-06-21 17:03:38 +08:00
Omair Saleh 04a9bb486c code clean up and fixes before push to production 2023-06-21 16:46:25 +08:00
Omair Saleh 019bc9ce53 revert changes to CreateBookingPaymentLogic.php 2023-06-16 13:07:00 +08:00
Omair Saleh 93c24b197d automatically complete tasks 2023-06-15 06:20:47 +08:00
Omair Saleh e093a4d43c automatically complete tasks 2023-06-15 06:19:26 +08:00
Omair Saleh d6516fda53 automatically complete tasks 2023-06-15 06:16:54 +08:00
Omair Saleh 1a08dd1659 automatically complete tasks 2023-06-15 06:16:02 +08:00
Omair Saleh 3b9cc6a3b9 automatically complete tasks 2023-06-15 06:15:44 +08:00
Omair Saleh 85a7a09e32 automatically complete tasks 2023-06-15 06:11:27 +08:00
Omair Saleh ef1b63870f automatically complete tasks 2023-06-15 06:08:27 +08:00
Omair Saleh 9e40be83f0 automatically complete tasks 2023-06-15 06:07:34 +08:00
Omair Saleh c0dcdfd942 automatically complete tasks 2023-06-15 06:07:13 +08:00
Omair Saleh 1b43e4d1e3 automatically complete tasks 2023-06-15 06:02:53 +08:00
Omair Saleh ebca79aee2 automatically complete tasks 2023-06-15 05:55:22 +08:00
Omair Saleh 3d1402a4fb automatically complete tasks 2023-06-15 05:52:14 +08:00
Omair Saleh c99cfa14c5 automatically complete tasks 2023-06-15 05:45:06 +08:00
Omair Saleh 4e3a82969d automatically complete tasks 2023-06-15 05:20:23 +08:00
Omair Saleh 09f20ca34c automatically complete tasks 2023-06-15 04:37:21 +08:00
Omair Saleh 9d99665669 automatically complete tasks 2023-06-15 04:29:38 +08:00
Omair Saleh afd51405b9 automatically complete tasks 2023-06-15 04:25:09 +08:00
Omair Saleh 2e9e7f9cc0 automatically complete tasks 2023-06-15 04:23:15 +08:00
Omair Saleh f7796fe957 automatically complete tasks 2023-06-15 04:12:01 +08:00
edmondlang 1591cb9162 crm changes 2023-06-12 20:41:46 +08:00
edmondlang 77f533111f accounting mapping api files and calling api, api need to be updated 2023-06-03 23:13:26 +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 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 eb8dfea254 Update voucher details into pdfs i.e invoice, purchase order, delivery order 2023-06-01 17:40:13 +08:00
edmondlang 426abbdf8c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping 2023-05-31 12:15:21 +08:00
edmondlang 209c843b2d add segment 'honey trap new registration' to new registered customer 2023-05-31 08:21:47 +08:00
Dillon 20d6ca47dc Vourcherify 2023-05-30 22:02:09 +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
Omair Saleh 1d5aba8414 revert last commit 2023-05-30 12:31:18 +08:00
Omair Saleh 1e5012c052 update xpo to 04-2023 2023-05-30 11:58:47 +08:00
edmondlang dc9f09b18a accounting bank mapping part - mapping unknown transactions 2023-05-21 22:59:48 +08:00
Omair Saleh 1ede3edc08 fix bugs 2023-05-19 17:21: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 35edc807a8 recalculate wallet balance 2023-05-18 00:07:20 +08:00
edmondlang 43a9bf6742 AuditAndUpdateWallletBalance 2023-05-17 23:49:32 +08:00