 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
|
69d3d8426d
|
Merge branch 'disable-enter-myr' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-04-28 12:31:45 +08:00 |
|
 Omair Saleh
|
1b91937e70
|
fill up po calculation
|
2023-04-27 18:31:20 +08:00 |
|
|
Omair Saleh
|
0e7f9f86f0
|
fill up po calculation
|
2023-04-27 18:18:36 +08:00 |
|
|
Omair Saleh
|
0886e09dc1
|
fill up po calculation
|
2023-04-27 18:17:39 +08:00 |
|
|
Omair Saleh
|
59bcb3f0f9
|
fill up po calculation
|
2023-04-27 16:42:41 +08:00 |
|
|
Omair Saleh
|
aa24d96c92
|
fill up po calculation
|
2023-04-27 16:40:47 +08:00 |
|
|
edmondlang
|
fd5dc7b1c2
|
debug wallet audit
|
2023-04-26 12:01:21 +08:00 |
|
|
edmondlang
|
344fac9e50
|
debug wallet audit
|
2023-04-26 11:59:44 +08:00 |
|
|
edmondlang
|
52a55e32c8
|
debug wallet audit
|
2023-04-26 11:46:56 +08:00 |
|
|
edmondlang
|
935c31ce33
|
debug wallet audit
|
2023-04-26 11:44:12 +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 |
|
|
Omair Saleh
|
0a87e92f59
|
import bank record
|
2023-03-13 01:06:29 +08:00 |
|
|
Dillon
|
d3450a900a
|
Merge branch 'dillon/crm-create-task' into development
|
2023-03-01 12:35:27 +08:00 |
|
|
Omair Saleh
|
7d0b3adbf8
|
add customisation for suppliers pi export
|
2023-02-24 17:31:27 +08:00 |
|
|
Omair Saleh
|
35ca254cac
|
add customisation for suppliers pi export
|
2023-02-24 16:45:49 +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
|
7f8d60ff57
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into rate-history-refactored
|
2023-02-16 23:16:29 +08:00 |
|
|
edmondlang
|
8fafbf8cd9
|
Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-02-15 22:57:28 +08:00 |
|
|
Omair Saleh
|
61c02c0806
|
update customer's account
|
2023-02-15 16:05:11 +08:00 |
|
|
edmondlang
|
3a7ac7efb8
|
rate history module
|
2023-02-11 16:37:01 +08:00 |
|
|
edmondlang
|
7d29cc7255
|
Merge branch 'update-laravel-mpdf' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-02-10 22:13:22 +08:00 |
|
|
edmondlang
|
4e511e2f01
|
update laravel mpdf
|
2023-02-09 22:56:55 +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
|
c484173936
|
customer support interface
|
2023-01-24 05:08:38 +08:00 |
|
|
Omair Saleh
|
c0d8744da0
|
customer support interface
|
2023-01-24 04:26:14 +08:00 |
|
|
Omair Saleh
|
f8de28e129
|
customer support interface
|
2023-01-24 04:22:49 +08:00 |
|
|
Omair Saleh
|
c9231c9a3f
|
customer support interface
|
2023-01-24 04:20:09 +08:00 |
|
|
Omair Saleh
|
17b76dc8e3
|
customer support interface
|
2023-01-24 04:18:01 +08:00 |
|
|
edmondlang
|
82eedbcc2e
|
Merge branch 'activity-route-log' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
|
2023-01-04 22:17:39 +08:00 |
|
|
Omair Saleh
|
b120d44e86
|
fix refunded bookings
|
2022-11-24 22:50:09 +08:00 |
|
|
Omair Saleh
|
9fde5db903
|
fix refunded bookings
|
2022-11-24 22:44:45 +08:00 |
|
|
Omair Saleh
|
5964342db5
|
fix refunded bookings
|
2022-11-24 22:43:34 +08:00 |
|
|
Omair Saleh
|
84c8f238fe
|
fix refunded bookings
|
2022-11-24 22:36:41 +08:00 |
|
|
Omair Saleh
|
3468864687
|
fix refunded bookings
|
2022-11-24 22:33:34 +08:00 |
|
|
Omair Saleh
|
a4b22f92d1
|
fix refunded bookings
|
2022-11-24 22:31:55 +08:00 |
|
|
Omair Saleh
|
f683f76981
|
fix refunded bookings
|
2022-11-24 22:30:39 +08:00 |
|
|
Omair Saleh
|
ebfcce83ad
|
fix refunded bookings
|
2022-11-24 22:28:45 +08:00 |
|
|
omair saleh
|
d14812b5c4
|
show wallets with negative amounts in wallet audit
|
2022-11-11 15:56:54 +08:00 |
|
|
omair saleh
|
2931246e77
|
show wallets with negative amounts in wallet audit
|
2022-11-11 15:56:15 +08:00 |
|