 Dillon
|
a2951a0fdf
|
Merge branch 'dillon/accounting-bank-mapping' into development
|
2023-04-12 05:03:13 +08:00 |
|
|
Dillon
|
6aa2ed53c7
|
Allow user to upload statement repeatedly + master list page + rerun mapping + bug fixes
|
2023-04-12 05:02:48 +08:00 |
|
|
Dillon
|
42e8594689
|
Merge branch 'dillon/accounting-bank-mapping' into development
|
2023-04-11 04:15:33 +08:00 |
|
|
Dillon
|
1954cfa63c
|
Mapping of bank statement records with exchange and shipping portal + UI to edit the details
|
2023-04-11 04:14:53 +08:00 |
|
 edmondlang
|
2b174e42c7
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-10 22:33:34 +08:00 |
|
|
edmondlang
|
5bd221050c
|
remove console.log
|
2023-04-10 22:33:04 +08:00 |
|
 Omair Saleh
|
7ca23edb9b
|
1. ImportBankRecordController (script for mapping that get the data from xsl file, needs to be changed to get data from db, and also to retrive data from shipping portal)
2. BankStatementController (for importing data from csv files from bank to insert into the database)
|
2023-04-03 17:48:39 +08:00 |
|
 Dillon Ngo
|
cfec4c58b2
|
Merge branch 'dillon/debug-and-fixes-2-29' into 'master'
New merge request From dillon/debug-and-fixes-2-29 into master
See merge request CIEFWorldwideSdnBhd/exchange-2.0!130
|
2023-04-01 16:25:23 +00:00 |
|
|
Dillon
|
f295cbb9f4
|
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-31 00:18:04 +08:00 |
|
|
Dillon
|
214ae61362
|
Merge branch 'dillon/debug-and-fixes-2-29' into development
|
2023-03-31 00:17:48 +08:00 |
|
|
Dillon
|
1f3e1d32a1
|
Sync code changes from Shipping Portal + Fix a problem related to activating 1688 service
|
2023-03-31 00:17:21 +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 |
|
|
edmondlang
|
2139a4ea0b
|
change admin role type
|
2023-03-30 16:02:39 +08:00 |
|
 DESKTOP-5I7S92L\nicho
|
dfe659084d
|
change admin role type
|
2023-03-30 15:52:45 +08:00 |
|
|
edmondlang
|
8a9edd6b5b
|
Merge branch '1688-tnc' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-28 12:23:13 +08:00 |
|
|
edmondlang
|
245f647e6f
|
update 1688 tnc
|
2023-03-28 12:22:51 +08:00 |
|
|
edmondlang
|
446f78eb2c
|
Merge branch '1688-tnc' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-28 11:16:25 +08:00 |
|
|
edmondlang
|
ee28f13cbe
|
1688 tnc
|
2023-03-28 11:16:03 +08:00 |
|
|
DESKTOP-5I7S92L\nicho
|
d867421901
|
1688 tnc
|
2023-03-27 16:27:47 +08:00 |
|
|
edmondlang
|
b1588aa9c7
|
Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-20 23:18:38 +08:00 |
|
|
edmondlang
|
e29109b834
|
update honey trap with search
|
2023-03-20 23:14:56 +08:00 |
|
|
edmondlang
|
1fb42f15ba
|
Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-20 10:13:18 +08:00 |
|
|
edmondlang
|
584819a513
|
honey trap update
|
2023-03-20 10:12:47 +08:00 |
|
|
edmondlang
|
f81bccb876
|
Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-17 18:41:19 +08:00 |
|
|
edmondlang
|
7cf7fdec54
|
honey trap
|
2023-03-17 18:40:48 +08:00 |
|
|
edmondlang
|
897cb245f3
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-11 18:50:28 +08:00 |
|
|
edmondlang
|
c99076ece1
|
fix bug after fpx top up, redirect to not found page
|
2023-03-11 18:48:15 +08:00 |
|
|
edmondlang
|
baac589af6
|
Merge branch 'delete-1699-po' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-02-22 11:36:15 +08:00 |
|
|
edmondlang
|
aa84279e83
|
delete 1688 po
|
2023-02-22 11:35:50 +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
|
bde228af89
|
Merge branch 'rate-history-refactored' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-02-19 21:16:58 +08:00 |
|
 sharifcse57
|
209df3f3f7
|
Fix: Date range data show in chart
|
2023-02-17 20:29:36 +06:00 |
|
|
sharifcse57
|
08526296c6
|
working with plotting the rate history group by payment type
|
2023-02-17 14:32:04 +06:00 |
|
|
sharifcse57
|
1f461a750f
|
working with plotting the rate history group by payment type
|
2023-02-17 14:25:18 +06:00 |
|
|
edmondlang
|
8ff57bf084
|
Merge branch 'rate-history-refactored' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-02-16 23:20:55 +08:00 |
|
|
edmondlang
|
f55822344a
|
code review
|
2023-02-16 23:20:36 +08:00 |
|
|
edmondlang
|
7f8d60ff57
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into rate-history-refactored
|
2023-02-16 23:16:29 +08:00 |
|
|
edmondlang
|
cf2d8a0d04
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-02-16 23:07:10 +08:00 |
|
|
edmondlang
|
4c47c2af0d
|
Merge branch 'update-company-name-debtor' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2023-02-16 23:06:47 +08:00 |
|
|
edmondlang
|
f9a371cdf0
|
update company name debtor
|
2023-02-16 23:06:31 +08:00 |
|
|
edmondlang
|
155af02a60
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-02-16 20:04:25 +08:00 |
|
|
edmondlang
|
ed6b2452a7
|
Merge branch 'update-company-name-debtor' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2023-02-16 20:03:43 +08:00 |
|
|
edmondlang
|
dda0b28f6c
|
update company name and debtor code
|
2023-02-16 20:03:19 +08:00 |
|
|
edmondlang
|
8fafbf8cd9
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-02-15 22:57:28 +08:00 |
|
|
edmondlang
|
1d8c4c3fff
|
delete payment proof
|
2023-02-15 22:57:07 +08:00 |
|
|
edmondlang
|
f825ae1ec5
|
fix bug - upload payment proof at booking page
|
2023-02-15 11:54:38 +08:00 |
|
 Cleison Freitas
|
2c9ce36a22
|
Building the company responsible for changing the name and debtor from company
|
2023-02-14 23:42:20 -03:00 |
|
|
sharifcse57
|
e50a3777fd
|
Fix: loading previous data
|
2023-02-13 09:23:54 +06:00 |
|