cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-23 14:33:59 +00:00
Code Issues Packages Projects Releases Wiki Activity
2,589 Commits 175 Branches 0 Tags
dillon/development
Commit Graph

421 Commits

Author SHA1 Message Date
Dillon d6361867ac Quick test 2023-06-17 06:40:47 +08:00
omair saleh e3fb4d2dbe Merge branch 'dillon/accounting-bank-mapping' into 'development' 
Dillon/accounting bank mapping

See merge request CIEFWorldwideSdnBhd/exchange-2.0!138
 2023-06-13 16:58:15 +00:00
Omair Saleh 885444cb97 Merge remote-tracking branch 'origin/dillon/accounting-bank-mapping' into dillon/accounting-bank-mapping 2023-06-14 00:54:33 +08:00
Omair Saleh 4167f28be2 show status of transaction 2023-06-14 00:54:15 +08:00
Dillon 715af173a2 Merge branch 'dillon/jenkins-aws-s3-34' into development 2023-06-08 08:57:39 +08:00
Dillon 361ea9719f Revert previous testing code 2023-06-08 08:56:18 +08:00
Dillon c29bf79b0b Merge branch 'dillon/jenkins-aws-s3-34' into development 2023-06-04 20:55:30 +08:00
Dillon 5cab357805 Testing of csrf 2023-06-04 20:54:25 +08:00
edmondlang 3bc3e10ddc Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-06-03 19:20:53 +08:00
edmondlang dc5b96403c update email payment proof 2023-06-03 19:02:41 +08:00
edmondlang 920b994b36 Merge branch 'send-email-payment-proof' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	routes/web.php
 2023-06-03 15:49:16 +08:00
edmondlang 6b73f31993 email payment proof 2023-06-03 15:48:33 +08:00
Dillon d98685f867 Merge branch 'dillon/voucherify-35' into development 2023-06-01 17:40:48 +08:00
Dillon eb8dfea254 Update voucher details into pdfs i.e invoice, purchase order, delivery order 2023-06-01 17:40:13 +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
edmondlang 38fc12e86b Merge branch 'register-honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/Modules/Accounts/ControllersLogic/CreateCustomerLogic.php
 2023-05-31 08:25:06 +08:00
edmondlang 4bd28e3cca add company id in support 2023-05-30 19:38:45 +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
edmondlang 2880aed0f6 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-10 13:38:56 +08:00
edmondlang 2033842d6c only admin and upload honey trap csv 2023-05-10 10:43:48 +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 d315c47bca upload-honey-trap 2023-05-10 01:41:30 +08:00
edmondlang 526c5694fa bulk import honey trap 2023-05-09 16:01:17 +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 81f26e7041 reject statement transaction mapping api 2023-04-20 17:11:50 +08:00
omair saleh 4de455dfbb Merge branch 'dillon/accounting-bank-mapping' into 'development' 
fix duplicated listing section bug

See merge request CIEFWorldwideSdnBhd/exchange-2.0!133
 2023-04-18 09:18:15 +00:00
Omair Saleh b94d50325c fix duplicated listing section bug 2023-04-18 17:16:11 +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 b97170378d Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-30 16:03:43 +08:00
edmondlang 2139a4ea0b change admin role type 2023-03-30 16:02:39 +08:00
edmondlang b1588aa9c7 Merge branch 'honey-trap' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-20 23:18:38 +08:00
edmondlang e29109b834 update honey trap with search 2023-03-20 23:14:56 +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 897cb245f3 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-03-11 18:50:28 +08:00
edmondlang c99076ece1 fix bug after fpx top up, redirect to not found page 2023-03-11 18:48:15 +08:00
edmondlang bde228af89 Merge branch 'rate-history-refactored' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-02-19 21:16:58 +08:00
sharifcse57 1f461a750f working with plotting the rate history group by payment type 2023-02-17 14:25:18 +06: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 3a7ac7efb8 rate history module 2023-02-11 16:37:01 +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 9e8b58e9ca customer support interface 2023-01-24 06:22:23 +08:00
Omair Saleh 0e823da1b2 customer support interface 2023-01-24 06:21:02 +08:00
Omair Saleh ac9b5ffc1f customer support interface 2023-01-24 06:20:34 +08:00