Commit Graph

600 Commits

Author SHA1 Message Date
glovetleong c34395b2d0 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into unit_test 2022-05-10 23:28:00 +08:00
glovetleong d85bcfe2de register test 2022-05-04 11:54:56 +08:00
omair saleh c9fca28c49 Merge remote-tracking branch 'origin/development' into development
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
2022-05-03 13:40:03 +08:00
omair saleh b62ba94e41 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
2022-05-03 13:39:05 +08:00
omair saleh 860e1314ea debug export booking analytics 2022-05-03 13:27:35 +08:00
omair saleh 060ae247f0 debug export booking analytics 2022-05-03 13:20:29 +08:00
omair saleh 78c2fd6c2d debug export booking analytics 2022-05-03 13:17:35 +08:00
edmondlang 7e791a64b4 update code on export booking analytic data for Hybrid payment method 2022-05-01 23:14:27 +08:00
edmondlang 0004d53901 update code on export analytic booking data for Hybrid paymentMethod 2022-05-01 23:11:38 +08:00
edmondlang 6b97a58ab1 Merge branch 'export-booking-analytic' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-05-01 16:52:18 +08:00
edmondlang 960b46daea export booking analytic 2022-05-01 16:49:57 +08:00
edmondlang bdf2613c5b Merge branch 'export-booking-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-05-01 12:22:01 +08:00
edmondlang 6e1d31159b update export booking transaction add in supplier name 2022-05-01 12:21:31 +08:00
Leong Chee Siong 1d640e5d03 Merge branch 'debtor' into 'development'
no file error

See merge request CIEFWorldwideSdnBhd/exchange-2.0!106
2022-04-29 01:11:14 +00:00
glovetleong 7756726ea8 no file error 2022-04-29 09:09:58 +08:00
edmondlang 134868029a Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Classes/Modules/Exports/Services/ExportsTransactions.php
2022-04-28 19:59:05 +08:00
omair saleh 35bab66df5 update transaction export 2022-04-28 11:38:30 +08:00
omair saleh 2796fafd5b update transaction export 2022-04-28 11:36:58 +08:00
omair saleh 6db687ac99 update transaction export 2022-04-28 11:30:35 +08:00
omair saleh faabd2fe3d update transaction export 2022-04-28 11:26:51 +08:00
omair saleh 53d2d7383e update transaction export 2022-04-28 11:23:12 +08:00
omair saleh faee26fea1 update transaction export 2022-04-28 11:20:40 +08:00
omair saleh 81b03e40b1 update transaction export 2022-04-28 11:19:22 +08:00
omair saleh 4dbfcb3623 update transaction export 2022-04-28 11:13:32 +08:00
omair saleh b2e9a70852 update transaction export 2022-04-28 11:12:49 +08:00
omair saleh b626ae5b05 update transaction export 2022-04-28 11:09:16 +08:00
omair saleh 058d994965 update xpo 2022-04-27 13:25:43 +08:00
edmondlang d9d0c8f9c1 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-26 21:55:57 +08:00
edmondlang e345b019cd Merge branch 'export-booking-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	routes/web.php
2022-04-26 21:55:42 +08:00
Uwais Al-Qarni fce22ab2af Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-26 21:52:53 +08:00
Uwais Al-Qarni 27e25a38f1 refactoring InvoiceTransactionProcessor.php part II 2022-04-26 21:52:42 +08:00
edmondlang 0940b94895 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-26 19:53:29 +08:00
edmondlang dcea71dbf4 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into export-booking-transaction 2022-04-26 19:46:29 +08:00
edmondlang 6a546ea80f export booking transaction 2022-04-26 19:45:30 +08:00
omair saleh 8678ac7b5e push crisp 2022-04-25 15:14:50 +08:00
Uwais Al-Qarni dfa47fae8f change class name of CreateInvoiceDocumentProcessor correctly 2022-04-25 12:02:56 +08:00
ahmedsophyudden 5592634ab4 Merge branch 'development' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-25 08:42:15 +08:00
ahmedsophyudden 4cce57874f Fix bug reference in supplier (Settings Ui & Pending Order Ui & API) 2022-04-25 08:40:46 +08:00
ahmedsophyudden 2e3a94e4f4 Fix bug reference in supplier (Settings Ui & Pending Order Ui & API) 2022-04-25 08:34:40 +08:00
Uwais Al-Qarni 43176438ba Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-24 23:12:25 +08:00
Uwais Al-Qarni 1af96a26ce refactoring invoice transaction processor 2022-04-24 23:12:14 +08:00
Leong Chee Siong dfe6b162ff Merge branch 'debtor' into 'development'
Invoice + PO + DO

See merge request CIEFWorldwideSdnBhd/exchange-2.0!104
2022-04-24 04:25:24 +00:00
glovetleong ac690be428 Invoice + PO + DO
Invoice + PO + DO + SDO
2022-04-24 12:24:01 +08:00
ahmedsophyudden e2faeb4bff Add reference in supplier (Settings Ui & Pending Order Ui & API) 2022-04-23 17:20:07 +08:00
ahmedsophyudden 63ad9abc3c Update supplier's status (front-end & back-end) 2022-04-23 06:52:23 +08:00
edmondlang 29c2344f5a Merge branch 'notification-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-20 23:44:23 +08:00
edmondlang f18d579495 solve bug on ApproveIdentificationDocumentLogic 2022-04-20 23:43:55 +08:00
edmondlang ad723aff01 Merge branch 'updateExportsTransactions' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-19 22:01:58 +08:00
edmondlang cd80b75db6 add marking in ExportsTransactions 2022-04-19 22:00:13 +08:00
edmondlang 7fcce7a2aa Merge branch 'delete-group-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:16:41 +08:00