Commit Graph

2414 Commits

Author SHA1 Message Date
edmondlang f005c65afc update apply voucher design 2023-06-27 16:46:42 +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 c7aa8e2a29 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into list-transfer-with-filters 2023-06-22 18:05:38 +08:00
edmondlang 155bc23f7d list transfer with filters 2023-06-22 18:05:24 +08:00
edmondlang 1e7657d1c1 add bill_no for top up history 2023-06-22 12:27:19 +08:00
edmondlang a3b0e2c33d add bill_no for payment history 2023-06-22 12:22:24 +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
edmondlang 40ae5b7706 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into list-transfer-with-filters 2023-06-21 15:01:34 +08:00
edmondlang 9f2c41d75f list transfer with filters 2023-06-21 15:01:19 +08:00
Omair Saleh 019bc9ce53 revert changes to CreateBookingPaymentLogic.php 2023-06-16 13:07:00 +08:00
edmondlang 2146cf4dca remove the word passport 2023-06-15 15:31:50 +08:00
omair saleh ac510c51a8 Merge branch 'crm-changes' into 'master'
Crm changes

See merge request CIEFWorldwideSdnBhd/exchange-2.0!141
2023-06-14 22:37:22 +00: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
Omair Saleh cd33e1422f show status of transaction 2023-06-14 01:56:37 +08:00
Omair Saleh ff76203bcf show status of transaction 2023-06-14 01:33:48 +08:00
Omair Saleh aa99d8aae4 show status of transaction 2023-06-14 01:11:26 +08:00
Omair Saleh 885444cb97 Merge remote-tracking branch 'origin/dillon/accounting-bank-mapping' into dillon/accounting-bank-mapping 2023-06-14 00:54:33 +08:00
Omair Saleh 4167f28be2 show status of transaction 2023-06-14 00:54:15 +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
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 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 c323d416da Fix double loading icons showing when validating voucher 2023-06-01 18:58:29 +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 619ebc7269 update SegmentCompanyComponent 2023-05-31 17:56:25 +08:00
edmondlang 672bcde0ee update SegmentCompanyComponent 2023-05-31 17:54:01 +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