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,589 Commits 175 Branches 0 Tags
dillon/development
Commit Graph

57 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 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
edmondlang d32476d171 api and web route logs 2023-01-04 22:17:14 +08:00
omair saleh dc992de2fb fix up group transactions bulk purchase orders 2022-07-15 13:08:29 +08:00
omair saleh b9bb6b874b fix up group transactions bulk purchase orders 2022-07-14 01:33:39 +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
glovetleong ae392dd052 debtor 2022-02-21 08:57:39 +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
glovetleong 4adc4a2b36 pull 2021-03-12 15:15:29 +08:00
omair saleh 05401f6bbc large commit 2021-03-11 13:06:40 +08:00
CheeSiong 1dfb75545f List Currency Rate Logic Class 
Fetch Currency Rate Logic Class
 Create Currency Rate Logic Class
 Update Currency Rate Logic Class
Currency Rate Converter Rate
 2020-12-30 08:47:12 +08:00
CheeSiong 3b333ecfba change 2020-12-28 21:41:42 +08:00
weiken.intex 4d8079c7a5 Receipt 2020-12-10 15:08:02 +08:00
omair saleh 9dcc89fb08 Merge branch 'master' into 'booking' 
# Conflicts:
#   app/Classes/Modules/Companies/Services/FetchesCompany.php
#   routes/api.php
 2020-12-08 07:25:11 +00:00
weiken.intex 9ed67e74e2 create Transaction & Transaction Detail 
- Supplier (AP)
	- PO
	- DO
	- INV

- Customer (AR)
	- PO
	- DO
	- INV
 2020-12-07 14:00:24 +08:00
weiken.intex f08a863e2c create Wallet Transaction - integration 2020-12-07 13:59:10 +08:00
omair saleh 5b7148d879 clean up api routes 2020-12-07 10:44:35 +08:00
CheeSiong c3f153fe4b Create Booking Logic Class 
Update Booking Logic Class
 Delete Booking Logic Class
 2020-12-04 09:49:47 +08:00
omair saleh a0e2632b54 change amount in wallet table to 14 digit with 5 decimal places 2020-12-02 16:19:22 +08:00
omair saleh 0772c5d478 changes made to make the code follow our project coding standers to maintain consistency 2020-12-01 12:57:13 +08:00
omair saleh 5d67c400e3 added new column to company table and added the approval status constant file 2020-11-30 21:44:52 +08:00
omair saleh 8fdadf5209 Merge branch 'currency' into 'master' 
Currency

See merge request CIEFWorldwideSdnBhd/exchange-2.0!10
 2020-11-30 13:27:35 +00:00
omair saleh 3d6fab48f9 Merge branch 'company_bank' into 'master' 
Company bank

See merge request CIEFWorldwideSdnBhd/exchange-2.0!9
 2020-11-30 13:27:08 +00:00
changweiken1981 c0314132e7 Ken - Create Company Wallet 2020-11-30 06:38:06 +08:00
CheeSiong dec78bf8d7 Create Currency Logic Class 
Update Currency Selling Logic Class
Delete Currency Selling Logic Class
Create Currency Log Service Class
 2020-11-29 12:39:36 +08:00
CheeSiong aa6f59b86d -Create Company Bank Logic Class 
-Update Company Bank Logic Class
-Delete Company Bank Logic Class
 2020-11-27 11:46:25 +08:00
CheeSiong 83a9cee82d - Add Business Type In Company 
- Seeder CLF Company
- DB Migration 4
 2020-11-24 14:34:41 +08:00
CheeSiong 98b354d6b2 document 2020-11-18 10:37:03 +08:00