Commit Graph

2653 Commits

Author SHA1 Message Date
Dillon 1fc09d693e Merge branch 'dillon/38-voucherify-phase-2' into development 2023-07-28 11:01:20 +08:00
Dillon 79a153d3e5 Getting ready for production deployment for phase 2 of Voucherify 2023-07-28 11:00:59 +08:00
Dillon 478c4d2719 Merge branch 'dillon/38-voucherify-phase-2' into development 2023-07-17 23:08:32 +08:00
Dillon ffacfa771e Fix missing reward display 2023-07-17 23:08:17 +08:00
Dillon 22874b7074 Merge branch 'dillon/38-voucherify-phase-2' into development 2023-07-17 22:29:34 +08:00
Dillon c7927847c4 Voucherify phase 2 2023-07-17 21:29:19 +08:00
edmondlang 7e2c2d8f39 Merge branch 'update-innoive-amount' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-07-17 13:06:51 +08:00
edmondlang 3f89023857 fix invoice amount error 2023-07-17 13:06:27 +08:00
edmondlang 17183a7b58 fix invoice amount error 2023-07-17 12:59:42 +08:00
edmondlang e21b5dd8a5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-07-17 12:42:14 +08:00
edmondlang 6800f7b2d9 add Exports Invoice Transactions log 2023-07-17 12:26:46 +08:00
edmondlang b2edef699b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-07-10 21:59:26 +08:00
edmondlang 46ae50b569 fix invoice decimals bug 2023-07-10 21:59:08 +08:00
edmondlang 74cf3acd3e update accounting mapping 2023-07-10 20:59:01 +08:00
edmondlang 20905a4996 update export invoice function for accounts mapping 2023-07-09 22:08:08 +08:00
edmondlang 7bba082bd5 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-07-09 22:06:23 +08:00
edmondlang b1f5ab492c update export invoice function for accounts mapping 2023-07-09 22:06:06 +08:00
Omair Saleh 96a4e35091 fix the sessional segment for new customers 2023-07-07 14:45:43 +08:00
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