 edmondlang
|
2bc21a7649
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-29 22:12:40 +08:00 |
|
|
edmondlang
|
a90c79396b
|
update list all customer transactions
|
2023-06-29 22:00:26 +08:00 |
|
|
edmondlang
|
ed0bcb34c4
|
list all customer transactions
|
2023-06-29 21:24:21 +08:00 |
|
|
edmondlang
|
240a15378e
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# resources/assets/vue/components/bookings/forms/BookingPaymentQuotationComponent.vue
|
2023-06-27 18:36:55 +08:00 |
|
|
edmondlang
|
4d71abd8be
|
Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2023-06-27 18:33:11 +08:00 |
|
|
edmondlang
|
4972004044
|
update voucher error message
|
2023-06-27 18:11:19 +08:00 |
|
|
edmondlang
|
be09c5aa5b
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/voucherify-35
|
2023-06-27 18:08:47 +08:00 |
|
|
edmondlang
|
357d030adf
|
Merge branch 'dillon/voucherify-35' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# routes/api.php
|
2023-06-27 16:47:50 +08:00 |
|
|
edmondlang
|
f005c65afc
|
update apply voucher design
|
2023-06-27 16:46:42 +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
|
46795e76b5
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-23 11:50:30 +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
|
285f8cae92
|
Merge branch 'list-transfer-with-filters' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-22 18:06:01 +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
|
4ef3ed67e8
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-22 12:29:03 +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
|
771c23000c
|
Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php
# app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
# app/Models/Transaction.php
|
2023-06-21 17:51:38 +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
|
ee4e916b3d
|
Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-21 15:19:43 +08:00 |
|
|
edmondlang
|
1b6bf18a4d
|
update send payment proof email
|
2023-06-21 15:17:30 +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 |
|
 Dillon
|
e8f8cfe36e
|
Quick Test
|
2023-06-17 07:40:27 +08:00 |
|
|
Omair Saleh
|
019bc9ce53
|
revert changes to CreateBookingPaymentLogic.php
|
2023-06-16 13:07:00 +08:00 |
|
|
edmondlang
|
efbd9db691
|
remove the word passport
|
2023-06-15 15:36:30 +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 |
|