Commit Graph

132 Commits

Author SHA1 Message Date
omair saleh 0fe4b6d3e3 fix duplicated bill plz problem 2022-01-22 14:18:04 +08:00
omair saleh ec4ef36cce fix duplicated bill plz problem 2022-01-22 13:59:55 +08:00
omair saleh 0d2b2af6d5 fix duplicated bill plz problem 2022-01-22 13:57:45 +08:00
omair saleh 2293ab1c16 update customer reports 2021-12-23 14:41:04 +08:00
omair saleh 6b21e162b6 Merge branch 'development' into 'master'
base_portal.blade

See merge request CIEFWorldwideSdnBhd/exchange-2.0!70
2021-12-23 03:56:10 +00:00
omair saleh c577ab1779 update urgent list show 1688 banks 2021-12-22 19:01:44 +08:00
omair saleh 06d7ae9874 add new customers list 2021-12-22 16:57:24 +08:00
omair saleh a71136db16 add new customers list 2021-12-22 16:53:59 +08:00
glovetleong 44ed2f55e9 delete transaction 2021-12-22 14:22:38 +08:00
omair saleh 5eee532ff7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Http/Resources/TransactionResource.php
#	resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
#	routes/web.php
2021-12-21 19:42:28 +08:00
omair saleh fc796a9bb8 update billplz to production 2021-12-21 12:57:42 +08:00
edmondlang db83ac4ca9 update address for invoice, proforma Invoice, purchase order, delivery order when user update their address 2021-12-16 18:12:05 +08:00
omair saleh 71b7ee8726 fix missing payment history bug 2021-12-04 15:07:58 +08:00
omair saleh ac2b2df27d show currency supplier info for transaction 2021-11-29 12:27:14 +08:00
omair saleh 2093f68cf0 show currency supplier info for transaction 2021-11-29 12:26:58 +08:00
omair saleh 0a106960ad show currency supplier info for transaction 2021-11-29 12:21:03 +08:00
omair saleh e6ada6b2d4 show currency supplier info for transaction 2021-11-29 12:20:00 +08:00
omair saleh 7fcc08abf4 performa invoice 2021-11-29 11:16:39 +08:00
edmondlang fb4d17b46f rename performa to proforma 2021-11-28 21:10:46 +08:00
edmondlang bcbb3f53f6 create proforma invoice transaction 2021-11-28 20:51:30 +08:00
omair saleh fc7ad2bb09 performa invoice 2021-11-28 16:35:35 +08:00
edmondlang 2153774cde Merge branch 'change-booking-price' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2021-11-25 15:20:34 +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 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 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
edmondlang 87614bdcec tidy up change booking price 2021-11-05 12:24:00 +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 9b5e667a40 fix company employee bug 2021-10-18 12:27:23 +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 d7bbb6a65e separate customers list in a new page 2021-10-09 13:44:33 +08:00
omair saleh 04b1388cc2 show company total payments 2021-10-09 11:29:38 +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
omair saleh 3acde619cc add destination account admin user 2021-10-03 15:06:08 +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 cc93b5f03e create billplz create bill api 2021-09-27 11:00:34 +08:00
omair saleh 6733778edf fix change email module 2021-09-24 13:38:12 +08:00
omair saleh b7f23b5f93 fix change email module 2021-09-24 13:31:34 +08:00
Haziq Danial 6c39bc780b added update email controller and logic 2021-09-11 13:15:25 +08:00
ahmedsophyudden 67a0a63b9b edit booking quotation calculation for partial refund request 2021-09-05 20:27:41 +08:00
omair saleh ba8837f3a1 Merge branch 'credit-note-request-refund' into 'master'
Credit note request refund

See merge request CIEFWorldwideSdnBhd/exchange-2.0!60
2021-09-01 09:00:33 +00:00