 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
|
77f533111f
|
accounting mapping api files and calling api, api need to be updated
|
2023-06-03 23:13:26 +08:00 |
|
|
edmondlang
|
426abbdf8c
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping
|
2023-05-31 12:15:21 +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 |
|
|
edmondlang
|
f37d775e97
|
honey trap changes
|
2023-05-30 19:06:28 +08:00 |
|
|
edmondlang
|
839cce3320
|
honey trap changes
|
2023-05-30 18:09:20 +08:00 |
|
|
Omair Saleh
|
1ede3edc08
|
fix bugs
|
2023-05-19 17:21:36 +08:00 |
|
|
Omair Saleh
|
93fd645bf6
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping
Conflicts:
routes/web.php
|
2023-05-16 12:17:43 +08:00 |
|
|
omair saleh
|
0129a9e11a
|
Merge branch 'dillon/accounting-bank-mapping' into 'development'
Dillon/accounting bank mapping
See merge request CIEFWorldwideSdnBhd/exchange-2.0!134
|
2023-05-16 03:34:26 +00:00 |
|
|
edmondlang
|
5cc6a3c292
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-05-10 10:39:37 +08:00 |
|
|
edmondlang
|
d058d10e49
|
change honey trap to honey trap platinum
|
2023-05-10 10:38:34 +08:00 |
|
|
edmondlang
|
19bab00b61
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
# routes/web.php
|
2023-05-10 01:49:23 +08:00 |
|
|
edmondlang
|
d586e11249
|
upload-honey-trap
|
2023-05-10 01:46:35 +08:00 |
|
|
edmondlang
|
d315c47bca
|
upload-honey-trap
|
2023-05-10 01:41:30 +08:00 |
|
|
edmondlang
|
9edac99b97
|
test appprove group mapping transaction api
|
2023-04-29 00:43:46 +08:00 |
|
|
edmondlang
|
aded55b8c7
|
appprove group mapping transaction api
|
2023-04-28 19:34:22 +08:00 |
|
|
edmondlang
|
b316032c1e
|
appprove duplicate group mapping transaction api
|
2023-04-28 19:00:30 +08:00 |
|
|
edmondlang
|
057cafd1e4
|
Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-20 17:58:08 +08:00 |
|
|
edmondlang
|
4ede279a0f
|
groupApprove statement transaction mapping api
|
2023-04-20 17:44:56 +08:00 |
|
|
edmondlang
|
4681a39cd1
|
groupApprove statement transaction mapping api
|
2023-04-20 17:40:35 +08:00 |
|
|
edmondlang
|
4407f6664c
|
Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-20 16:15:07 +08:00 |
|
|
edmondlang
|
5b73e426fe
|
reject statement transaction mapping
|
2023-04-20 16:14:27 +08:00 |
|
|
edmondlang
|
36fa0e1080
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-19 13:26:32 +08:00 |
|
|
edmondlang
|
204068d864
|
fix bug date error in update announcement function in settings page
|
2023-04-19 13:26:06 +08:00 |
|
|
edmondlang
|
bf2528d98a
|
update delete booking controller
|
2023-04-18 13:50:26 +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 |
|
 Dillon
|
c6b14b11c6
|
Merge branch 'dillon/accounting-bank-mapping' into development
|
2023-04-12 05:22:13 +08:00 |
|
|
Dillon
|
aa8d766b54
|
Minor update
|
2023-04-12 05:22:05 +08:00 |
|
|
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 |
|
|
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 |
|
|
edmondlang
|
b97170378d
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-30 16:03:43 +08:00 |
|
 DESKTOP-5I7S92L\nicho
|
dfe659084d
|
change admin role type
|
2023-03-30 15:52:45 +08:00 |
|
|
edmondlang
|
d24983d1b3
|
Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2023-03-22 11:36:22 +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 |
|
|
Dillon
|
b0a788771b
|
Merge branch 'dillon/debug-and-fixes-1-22' into development
|
2023-03-19 22:31:45 +08:00 |
|
|
Omair Saleh
|
aed176f662
|
import bank record
|
2023-03-18 06:56:09 +08:00 |
|
|
Omair Saleh
|
bff743111b
|
import bank record
|
2023-03-18 06:44:13 +08:00 |
|
|
Omair Saleh
|
2960b2855d
|
import bank record
|
2023-03-18 06:42:23 +08:00 |
|
|
Omair Saleh
|
d31b6cfca6
|
import bank record
|
2023-03-18 06:38:52 +08:00 |
|
|
Omair Saleh
|
1c0d64fb12
|
import bank record
|
2023-03-18 06:36:03 +08:00 |
|
|
Omair Saleh
|
f55e6609b6
|
import bank record
|
2023-03-18 06:34:31 +08:00 |
|
|
Omair Saleh
|
be80313122
|
import bank record
|
2023-03-18 06:33:50 +08:00 |
|
|
Omair Saleh
|
64624ae2a3
|
import bank record
|
2023-03-18 06:33:13 +08:00 |
|