cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-21 05:23:58 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,924 Commits 175 Branches 0 Tags
e7a708ef33e108785cfb763cd354e075e2e113a2
Commit Graph

243 Commits

Author SHA1 Message Date
edmondlang e7a708ef33 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-15 01:22:02 +08:00
JiaSheng c374e46834 add functionality to get transactions from production when creating statement transactions owner 2023-09-13 22:03:32 +08:00
Dillon a264980320 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-08-26 06:33:35 +08:00
edmondlang abd7a2f072 update upload-honey-trap 2023-08-16 00:57:23 +08:00
edmondlang e7524e8e00 update customer profile 2023-08-09 00:43:26 +08:00
edmondlang e31f1eda53 fix code update customer prrofile 2023-08-06 23:16:20 +08:00
JiaSheng f4e045df5c update profile backend 2023-08-06 10:50:32 +08:00
edmondlang d4bc8c85e0 Merge branch 'credit-note-pdf' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-08-01 23:43:22 +08:00
edmondlang aa6f6a5581 credit note 2023-08-01 01:15:11 +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 0fd6fa0c3f accounting mapping - export invoice 2023-07-06 01:16:05 +08:00
edmondlang 2bc21a7649 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-06-29 22:12:40 +08:00
edmondlang ed0bcb34c4 list all customer transactions 2023-06-29 21:24:21 +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 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
Dillon f6cbb52bee Merge branch 'dillon/debug-and-fixes-3-36' into dillon/voucherify-35 2023-06-01 21:20:53 +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 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 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