Commit Graph

692 Commits

Author SHA1 Message Date
omair saleh 9d6ec0cd5c fix payment gateway & add regenerate invoices button 2021-11-21 23:38:22 +08:00
omair saleh d1f7068002 fix payment gateway & add regenerate invoices button 2021-11-21 23:38:04 +08:00
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 6ec96ddbf5 Merge branch 'wallet-ui' into 'development'
wallet-ui

See merge request CIEFWorldwideSdnBhd/exchange-2.0!64
2021-11-19 05:20:26 +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
edmondlang a0df6a33c9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui 2021-11-10 23:14:49 +08:00
edmondlang ca556c8229 Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui 2021-11-10 22:43:32 +08:00
edmondlang 02fe4e0785 Merge branch 'online-payment-ui' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui 2021-11-08 20:54:16 +08:00
ahmedsophyudden b4c1a2e333 Merge branch 'task/EXC-353' into development 2021-11-08 16:15:05 +08:00
omair saleh 5883a3d8c1 update responsiveness for account admin 2021-11-08 12:03:38 +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
ahmedsophyudden ca76b2a861 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 2021-11-04 23:01:45 +08:00
glovetleong 70f95f511d transaction status downgrade 2021-10-27 14:22:32 +08:00
glovetleong beed76c407 company transactions owner_id 2021-10-26 22:04:19 +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 426e53d595 change invoice and purchase order document date to booking date 2021-10-18 14:14:47 +08:00
omair saleh c4195fd4e8 change invoice and purchase order document date to booking date 2021-10-18 12:46:16 +08:00
omair saleh 1c8ea59858 change invoice and purchase order document date to booking date 2021-10-18 12:39:27 +08:00
omair saleh 9b5e667a40 fix company employee bug 2021-10-18 12:27:23 +08:00
ahmedsophyudden 566975c47b Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 2021-10-17 15:48:40 +08:00
ahmedsophyudden 5e0799687f added billplz_redirect.blade sample page 2021-10-15 19:20:55 +08:00
omair saleh 62747d7b8f show purchase order total in 3 decimals 2021-10-13 10:55:02 +08:00
omair saleh ee33276214 show purchase order total in 3 decimals 2021-10-13 10:53:34 +08:00
omair saleh f45916ea62 show purchase order total in 3 decimals 2021-10-13 10:51:31 +08:00
omair saleh 0e0c494e98 debug purchase order 2021-10-13 10:50:33 +08:00
omair saleh 4bbcb22bba debug purchase order 2021-10-13 10:47:41 +08:00
omair saleh 261f1ec1b8 debug purchase order 2021-10-13 10:46:34 +08:00
omair saleh 936422aba7 debug purchase order 2021-10-13 10:45:26 +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
omair saleh fd99a7863b separate customers list in a new page 2021-10-10 12:51:33 +08:00
omair saleh 69f12cf9fa separate customers list in a new page 2021-10-10 12:50:12 +08:00
omair saleh 431c8e31ee separate customers list in a new page 2021-10-10 12:47:08 +08:00
omair saleh ddc02a6a5b separate customers list in a new page 2021-10-10 12:34:09 +08:00
omair saleh 55ff400759 separate customers list in a new page 2021-10-09 14:11:33 +08:00
omair saleh 292571ad67 separate customers list in a new page 2021-10-09 13:48:15 +08:00
omair saleh dc9515fbe2 separate customers list in a new page 2021-10-09 13:47:47 +08:00
omair saleh cde147ab6f separate customers list in a new page 2021-10-09 13:45:46 +08:00
omair saleh d7bbb6a65e separate customers list in a new page 2021-10-09 13:44:33 +08:00
omair saleh 66f0981b38 sort customers by total payments 2021-10-09 12:42:25 +08:00