Commit Graph

1429 Commits

Author SHA1 Message Date
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 724714479f fix internal bank transfer and other payment types error 2023-07-05 14:09:19 +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 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 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 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
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
omair saleh bf3c2d164c Merge branch 'dillon/accounting-bank-mapping' into 'development'
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!137
2023-06-13 15:22:16 +00:00
edmondlang 1591cb9162 crm changes 2023-06-12 20:41:46 +08:00
edmondlang ce9f641995 update senf payment proof
- disable attachement file
- update the text
2023-06-12 15:59:52 +08:00
edmondlang 3337c5feed Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-06-12 15:08:47 +08:00
edmondlang 6a3b8884f8 update send email payment proof, add testing email 2023-06-12 15:08:27 +08:00
Omair Saleh b8443e99e8 remove accounting tasks from auto generated tasks temporarily until ready 2023-06-11 20:12:56 +08:00
Omair Saleh 1d00200f9b remove accounting tasks from auto generated tasks temporarily until ready 2023-06-11 20:05:21 +08:00
Omair Saleh 33e673750d remove accounting tasks from auto generated tasks temporarily until ready 2023-06-11 19:50:22 +08:00
Omair Saleh e639169823 remove accounting tasks from auto generated tasks temporarily until ready 2023-06-11 19:44:56 +08:00