cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-21 21:43:57 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,985 Commits 175 Branches 0 Tags
549cd018fa10bef2da9d174db55fed644cac9099
Commit Graph

120 Commits

Author SHA1 Message Date
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
Steve Ng 0882a4d91f enhance the code in ApproveDuplicateBankStatementDetailsStatusLogic class to dynamic for update status to approve and revert back pending 2023-10-03 15:21:29 +08:00
Steve Ng 9938615fe4 enhance the code in ApproveDuplicateBankStatementDetailsStatusLogic class to dynamic for update status to approve and revert back pending 2023-10-03 15:20:11 +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
edmondlang 771c23000c Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/Modules/PerfexCRM/Processors/TransactionToPerfexCRMProcessorV2.php
#	app/Classes/Modules/PerfexCRM/Processors/UpdatePerfexCRMProcessor.php
#	app/Models/Transaction.php
 2023-06-21 17:51:38 +08:00
edmondlang d4901ff7b7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/accounting-bank-mapping 
# Conflicts:
#	app/Models/Transaction.php
 2023-06-21 17:48:37 +08:00
Omair Saleh 04a9bb486c code clean up and fixes before push to production 2023-06-21 16:46:25 +08:00
edmondlang 1591cb9162 crm changes 2023-06-12 20:41:46 +08:00
Omair Saleh 2b97f7844b remove accounting tasks from auto generated tasks temporarily until ready 2023-06-11 19:18:25 +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
omair saleh 1a1469ab3b Merge branch 'dillon/accounting-bank-mapping' into 'development' 
add owner reference for bank statement transaction owners

See merge request CIEFWorldwideSdnBhd/exchange-2.0!135
 2023-05-16 04:20:24 +00:00
Omair Saleh 63511f4582 add owner reference for bank statement transaction owners 2023-05-16 12:15: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 8ff57bf084 Merge branch 'rate-history-refactored' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-02-16 23:20:55 +08:00
edmondlang a423ec43cd update rate history module 2023-02-12 10:40:50 +08:00
edmondlang fda0c2b367 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-01-20 09:49:49 +08:00
Omair Saleh 7959a45b3f debug update group rate 2023-01-17 12:12:01 +08:00
Omair Saleh 76ef289df8 debug update group rate 2023-01-17 12:08:57 +08:00
Omair Saleh 3ce478e27a debug update group rate 2023-01-17 12:07:36 +08:00
edmondlang d32476d171 api and web route logs 2023-01-04 22:17:14 +08:00
Omair Saleh 13dcedf74a fix log data for transactional tables 2022-12-19 11:30:19 +08:00
Omair Saleh 80c59efd2f fix log data for transactional tables 2022-12-19 11:28:21 +08:00
Omair Saleh dfdfb50ead fix log data for transactional tables 2022-12-19 11:16:59 +08:00
Omair Saleh bf599890fa fix log data for transactional tables 2022-12-18 15:14:11 +08:00
Omair Saleh 2abc10ba29 debug groups 2022-12-16 17:06:56 +08:00
Omair Saleh e60e5d2e3c debug groups 2022-12-16 17:05:02 +08:00
Omair Saleh dc1b0327ce log transactional data 2022-12-16 13:37:18 +08:00
omair saleh af1f87b6f0 fix group dates 2022-08-05 16:00:43 +08:00
omair saleh b9bb6b874b fix up group transactions bulk purchase orders 2022-07-14 01:33:39 +08:00
ahmedsophyudden cf852eb120 Generate bulk purchase order 2022-07-04 09:14:16 +08:00
omair saleh c9fca28c49 Merge remote-tracking branch 'origin/development' into development 
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
 2022-05-03 13:40:03 +08:00
omair saleh b62ba94e41 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
 2022-05-03 13:39:05 +08:00
omair saleh 060ae247f0 debug export booking analytics 2022-05-03 13:20:29 +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