Commit Graph

166 Commits

Author SHA1 Message Date
Dillon 40e4aae185 CRM create all remaining tasks according to documentation 2023-03-10 02:42:00 +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 0c21e6bd91 delete 1688 po 2023-02-22 10:47:28 +08:00
edmondlang f4cc6113a7 transfer booking owner 2023-02-07 00:48:20 +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
omair saleh a7d075dadf debug po upload 2022-10-28 10:01:52 +08:00
omair saleh b5acf80a29 fix regenerate invoice function to only include invoice documents 2022-10-11 17:48:30 +08:00
Omair Saleh bf18a18f1d update july xpo and pi 2022-09-27 11:31:44 +08:00
Omair Saleh ae4260dd15 update july xpo and pi 2022-09-27 11:24:19 +08:00
omair saleh 4555752218 generate invoices for 1688 orders 2022-09-08 20:22:30 +08:00
omair saleh fff77aee7f update june xpo 2022-09-01 17:50:22 +08:00
omair saleh b88bbc0eb7 xpo for may 2022-08-02 15:46:34 +08:00
omair saleh 409c53e9a0 fix upload purchase order 2022-07-27 13:21:03 +08:00
omair saleh b4b3fa33fd upload 1688 purchase order in pdf format 2022-07-21 14:56:29 +08:00
omair saleh 90461b172a Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	app/Classes/Modules/Transactions/ControllersLogic/CreateBulkPurchaseOrderDocumentLogic.php
2022-07-11 23:56:40 +08:00
omair saleh 13068ef0c1 code clean up before merge to production 2022-07-11 19:59:50 +08:00
edmondlang 935eaa8fcd Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-07-11 14:59:40 +08:00
omair saleh 86707b3e91 update xpo 2022-06-28 13:57:27 +08:00
Leong Chee Siong 1d640e5d03 Merge branch 'debtor' into 'development'
no file error

See merge request CIEFWorldwideSdnBhd/exchange-2.0!106
2022-04-29 01:11:14 +00:00
glovetleong 7756726ea8 no file error 2022-04-29 09:09:58 +08:00
edmondlang 134868029a Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Exports/Services/ExportsTransactions.php
2022-04-28 19:59:05 +08:00
omair saleh 058d994965 update xpo 2022-04-27 13:25:43 +08:00
glovetleong ac690be428 Invoice + PO + DO
Invoice + PO + DO + SDO
2022-04-24 12:24:01 +08:00
edmondlang 34c03edb4a Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:03:48 +08:00
omair saleh c49718e278 fix fpx payment 2022-04-16 12:48:50 +08:00
glovetleong 0bf3b1b353 refund bug 2022-04-11 23:50:15 +08:00
edmondlang 8b3b97167f Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
2022-04-08 20:16:51 +08:00
glovetleong 14947865f8 wallet pay cash back 2022-04-06 22:52:39 +08:00
glovetleong 01ddfb6282 cash back ref 2022-04-05 22:57:53 +08:00
omair saleh 51bde6eed7 update xpo for nov to feb 2022-04-05 16:17:18 +08:00
omair saleh be7d5bb95f update xpo for nov to feb 2022-04-05 16:15:59 +08:00
omair saleh 800c723416 update xpo for nov to feb 2022-04-05 16:07:13 +08:00
omair saleh 9efbda1d2a update xpo for nov to feb 2022-04-05 16:05:58 +08:00
glovetleong 3fcfcf9de9 cash back 2022-04-01 10:12:23 +08:00
omair saleh 72e645c426 add supplier filter to exchange 2022-03-31 13:09:02 +08:00
edmondlang 991ba93c71 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-14 11:43:51 +08:00
omair saleh b94c51ee78 update xpo 2022-03-14 09:38:30 +08:00
omair saleh ea83ba13d4 clean up development 2022-03-13 00:13:26 +08:00
omair saleh a39c84586b clean up development 2022-03-13 00:12:40 +08:00
omair saleh be0aa22607 clean up development 2022-03-12 20:21:01 +08:00
edmondlang 643781e364 Merge branch 'transfer-time-notice' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-11 20:35:05 +08:00
edmondlang eba2eb78f8 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-11 14:14:48 +08:00
omair saleh 0a05a0f980 update xpo 2022-03-11 10:56:27 +08:00
omair saleh cfbed3917e update xpo 2022-03-11 10:55:36 +08:00