cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 20:43:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
3,248 Commits 175 Branches 0 Tags
a45507a2cfcdc8e4b0f8fa1eef33d99d7f4582c7
Commit Graph

130 Commits

Author SHA1 Message Date
Sai0224 b67257b42f Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2024-02-24 12:16:33 +08:00
Sai0224 25de31ea2e supplier bill payment refund module 2024-02-24 12:15:26 +08:00
Sai0224 ec0ebe3812 Merge branch 'refund-booking' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into supplier-bill-group-dashboard 2024-02-21 21:14:51 +08:00
Dillon Ngo f8230990f4 Revert "Merge branch 'revert-b9668bb6' into 'master'" 
This reverts merge request !157
 2024-02-11 10:28:05 +00:00
Dillon Ngo ea4795e5c8 Revert "Merge branch 'dillon/51-vue-polling-experimental-2' into 'master'" 
This reverts merge request !152
 2024-02-11 09:53:09 +00:00
Dillon Ngo b9668bb61b Merge branch 'dillon/51-vue-polling-experimental-2' into 'master' 
Proof of concept - Vue Polling a workaround for AWS API Gateway limitation

See merge request CIEFWorldwideSdnBhd/exchange-2.0!152
 2024-02-11 09:16:08 +00:00
Dillon Ngo dcb1dbeca4 Merge branch 'dillon/51-vue-polling-experimental-2' into development 2024-02-11 16:15:06 +08:00
Dillon Ngo 6da337b9dc Code sync from Shipping Portal, independent deployment of Vue Polling, additional amendment to run Vue Polling at /billings 2023-12-30 01:26:58 +08:00
Dillon Ngo 18df0e256b Code sync from Shipping Portal, independent deployment of Vue Polling, checkout from dillon/34-jenkins-vapor 2023-12-30 01:15:27 +08:00
Steve Ng ca07fc161e add reporting for download history import mapped invoice and receipt and with fix bug 2023-12-27 13:49:36 +08:00
Steve Ng 5d0052a671 add reporting for download history import mapped invoice and receipt and with fix bug 2023-12-27 13:47:12 +08:00
JiaSheng 7db7ff68a6 Merge branch 'supplier-bill-group-dashboard' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-23 16:30:23 +08:00
JiaSheng 72797d8885 supplier bill group dashboard 2023-12-22 18:16:04 +08:00
edmondlang 0abebbe167 comment route_logs migration 2023-12-19 00:12:18 +08:00
edmondlang e72e037ed4 revert 2023-12-19 00:08:53 +08:00
edmondlang 84e787f05e test update 2023-12-19 00:02:10 +08:00
edmondlang ed44b09483 Merge branch 'create-index-for-tables' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-12-18 23:23:28 +08:00
edmondlang a4489215c2 create index migration for transactions table 2023-12-18 23:10:33 +08:00
JiaSheng 7ab938ebee Merge branch 'centralize-izyim-exchange' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
 2023-11-24 17:28:22 +08:00
JiaSheng aca665f580 centralize izyim exchange 2023-11-19 17:10:33 +08:00
Steve Ng 1ea34d0468 fixing unable mapping records and filtering function in Pending Export tab and listing data not same in Pending Export tab with export Invoice to autocount and calculate mapped percentage 2023-10-23 09:23:10 +08:00
Steve Ng 05b5823fe4 fixing unable mapping records and filtering function in Pending Export tab and listing data not same in Pending Export tab with export Invoice to autocount and calculate mapped percentage 2023-10-23 09:21:26 +08:00
Steve Ng d9d3c48e6d code for statement import invoice mapping 2023-10-09 14:28:11 +08:00
Steve Ng 4e29145b50 Merge branch 'steve/mapping-import-invoice' into development 2023-10-06 11:00:59 +08:00
Steve Ng bc5d1eff88 code for statement import invoice mapping 2023-10-06 10:59:36 +08:00
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 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 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
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