 JiaSheng
|
cbc3fb56d4
|
fix pay booking by wallet bug
|
2023-12-07 01:05:17 +08:00 |
|
|
JiaSheng
|
7ab938ebee
|
Merge branch 'centralize-izyim-exchange' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
|
2023-11-24 17:28:22 +08:00 |
|
|
JiaSheng
|
8f20c0e8a8
|
updates for dev environment
|
2023-11-22 16:18:02 +08:00 |
|
|
JiaSheng
|
1f057e464e
|
updates
|
2023-11-19 18:05:52 +08:00 |
|
|
JiaSheng
|
aca665f580
|
centralize izyim exchange
|
2023-11-19 17:10:33 +08:00 |
|
 edmondlang
|
960f0b71a4
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-11-09 10:21:22 +08:00 |
|
|
edmondlang
|
6fe1ca3e0e
|
update regenerate invoice
|
2023-11-09 10:21:04 +08:00 |
|
|
edmondlang
|
51766b6caa
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into regenerate-invoice-with-first-bill-no
|
2023-11-08 00:11:44 +08:00 |
|
|
edmondlang
|
10e44bbd18
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-10-30 18:39:34 +08:00 |
|
|
edmondlang
|
5c5f54e03b
|
delete booking / expire the order payment
|
2023-10-30 18:39:19 +08:00 |
|
|
edmondlang
|
d041b08492
|
Merge branch 'regenerate-invoice-with-first-bill-no' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# app/Console/Commands/RegenerateInvoice.php
|
2023-09-16 14:38:41 +08:00 |
|
|
edmondlang
|
9f2b431f21
|
regenerate-invoice-with-first-bill-no
|
2023-09-16 14:38:02 +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
|
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
|
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 |
|
 Omair Saleh
|
019bc9ce53
|
revert changes to CreateBookingPaymentLogic.php
|
2023-06-16 13:07:00 +08:00 |
|
|
Omair Saleh
|
2e9e7f9cc0
|
automatically complete tasks
|
2023-06-15 04:23:15 +08:00 |
|
|
edmondlang
|
1591cb9162
|
crm changes
|
2023-06-12 20:41:46 +08:00 |
|
|
Omair Saleh
|
6c03f97345
|
remove accounting tasks from auto generated tasks temporarily until ready
|
2023-06-11 17:44:05 +08:00 |
|
|
Omair Saleh
|
b954766e99
|
remove accounting tasks from auto generated tasks temporarily until ready
|
2023-06-11 16:31:56 +08:00 |
|
|
edmondlang
|
a98ac9b3ce
|
Merge branch 'company-name-warning-text' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-06-03 14:43:00 +08:00 |
|
|
Omair Saleh
|
585ce66e3c
|
xpo 03-2023
|
2023-06-01 23:52:18 +08:00 |
|
|
Dillon
|
f6cbb52bee
|
Merge branch 'dillon/debug-and-fixes-3-36' into dillon/voucherify-35
|
2023-06-01 21:20:53 +08:00 |
|
|
Dillon
|
455ce0fe08
|
Vourcherify manual merged conflict resolved
|
2023-05-30 22:33:26 +08:00 |
|
|
Dillon
|
20d6ca47dc
|
Vourcherify
|
2023-05-30 22:02:09 +08:00 |
|
|
edmondlang
|
94b1b045c9
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-05-30 19:06:47 +08:00 |
|
|
Omair Saleh
|
b89b911f71
|
Merge remote-tracking branch 'origin/master'
|
2023-05-30 12:32:46 +08:00 |
|
|
Omair Saleh
|
1f105421a1
|
xpo 04-2023
|
2023-05-30 12:32:29 +08:00 |
|
|
edmondlang
|
c79d9e916c
|
Merge branch 'recalculate-wallet-balance' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-05-18 00:07:40 +08:00 |
|
|
edmondlang
|
35edc807a8
|
recalculate wallet balance
|
2023-05-18 00:07:20 +08:00 |
|
|
omair saleh
|
591725daef
|
Merge branch 'dillon/accounting-bank-mapping' into 'development'
Dillon/accounting bank mapping
See merge request CIEFWorldwideSdnBhd/exchange-2.0!136
|
2023-05-16 04:38:49 +00:00 |
|
|
Omair Saleh
|
e84f288d39
|
xpo jan & feb
|
2023-05-15 10:44:04 +08:00 |
|
 Dillon
|
40641fb73f
|
Merge branch 'dillon/crm-create-task-2' into development
|
2023-03-10 02:47:05 +08:00 |
|
|
Dillon
|
40e4aae185
|
CRM create all remaining tasks according to documentation
|
2023-03-10 02:42:00 +08:00 |
|
|
Dillon
|
d3450a900a
|
Merge branch 'dillon/crm-create-task' into development
|
2023-03-01 12:35:27 +08:00 |
|
|
Omair Saleh
|
764a4c4b84
|
Merge remote-tracking branch 'origin/master'
|
2023-02-23 15:59:41 +08:00 |
|
|
Omair Saleh
|
70cc33c776
|
update xpo
|
2023-02-23 15:59:28 +08:00 |
|
|
edmondlang
|
bf3d1d0c23
|
remove text
|
2023-02-22 16:25:30 +08:00 |
|
|
edmondlang
|
83ee830022
|
Merge branch 'delete-1699-po' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-02-22 10:58:03 +08:00 |
|
|
edmondlang
|
0c21e6bd91
|
delete 1688 po
|
2023-02-22 10:47:28 +08:00 |
|
|
edmondlang
|
2d7aa54c8a
|
Merge branch 'transfer-booking-owner' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-02-07 00:48:43 +08:00 |
|
|
edmondlang
|
f4cc6113a7
|
transfer booking owner
|
2023-02-07 00:48:20 +08:00 |
|
|
Dillon
|
13ba4e5c12
|
Edit book recipient bank details
|
2023-01-20 01:23:03 +08:00 |
|
|
omair saleh
|
f8ec4815a7
|
fix wallet insufficient balance when amount is below 0.01
|
2022-11-10 17:48:47 +08:00 |
|
|
omair saleh
|
62657e511c
|
fix wallet insufficient balance when amount is below 0.01
|
2022-11-10 17:42:14 +08:00 |
|
|
omair saleh
|
ca06fd03d5
|
delete 1688 purchase order for special customers
|
2022-11-03 12:23:49 +08:00 |
|
|
omair saleh
|
4f7f7bf7aa
|
debug po upload
|
2022-10-28 10:05:22 +08:00 |
|
|
omair saleh
|
7892f37ed8
|
debug po upload
|
2022-10-28 10:03:23 +08:00 |
|