 edmondlang
|
487efac69c
|
Merge branches 'development' and 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-07-07 01:19:32 +08:00 |
|
|
edmondlang
|
1dab99cc49
|
accounting mapping - export invoice
|
2023-07-07 01:18:58 +08:00 |
|
|
edmondlang
|
0fd6fa0c3f
|
accounting mapping - export invoice
|
2023-07-06 01:16:05 +08:00 |
|
 omair saleh
|
4a1a627009
|
Merge branch 'dillon/accounting-bank-mapping' into 'master'
fix internal bank transfer and other payment types error
See merge request CIEFWorldwideSdnBhd/exchange-2.0!142
|
2023-07-05 06:10:35 +00:00 |
|
|
Omair Saleh
|
724714479f
|
fix internal bank transfer and other payment types error
|
2023-07-05 14:09:19 +08:00 |
|
|
edmondlang
|
782c073e3d
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-07-05 12:21:09 +08:00 |
|
|
edmondlang
|
600ac923a0
|
remove company name warming text
|
2023-07-05 12:20:53 +08:00 |
|
|
edmondlang
|
ebad8e74d2
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-07-04 13:24:33 +08:00 |
|
|
edmondlang
|
f7446937a8
|
update UploadPurchaseOrderLogic fix compnay that not using auto PO
|
2023-07-04 13:24:06 +08:00 |
|
|
edmondlang
|
f4159cfc00
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-07-03 18:43:59 +08:00 |
|
|
edmondlang
|
b1eb0a81be
|
open customer purchase order
|
2023-07-03 18:43:36 +08:00 |
|
|
edmondlang
|
4c62c75164
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-07-03 10:20:13 +08:00 |
|
|
edmondlang
|
c6da7e972c
|
fix generate invoice
|
2023-07-03 10:19:34 +08:00 |
|
|
edmondlang
|
b1b3f54ce0
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-07-03 10:07:50 +08:00 |
|
|
edmondlang
|
be3111400c
|
fix generate invoice
|
2023-07-03 10:06:09 +08:00 |
|
|
edmondlang
|
54bede52b5
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-30 20:26:01 +08:00 |
|
|
edmondlang
|
b8cfbba0ad
|
temporary show statement transactions only for admin
|
2023-06-30 20:25:41 +08:00 |
|
|
edmondlang
|
cc74a5e460
|
Merge branch 'update-innoive-amount' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-30 15:35:10 +08:00 |
|
|
edmondlang
|
076f3eb40b
|
update invoice amount
|
2023-06-30 15:34:38 +08:00 |
|
|
edmondlang
|
aea17da762
|
Merge branch 'update-innoive-amount' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-30 15:30:45 +08:00 |
|
|
edmondlang
|
e88ea52e1e
|
update invoice amount
|
2023-06-30 15:30:19 +08:00 |
|
|
edmondlang
|
3f5fd98945
|
Merge branch 'update-innoive-amount' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-30 15:22:09 +08:00 |
|
|
edmondlang
|
4c53457a13
|
update invoice amount
|
2023-06-30 15:21:41 +08:00 |
|
|
edmondlang
|
738394c143
|
update list all customer transactions with the button
|
2023-06-30 14:21:47 +08:00 |
|
|
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 |
|