Commit Graph

154 Commits

Author SHA1 Message Date
glovetleong 6d624d3196 export and import 2022-03-02 09:54:12 +08:00
glovetleong ae392dd052 debtor 2022-02-21 08:57:39 +08:00
omair saleh f83ac7e230 fix bill seeder 2022-02-18 10:26:34 +08:00
omair saleh 5156d0d033 fix bill seeder 2022-02-18 10:19:28 +08:00
omair saleh 1e2b039ba8 fix bill seeder 2022-02-18 09:53:10 +08:00
omair saleh aa3d50e125 fix bill seeder 2022-02-18 09:47:30 +08:00
omair saleh 66f2339788 Merge branch 'development' into 'transaction_bill_owner'
# Conflicts:
#   app/Http/Resources/TransactionResource.php
2022-02-17 12:19:54 +00:00
edmondlang 61eda2291a add back missing codes from - update payment and billings documents 2022-02-15 23:56:34 +08:00
omair saleh cee0f99dc9 clean up wallet 2022-02-10 10:50:17 +08:00
omair saleh 1585dcfa5a clean up wallet 2022-02-10 10:28:26 +08:00
omair saleh 4ac7a1b004 wallet batch polishing 2022-02-06 23:55:28 +08:00
omair saleh 3459667f76 wallet batch polishing 2022-02-06 21:51:57 +08:00
edmondlang c52621c405 Merge branch 'wallet-ui' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-up-with-api
# Conflicts:
#	resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
#	routes/web.php
2022-02-05 21:39:31 +08:00
edmondlang a5c96f4e89 implement api wallets for customer 2022-02-05 18:02:36 +08:00
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
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
glovetleong f56369d707 transaction bill 2022-01-13 22:49:02 +08:00
omair saleh 0f18dcf117 fix route name for xpo generator controller 2022-01-12 15:28:11 +08:00
glovetleong 2b150e9a75 created at 2022-01-10 14:41:49 +08:00
glovetleong 8305b66e83 auto generate product list 2022-01-09 22:40:41 +08:00
Leong Chee Siong 92691c49b0 Merge branch 'bill_transaction_status_update' into 'development'
bill transaction status update

See merge request CIEFWorldwideSdnBhd/exchange-2.0!71
2021-12-27 02:59:58 +00:00
glovetleong f9db00356b bill transaction status update 2021-12-23 21:57:08 +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 19588f4cba Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui
# Conflicts:
#	app/Http/Resources/TransactionResource.php
#	routes/web.php
2021-12-16 20:22:15 +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