 edmondlang
|
d9c8db4e40
|
Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-19 23:34:02 +08:00 |
|
|
edmondlang
|
b6b736a581
|
revert
|
2023-04-19 23:33:43 +08:00 |
|
|
edmondlang
|
50b538e3b9
|
update modal to approve match and reject match
|
2023-04-19 23:31:15 +08:00 |
|
|
edmondlang
|
89c69771fa
|
update modal to approve match and reject match
|
2023-04-19 23:28:55 +08:00 |
|
|
edmondlang
|
22b0ebbe5d
|
update modal to approve match and reject match
|
2023-04-19 23:14:56 +08:00 |
|
|
edmondlang
|
6a80d4cbe5
|
update modal to approve match and reject match
|
2023-04-19 23:01:15 +08:00 |
|
|
edmondlang
|
ae4b826f1e
|
update modal to approve match and reject match
|
2023-04-19 22:58:46 +08:00 |
|
|
edmondlang
|
74c3f6a6d3
|
update modal to approve match and reject match
|
2023-04-19 22:57:15 +08:00 |
|
|
edmondlang
|
9e865ea5b2
|
update modal to approve match and reject match
|
2023-04-19 22:51:52 +08:00 |
|
|
edmondlang
|
082c9de572
|
reverse commit
|
2023-04-19 22:47:45 +08:00 |
|
|
edmondlang
|
011e993cfd
|
update modal to approve match and reject match
|
2023-04-19 22:39:39 +08:00 |
|
|
edmondlang
|
5f8fa00853
|
update modal to approve match and reject match
|
2023-04-19 22:32:44 +08:00 |
|
|
edmondlang
|
069c98983d
|
Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-19 22:22:14 +08:00 |
|
|
edmondlang
|
6dbdb0a1d6
|
modal to approve match and reject match
|
2023-04-19 22:21:53 +08:00 |
|
|
edmondlang
|
db4ad2c05f
|
Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-19 21:03:22 +08:00 |
|
|
edmondlang
|
44ddcebced
|
modal to approve match and reject match
|
2023-04-19 21:02:52 +08:00 |
|
|
edmondlang
|
b54f901e4d
|
Merge branch 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-19 18:59:21 +08:00 |
|
|
edmondlang
|
7cb88cb486
|
modal to approve match and reject match
|
2023-04-19 18:59:00 +08:00 |
|
|
edmondlang
|
36fa0e1080
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-19 13:26:32 +08:00 |
|
|
edmondlang
|
204068d864
|
fix bug date error in update announcement function in settings page
|
2023-04-19 13:26:06 +08:00 |
|
 Omair Saleh
|
83e883abb9
|
fix duplicated listing section bug
|
2023-04-18 17:23:27 +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 |
|
|
edmondlang
|
bf2528d98a
|
update delete booking controller
|
2023-04-18 13:50:26 +08:00 |
|
|
omair saleh
|
ddd218cf4e
|
Merge branch 'dillon/accounting-bank-mapping' into 'development'
fix and update the functionality and the ui for accounting automation
See merge request CIEFWorldwideSdnBhd/exchange-2.0!132
|
2023-04-18 04:10:20 +00: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 Ngo
|
9c1b470ea1
|
Merge branch 'dillon/improvement-1' into 'master'
Reduce flooding of logs from Perfex CRM
See merge request CIEFWorldwideSdnBhd/exchange-2.0!131
|
2023-04-15 13:07:15 +00:00 |
|
 Dillon
|
3e78b68ff2
|
Merge branch 'dillon/improvement-1' into development
|
2023-04-15 20:58:56 +08:00 |
|
|
Dillon
|
c1b53973e5
|
Reduce flooding of logs from Perfex CRM
|
2023-04-15 20:58:21 +08:00 |
|
|
Dillon
|
c6b14b11c6
|
Merge branch 'dillon/accounting-bank-mapping' into development
|
2023-04-12 05:22:13 +08:00 |
|
|
Dillon
|
aa8d766b54
|
Minor update
|
2023-04-12 05:22:05 +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 |
|
|
edmondlang
|
2b174e42c7
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-10 22:33:34 +08:00 |
|
|
edmondlang
|
5bd221050c
|
remove console.log
|
2023-04-10 22:33:04 +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 |
|
|
Dillon Ngo
|
cfec4c58b2
|
Merge branch 'dillon/debug-and-fixes-2-29' into 'master'
New merge request From dillon/debug-and-fixes-2-29 into master
See merge request CIEFWorldwideSdnBhd/exchange-2.0!130
|
2023-04-01 16:25:23 +00:00 |
|
|
Dillon
|
d844cf64a4
|
Merge branch 'dillon/debug-and-fixes-2-29' into development
|
2023-03-31 17:43:37 +08:00 |
|
|
Dillon
|
a3a1c912a3
|
Minor code amendment
|
2023-03-31 17:43:22 +08:00 |
|
|
Dillon
|
f295cbb9f4
|
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-31 00:18:04 +08:00 |
|
|
Dillon
|
214ae61362
|
Merge branch 'dillon/debug-and-fixes-2-29' into development
|
2023-03-31 00:17:48 +08:00 |
|
|
Dillon
|
1f3e1d32a1
|
Sync code changes from Shipping Portal + Fix a problem related to activating 1688 service
|
2023-03-31 00:17:21 +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
|
749c6e0bef
|
Merge branch 'change-admin-role-type' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0
|
2023-03-30 16:02:56 +08:00 |
|
|
edmondlang
|
2139a4ea0b
|
change admin role type
|
2023-03-30 16:02:39 +08:00 |
|
 DESKTOP-5I7S92L\nicho
|
dfe659084d
|
change admin role type
|
2023-03-30 15:52:45 +08:00 |
|
|
Dillon Ngo
|
800e743fd6
|
Merge branch 'dillon/debug-and-fixes-2-29' into 'master'
New merge request From dillon/debug-and-fixes-2-29 into master
See merge request CIEFWorldwideSdnBhd/exchange-2.0!129
|
2023-03-29 14:18:46 +00:00 |
|