cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-20 04:53:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,635 Commits 175 Branches 0 Tags
487efac69cda2140ccfdf5deb995db409d599ece
Commit Graph

100 Commits

Author SHA1 Message Date
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
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
Omair Saleh 1ede3edc08 fix bugs 2023-05-19 17:21:36 +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
Omair Saleh 9d93808f84 add owner reference for bank statement transaction owners 2023-05-16 11:33:21 +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 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 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 7d29cc7255 Merge branch 'update-laravel-mpdf' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-02-10 22:13:22 +08:00
edmondlang dd120bcf11 Merge branch 'upload-payment-proof-booking-page' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-02-09 23:37:31 +08:00
edmondlang 4e511e2f01 update laravel mpdf 2023-02-09 22:56:55 +08:00
edmondlang 75cd8edcb4 update dummy data seeder 2023-02-09 22:53:31 +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
Omair Saleh 8743efd33a update dummy data seed 2023-02-02 07:51:17 +08:00
Omair Saleh 73026fd642 customer support interface 2023-01-24 04:48:57 +08:00
edmondlang d32476d171 api and web route logs 2023-01-04 22:17:14 +08:00
Omair Saleh eb5347c2cc Update in complete dummy data seeder 2022-11-15 19:55:07 +08:00
omair saleh 7219bc1301 fix group reference duplicate bug 2022-07-17 14:37:50 +08:00
omair saleh c84033b1be fix up group transactions bulk purchase orders 2022-07-15 14:24:27 +08:00
omair saleh 50ccce57e1 fix up group transactions bulk purchase orders 2022-07-15 14:24:08 +08:00
omair saleh dc992de2fb fix up group transactions bulk purchase orders 2022-07-15 13:08:29 +08:00
omair saleh c51de54040 fix up group transactions bulk purchase orders 2022-07-15 11:40:47 +08:00
omair saleh c960b682af fix up group transactions bulk purchase orders 2022-07-14 02:01:15 +08:00
omair saleh 117e974b93 fix up group transactions bulk purchase orders 2022-07-14 01:56:35 +08:00
omair saleh 0578ac9f0f fix up group transactions bulk purchase orders 2022-07-14 01:48:51 +08:00
omair saleh b9bb6b874b fix up group transactions bulk purchase orders 2022-07-14 01:33:39 +08:00
omair saleh 13068ef0c1 code clean up before merge to production 2022-07-11 19:59:50 +08:00
edmondlang ff1a8bda57 Merge branch 'delete-group-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:04:16 +08:00
edmondlang f28f6f003a Merge branch 'notification-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:04:04 +08:00
edmondlang 29b1f87966 move notification API and UI from shipping portal 2022-04-16 23:53:12 +08:00
edmondlang 5647957e9f delete group transaction 2022-04-10 21:31:20 +08:00
glovetleong 4deb5845e3 bank log 2022-04-03 23:32:50 +08:00
glovetleong 0d4e396a54 group transaction 2022-03-22 14:59:17 +08:00
omair saleh 89069a8afe clean up development 2022-03-12 19:32:45 +08:00
omair saleh c98bf9752f clean up development 2022-03-12 17:47:05 +08:00
glovetleong ae392dd052 debtor 2022-02-21 08:57:39 +08:00
omair saleh aa3d50e125 fix bill seeder 2022-02-18 09:47:30 +08:00
glovetleong f56369d707 transaction bill 2022-01-13 22:49:02 +08:00
edmondlang fb4d17b46f rename performa to proforma 2021-11-28 21:10:46 +08:00
glovetleong 2ffefc03bb fix MorphMany transaction 2021-10-22 14:47:01 +08:00
Fairuz e94ef44928 Wallet operations 2021-10-07 01:34:11 +08:00
weichien d82f198199 feat: add announcement and pivot table with segment. 2021-06-08 13:40:10 +08:00
Fairuz b32d5ae2c0 Fixes for admin can't view document / missing permission 2021-05-25 12:35:42 +08:00