 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
|
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
|
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 |
|
|
Dillon
|
eaf7ce4b67
|
Insert logs for debugging purpose on production
|
2023-03-29 22:16:24 +08:00 |
|
|
Dillon Ngo
|
12cf0c541b
|
Merge branch 'dillon/crm-create-task-3-26' into 'master'
New merge request From dillon/crm-create-task-3-26 into master
See merge request CIEFWorldwideSdnBhd/exchange-2.0!128
|
2023-03-28 15:54:34 +00:00 |
|
|
Dillon
|
69072c6b38
|
Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-28 23:29:30 +08:00 |
|
|
Dillon
|
530061cefd
|
Merge branch 'dillon/crm-create-task-3-26' into development
|
2023-03-28 23:28:55 +08:00 |
|
|
Dillon
|
42290b83a4
|
Trying to fix a problem when user billing address not yet setup
|
2023-03-28 23:28:24 +08:00 |
|
|
edmondlang
|
8a9edd6b5b
|
Merge branch '1688-tnc' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-28 12:23:13 +08:00 |
|
|
edmondlang
|
245f647e6f
|
update 1688 tnc
|
2023-03-28 12:22:51 +08:00 |
|
|
edmondlang
|
446f78eb2c
|
Merge branch '1688-tnc' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-03-28 11:16:25 +08:00 |
|
|
edmondlang
|
ee28f13cbe
|
1688 tnc
|
2023-03-28 11:16:03 +08:00 |
|
|
DESKTOP-5I7S92L\nicho
|
d867421901
|
1688 tnc
|
2023-03-27 16:27:47 +08:00 |
|
|
Dillon
|
1c35cde3e3
|
Merge branch 'dillon/crm-create-task-3-26' into development
|
2023-03-25 14:18:29 +08:00 |
|
|
Dillon
|
d24cb38247
|
Fix another error from production logs
|
2023-03-25 14:17:43 +08:00 |
|
|
Dillon
|
74e5fcd7ca
|
Merge branch 'dillon/crm-create-task-3-26' into development
|
2023-03-25 08:59:59 +08:00 |
|
|
Dillon
|
2ef853cc62
|
Template update
|
2023-03-25 08:59:53 +08:00 |
|
|
Dillon
|
dc363ad466
|
Merge branch 'dillon/crm-create-task-3-26' into development
|
2023-03-25 02:16:51 +08:00 |
|
|
Dillon
|
3cac5d20a8
|
Minor fixes
|
2023-03-25 02:16:38 +08:00 |
|
|
Dillon
|
6512ba8f4d
|
Merge branch 'dillon/crm-create-task-3-26' into development
|
2023-03-25 02:07:58 +08:00 |
|
|
Dillon
|
b7487394d2
|
Minor fixes and cleanup
|
2023-03-25 02:07:44 +08:00 |
|
|
Dillon
|
a481b4a789
|
Merge branch 'dillon/crm-create-task-3-26' into development
|
2023-03-24 15:16:28 +08:00 |
|
|
Dillon
|
58bdfaaee7
|
minor code streamline from shipping portal
|
2023-03-24 15:16:21 +08:00 |
|
|
Dillon
|
4cb70bbe5a
|
Merge branch 'dillon/crm-create-task-3-26' into development
|
2023-03-24 03:17:34 +08:00 |
|
|
Dillon
|
be4111196e
|
CRM Task with dynamic data
|
2023-03-24 03:13:18 +08:00 |
|
|
Dillon
|
74c7084364
|
Merge branch 'dillon/crm-create-task-3-26' into development
|
2023-03-23 04:32:02 +08:00 |
|