Commit Graph

10 Commits

Author SHA1 Message Date
edmondlang e3e4b490b0 Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui
# Conflicts:
#	resources/views/partials/header.blade.php
#	routes/web.php
2022-02-04 22:22:07 +08:00
ahmedsophyudden b4c1a2e333 Merge branch 'task/EXC-353' into development 2021-11-08 16:15:05 +08:00
ahmedsophyudden 39a8ac83b2 Merge branch 'online-payment-billplz-integration' into development 2021-11-08 09:43:09 +08:00
glovetleong c907903244 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into task/EXC-353
# Conflicts:
#	app/Models/Company.php
2021-10-25 21:43:55 +08:00
glovetleong 2ffefc03bb fix MorphMany transaction 2021-10-22 14:47:01 +08:00
omair saleh f5d7da493c fix bug with balance payment by rounding up to 2 decimal 2021-10-11 16:33:21 +08:00
ahmedsophyudden 223caa2c33 integrate create billplz bill with create booking payment, and a new billplz callback url 2021-10-07 11:00:50 +08:00
ahmedsophyudden fb84e47d43 integrate create billplz bill with create booking payment, and a new billplz callback url 2021-10-04 15:09:36 +08:00
omair saleh 192d07e3a0 fixing bugs 2021-03-22 04:16:57 +08:00
omair saleh 05401f6bbc large commit 2021-03-11 13:06:40 +08:00