cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 12:33:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,652 Commits 175 Branches 0 Tags
development
Commit Graph

126 Commits

Author SHA1 Message Date
Dillon Ngo 8b3afd7385 Merge branch 'dillon/63.8-new-promo-voucher-50-percent' into development 2024-08-25 12:53:22 +08:00
Dillon Ngo b7fd252bf0 Voucherify - New promotion voucher (PROM150%) setup 2024-08-25 12:43:33 +08:00
Dillon Ngo de11cdb13c Merge branch 'dillon/63.2-sorry-voucher' into 'master' 
Sorry Voucher Implementation

See merge request CIEFWorldwideSdnBhd/exchange-2.0!166
 2024-08-03 15:09:34 +00:00
Dillon Ngo 2a04ef5bd2 Merge branch 'dillon/63.2-sorry-voucher' into development 2024-07-23 19:12:40 +08:00
Dillon Ngo 0d60226c44 Sorry Voucher with new features enhancement requested by KS 2024-07-23 19:11:36 +08:00
Jia Sheng f2f12a6eb4 Merge branch '1688-order-reference' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-14 19:16:07 +08:00
Jia Sheng cb7c38a50d 1688 order reference 2024-07-14 19:15:43 +08:00
Jia Sheng 37e42ed249 Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-14 11:00:58 +08:00
Jia Sheng 63118efc0b delete duplicated 1688 bank account 2024-07-14 11:00:33 +08:00
Jia Sheng 830097f857 Merge branch 'alipay-service' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-07-13 14:13:49 +08:00
Jia Sheng d1f319582a alipay service 2024-07-13 14:12:54 +08:00
edmondlang ab4f56e4c1 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
 2024-05-23 13:37:25 +08:00
edmondlang a17812be3b check duplicate refunds 2024-05-22 23:22:44 +08:00
edmondlang f63351b715 Merge branch 'remark-module' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	routes/api.php
#	routes/web.php
 2024-04-25 16:50:48 +08:00
edmondlang 631282eaf5 add remarks table migration 2024-04-24 18:09:22 +08:00
edmondlang a4cb2b2066 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-04-02 11:53:43 +08:00
Dillon Ngo d1bcda8029 Merge branch 'dillon/57-second-voucher-first-milestone' into development 2024-04-01 14:04:41 +08:00
Dillon Ngo eb30d41941 Second voucher (first milestone) for user upon reaching 2 completed bookings 2024-04-01 13:56:25 +08:00
Dillon Ngo 7ba34965e3 Merge branch 'dillon/53-voucherify-email-reminder-to-user' into development 2024-03-18 12:22:31 +08:00
Dillon Ngo 36cde82a19 Send welcome email with voucher to user upon successful verification of customer email adddress 2024-03-14 15:52:20 +08:00
Sai0224 b67257b42f Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-02-24 12:16:33 +08:00
Sai0224 25de31ea2e supplier bill payment refund module 2024-02-24 12:15:26 +08:00
JiaSheng 7db7ff68a6 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-23 16:30:23 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
Steve Ng 229a972787 fixing code in statement module 2023-09-30 19:37:49 +08:00
Steve Ng 67ea1c7de4 fixing code in statement module 2023-09-30 19:29:36 +08:00
Dillon a264980320 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-08-26 06:33:35 +08:00
edmondlang ec9c638db8 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into customer-profile-update 2023-08-11 15:13:19 +08:00
edmondlang e7524e8e00 update customer profile 2023-08-09 00:43:26 +08:00
JiaSheng f4e045df5c update profile backend 2023-08-06 10:50:32 +08:00
Dillon c627a07348 Merge branch 'dillon/39-crm-changes' into development 2023-08-05 21:21:04 +08:00
Dillon 21c4508647 Fix error from production logs 2023-08-05 21:20:56 +08:00
Dillon aff91a2c60 Merge branch 'dillon/39-crm-changes' into development 2023-08-05 21:01:51 +08:00
Dillon 79affd81f9 Fix error from production logs 2023-08-05 21:01:21 +08:00
JiaSheng 4db0fb9f29 customer profile edit module 2023-08-05 18:14:45 +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 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 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 04a9bb486c code clean up and fixes before push to production 2023-06-21 16:46:25 +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
Omair Saleh 9ccd51af08 remove accounting tasks from auto generated tasks temporarily until ready 2023-06-11 15:42:49 +08:00
edmondlang dc9f09b18a accounting bank mapping part - mapping unknown transactions 2023-05-21 22:59:48 +08:00
omair saleh ceb64a66a1 Merge branch 'development' into 'dillon/accounting-bank-mapping' 
# Conflicts:
#   app/Http/Controllers/Accounting/BankStatementController.php
 2023-04-18 04:10:13 +00:00
Omair Saleh 4a6ae598fa fix and update the functionality and the ui for accounting automation 2023-04-18 12:07:27 +08:00
edmondlang b97170378d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-30 16:03:43 +08:00
edmondlang 749c6e0bef Merge branch 'change-admin-role-type' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-03-30 16:02:56 +08:00