Commit Graph

269 Commits

Author SHA1 Message Date
edmondlang 10e44bbd18 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-30 18:39:34 +08:00
edmondlang 5c5f54e03b delete booking / expire the order payment 2023-10-30 18:39:19 +08:00
Steve Ng 89c777ee49 fixing the structure of export receipt to autocount and import receipt to exchange map failed 2023-10-29 08:46:59 +08:00
Steve Ng 5b681ac8c0 fixing the structure of export receipt to autocount and import receipt to exchange map failed 2023-10-29 08:44:31 +08:00
Steve Ng a6b398a46e fix bug in function import invoices 2023-10-24 21:23:40 +08:00
Steve Ng bc5a8a9193 fix bug in function import invoices 2023-10-24 21:21:51 +08:00
Steve Ng d99f569d7c reduce queue job statement process qty 2023-10-16 20:07:33 +08:00
Steve Ng f943abcacb reduce queue job statement process qty 2023-10-16 20:06:01 +08:00
Steve Ng e18c1f39d0 enhance import invoice mapping conditions 2023-10-16 10:25:35 +08:00
Steve Ng 4ceeb6a317 code for import receipts 2023-10-16 10:25:02 +08:00
Steve Ng 829ea9ad17 enhance import invoice mapping conditions 2023-10-15 22:42:47 +08:00
edmondlang 5b94b87448 Merge branch 'steve/account-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into staging 2023-10-12 18:19:48 +08:00
edmondlang c6747b24cd Merge branch 'bulk-download-white-form' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	routes/web.php
2023-10-12 16:15:10 +08:00
Jia Sheng Lee 3bbc4346c4 bulk download white form and supplier filter 2023-10-12 16:11:34 +08:00
Steve Ng 6599874d47 code for import receipts 2023-10-11 16:45:48 +08:00
Steve Ng d9d3c48e6d code for statement import invoice mapping 2023-10-09 14:28:11 +08:00
Steve Ng 4e29145b50 Merge branch 'steve/mapping-import-invoice' into development 2023-10-06 11:00:59 +08:00
Steve Ng bc5d1eff88 code for statement import invoice mapping 2023-10-06 10:59:36 +08:00
edmondlang 70d9072e26 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-05 12:11:38 +08:00
edmondlang db2384a235 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-10-04 13:02:34 +08:00
Jia Sheng Lee a0f600037b import purchase order function 2023-10-03 22:35:37 +08:00
edmondlang 287ef64d86 Merge branch 'bulk-download-invoices' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2023-09-30 14:24:04 +08:00
edmondlang 62c9b28bc4 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-16 18:10:17 +08:00
edmondlang 6542710ba9 update ui for export Wallet Transaction History 2023-09-16 18:09:11 +08:00
edmondlang 823556b9b5 download wallet transaction history 2023-09-16 16:36:32 +08:00
edmondlang e7a708ef33 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-09-15 01:22:02 +08:00
JiaSheng c374e46834 add functionality to get transactions from production when creating statement transactions owner 2023-09-13 22:03:32 +08:00
JiaSheng 58ae950a71 bulk download invoices 2023-09-08 14:49:39 +08:00
Dillon a264980320 Merge branch 'dillon/41-voucherify-phase-2b' into development 2023-08-26 06:33:35 +08:00
edmondlang abd7a2f072 update upload-honey-trap 2023-08-16 00:57:23 +08:00
edmondlang e7524e8e00 update customer profile 2023-08-09 00:43:26 +08:00
edmondlang e31f1eda53 fix code update customer prrofile 2023-08-06 23:16:20 +08:00
JiaSheng f4e045df5c update profile backend 2023-08-06 10:50:32 +08:00
edmondlang d4bc8c85e0 Merge branch 'credit-note-pdf' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-08-01 23:43:22 +08:00
edmondlang aa6f6a5581 credit note 2023-08-01 01:15:11 +08:00
Dillon 22874b7074 Merge branch 'dillon/38-voucherify-phase-2' into development 2023-07-17 22:29:34 +08:00
Dillon c7927847c4 Voucherify phase 2 2023-07-17 21:29:19 +08:00
edmondlang 487efac69c Merge branches 'development' and 'dillon/accounting-bank-mapping' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-07-07 01:19:32 +08:00
edmondlang 0fd6fa0c3f accounting mapping - export invoice 2023-07-06 01:16:05 +08:00
edmondlang 2bc21a7649 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-06-29 22:12:40 +08:00
edmondlang ed0bcb34c4 list all customer transactions 2023-06-29 21:24:21 +08:00
edmondlang 32b9bfab1c Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into dillon/voucherify-35
# Conflicts:
#	routes/api.php
2023-06-22 23:09:50 +08:00
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
edmondlang 77f533111f accounting mapping api files and calling api, api need to be updated 2023-06-03 23:13:26 +08:00
Dillon f6cbb52bee Merge branch 'dillon/debug-and-fixes-3-36' into dillon/voucherify-35 2023-06-01 21:20:53 +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
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
edmondlang 94b1b045c9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2023-05-30 19:06:47 +08:00
edmondlang f37d775e97 honey trap changes 2023-05-30 19:06:28 +08:00