omair/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/uldvstar/exchange-2.0.git synced 2026-08-19 20:44:25 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,630 Commits 23 Branches 0 Tags
unit_test
Commit Graph

76 Commits

Author SHA1 Message Date
omair saleh c9fca28c49 Merge remote-tracking branch 'origin/development' into development 
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
 2022-05-03 13:40:03 +08:00
omair saleh b62ba94e41 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 
# Conflicts:
#	app/Classes/ValueObjects/Constants/TransactionType.php
 2022-05-03 13:39:05 +08:00
omair saleh 060ae247f0 debug export booking analytics 2022-05-03 13:20:29 +08:00
edmondlang ff1a8bda57 Merge branch 'delete-group-transaction' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:04:16 +08:00
edmondlang f28f6f003a Merge branch 'notification-ui' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-04-18 00:04:04 +08:00
edmondlang 29b1f87966 move notification API and UI from shipping portal 2022-04-16 23:53:12 +08:00
edmondlang 5647957e9f delete group transaction 2022-04-10 21:31:20 +08:00
glovetleong 4deb5845e3 bank log 2022-04-03 23:32:50 +08:00
glovetleong 0d4e396a54 group transaction 2022-03-22 14:59:17 +08:00
omair saleh da7271dddf fix transaction model duplicated methods 2022-03-01 09:36:36 +08:00
ahmedsophyudden e6ecf74379 Merge branch 'add-transaction-service-charge' into development 2022-02-28 22:50:13 +08:00
ahmedsophyudden af3ff46a20 Grab service charge from setting for calculate supplier transaction 2022-02-28 22:40:16 +08:00
omair saleh afacab4ff8 fix wallets transaction lists 2022-02-28 11:46:18 +08:00
ahmedsophyudden 592024d462 Create api to get bank account balance by bank id 2022-02-22 11:35:12 +08:00
omair saleh 4434535e96 fix bill seeder 2022-02-22 01:51:23 +08:00
omair saleh 65cc68ba06 fix bill seeder 2022-02-22 01:49:09 +08:00
omair saleh 2d13b299ab fix bill seeder 2022-02-22 01:45:26 +08:00
omair saleh f0bcd868af fix bill seeder 2022-02-22 01:44:20 +08:00
omair saleh 154fca122e fix bill seeder 2022-02-22 01:42:39 +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
omair saleh 3459667f76 wallet batch polishing 2022-02-06 21:51:57 +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
ahmedsophyudden 6a2d0dc2a4 Fixed transfer fee count (status == approve only and deduct credit note) 2022-01-27 22:46:36 +08:00
glovetleong f56369d707 transaction bill 2022-01-13 22:49:02 +08:00
ahmedsophyudden 36c659c84e Transfer Fee Transaction - Company Balance Account API 2022-01-11 23:07:49 +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
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
omair saleh 2093f68cf0 show currency supplier info for transaction 2021-11-29 12:26:58 +08:00
omair saleh e6ada6b2d4 show currency supplier info for transaction 2021-11-29 12:20:00 +08:00
omair saleh 83bf277543 performa invoice 2021-11-28 16:28:53 +08:00
omair saleh 49c4362ba1 fix payment gateway & add regenerate invoices button 2021-11-21 23:30:59 +08:00
ahmedsophyudden cdc9ef449b Refund API - Booking Resources' include refund data, prevent unlimited refund 2021-11-16 09:56:17 +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
omair saleh d7bbb6a65e separate customers list in a new page 2021-10-09 13:44:33 +08:00
omair saleh f94a5389c4 list companies without confirmed payments 2021-10-08 21:59:47 +08:00
Fairuz e94ef44928 Wallet operations 2021-10-07 01:34:11 +08:00
omair saleh 3acde619cc add destination account admin user 2021-10-03 15:06:08 +08:00
ahmedsophyudden 50f2127d42 Refund request - api endpoint for refund request 2021-08-21 21:38:02 +08:00
omair saleh 2cb7e2e3c6 fix duplicated invoices bug 2021-07-16 17:57:37 +08:00
omair saleh 2a9d865745 fix incorrect address format for invoice documents 2021-06-22 15:23:22 +08:00
omair saleh b70a5cdf48 fix incorrect address format for invoice documents 2021-06-22 15:22:23 +08:00
omair saleh fe35dee108 fix incorrect address format for invoice documents 2021-06-22 15:17:13 +08:00
omair saleh 56b5f63adb debug currency order missing holder_name 2021-06-21 13:01:20 +08:00
weichien aaf3385a13 feat: add announcement model with segments relationship. 2021-06-08 13:38:34 +08:00
omair saleh 366a4d87b3 fixing bugs 2021-05-12 05:19:37 +08:00
glovetleong 590021bde9 Invoice Document Amendment 2021-04-29 00:33:25 +08:00