Commit Graph

238 Commits

Author SHA1 Message Date
omair saleh 49c4362ba1 fix payment gateway & add regenerate invoices button 2021-11-21 23:30:59 +08:00
omair saleh 419f3ca88b Merge branch 'regenerate-invoice' into 'development'
regenerate booking invoice

See merge request CIEFWorldwideSdnBhd/exchange-2.0!65
2021-11-19 05:52:54 +00:00
omair saleh 6b6ac591a0 Merge branch 'development' into 'wallet-ui'
# Conflicts:
#   app/Classes/Modules/Bookings/ControllersLogic/CreateBookingRefundLogic.php
2021-11-19 05:20:18 +00:00
edmondlang 5f5b7cf119 wallet-ui
request refund
online-transfer (payment gateway)
2021-11-17 02:27:25 +08:00
ahmedsophyudden cdc9ef449b Refund API - Booking Resources' include refund data, prevent unlimited refund 2021-11-16 09:56:17 +08:00
ahmedsophyudden b4c1a2e333 Merge branch 'task/EXC-353' into development 2021-11-08 16:15:05 +08:00
ahmedsophyudden 9459c8fa3a update TransactionObject getPaymentReference return data type to allow null 2021-11-08 10:20:58 +08:00
ahmedsophyudden 39a8ac83b2 Merge branch 'online-payment-billplz-integration' into development 2021-11-08 09:43:09 +08:00
ahmedsophyudden f12f538884 Merge branch 'payment-refund' into development 2021-11-08 09:33:50 +08:00
glovetleong 70f95f511d transaction status downgrade 2021-10-27 14:22:32 +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
glovetleong 30884201bd regenerate booking invoice 2021-10-19 21:51:47 +08:00
omair saleh 481e7cd64b debug purchase order 2021-10-13 10:44:09 +08:00
omair saleh b7e3855d76 debug purchase order 2021-10-13 10:42:30 +08:00
omair saleh 1ee7e637f2 debug purchase order 2021-10-13 10:40:44 +08:00
omair saleh 7def78eacf fix bug with balance payment by rounding up to 2 decimal 2021-10-11 16:33:59 +08:00
omair saleh f5d7da493c fix bug with balance payment by rounding up to 2 decimal 2021-10-11 16:33:21 +08:00
Fairuz 004e56cd2e Wallet approval / reject 2021-10-08 21:56:37 +08:00
ahmedsophyudden 7dbe51bda9 integrate create billplz bill with create booking payment, and a new billplz callback url 2021-10-08 10:31:23 +08:00
Fairuz d56442e6ff Wallet operations 2021-10-07 21:15:29 +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 9861c62c14 integrate create billplz bill with create booking payment, and a new billplz callback url 2021-10-07 10:49:54 +08:00
Fairuz e94ef44928 Wallet operations 2021-10-07 01:34:11 +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
ahmedsophyudden 376d2dd686 Merge branch 'payment-refund' into online-payment-billplz-integration 2021-10-02 10:35:41 +08:00
ahmedsophyudden 9bc673ab01 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into online-payment-billplz-integration 2021-10-02 09:40:43 +08:00
ahmedsophyudden 5a65aa51f4 update input in CreateBillplzBillLogic 2021-09-29 09:29:22 +08:00
omair saleh 7282c24ee0 clean up add new member logic 2021-09-28 19:02:52 +08:00
ahmedsophyudden cc93b5f03e create billplz create bill api 2021-09-27 11:00:34 +08:00
omair saleh 61605c8efa fix booking rate average bug 2021-09-24 18:11:34 +08:00
omair saleh b7f23b5f93 fix change email module 2021-09-24 13:31:34 +08:00
omair saleh f244203130 Merge branch 'change-email-address-ui' into 'master'
change email address ui,

See merge request CIEFWorldwideSdnBhd/exchange-2.0!62
2021-09-14 03:47:25 +00:00
omair saleh fc78a6cbd8 Merge branch 'invoice-add-adjusment-and-fix-calculate-booking-rate' into 'master'
-created data on OP

See merge request CIEFWorldwideSdnBhd/exchange-2.0!61
2021-09-14 03:46:21 +00:00
Haziq Danial 6c39bc780b added update email controller and logic 2021-09-11 13:15:25 +08:00
ahmedsophyudden fa4042ecff edit refund calculation to correct formulat 2021-09-08 23:41:56 +08:00
omair saleh da35d80fbe debug invoice 2021-09-06 17:41:24 +08:00
omair saleh fa6aab7df0 debug invoice 2021-09-06 17:37:20 +08:00
omair saleh 007ae648e6 debug invoice 2021-09-06 17:34:30 +08:00
omair saleh ce20fd0d6a debug invoice 2021-09-06 17:33:36 +08:00
omair saleh 8ce3bf85d8 debug invoice 2021-09-06 17:30:29 +08:00
omair saleh c28c5fc545 debug invoice 2021-09-06 17:29:35 +08:00
omair saleh 6750dfefde debug invoice 2021-09-06 17:26:01 +08:00
omair saleh 9881a19927 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 2021-09-06 17:24:49 +08:00
omair saleh af083bb707 debug invoice 2021-09-06 17:24:21 +08:00
fuadzaidan7 165d80537e Signed-off-by: fuadzaidan7 <fuadzaidan7@gmail.com> 2021-09-06 13:34:14 +08:00
ahmedsophyudden 1c4669a857 add partial refund credit note flow 2021-09-06 09:21:56 +08:00
ahmedsophyudden 2b167b1950 add partial refund credit note flow 2021-09-05 22:52:33 +08:00
ahmedsophyudden 67a0a63b9b edit booking quotation calculation for partial refund request 2021-09-05 20:27:41 +08:00
ahmedsophyudden 4b5f64ca9b add booking quotation calculation for partial refund request 2021-09-05 12:18:08 +08:00