omair/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/uldvstar/exchange-2.0.git synced 2026-08-21 13:34:15 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,648 Commits 23 Branches 0 Tags
development
Commit Graph

63 Commits

Author SHA1 Message Date
edmondlang 29b1f87966 move notification API and UI from shipping portal 2022-04-16 23:53:12 +08:00
omair saleh a79cb718d9 debug wallet top up 2022-04-15 14:11:15 +08:00
omair saleh a3f4de7c1a debug wallet top up 2022-04-15 14:06:13 +08:00
omair saleh 72e645c426 add supplier filter to exchange 2022-03-31 13:09:02 +08:00
omair saleh 0d267991a7 filter out pending purchase order without payments 2022-03-27 11:19:07 +08:00
omair saleh 984b3ce9a9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-05 09:47:31 +08:00
omair saleh 58f3d85f8d filter out wallet payment from payment list 2022-03-04 12:50:39 +08:00
omair saleh 1858faef0d Merge remote-tracking branch 'origin/development' into development 
# Conflicts:
#	app/Classes/Modules/Wallets/ControllersLogic/CreditWalletLogic.php
 2022-03-02 21:01:01 +08:00
omair saleh 5da012330b Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2022-03-02 20:58:33 +08:00
Leong Chee Siong 234e2a8c5d Merge branch 'debtor' into 'development' 
Debtor

See merge request CIEFWorldwideSdnBhd/exchange-2.0!87
 2022-03-02 01:57:23 +00:00
glovetleong 6d624d3196 export and import 2022-03-02 09:54:12 +08:00
omair saleh 07d1bbd921 fix billing page 2022-03-02 02:24:54 +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 d5ecd0330e Merge branch 'recency-frequency-monetary' into 'development' 
Recency frequency monetary

See merge request CIEFWorldwideSdnBhd/exchange-2.0!82
 2022-02-27 12:25:26 +00:00
omair saleh ac84484d28 add new filter for owner type 2022-02-25 18:33:33 +08:00
glovetleong efc5811403 filter 2022-02-16 15:09:52 +08:00
omair saleh e8ff49163d clean up wallet 2022-02-09 15:02:48 +08:00
omair saleh 22124c1e6c update booking details ui to be more mobile friendly 2022-02-06 12:29:37 +08:00
omair saleh 2293ab1c16 update customer reports 2021-12-23 14:41:04 +08:00
omair saleh a71136db16 add new customers list 2021-12-22 16:53:59 +08:00
omair saleh 6013a4e94e fix transfers list 2021-12-22 16:15:08 +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 d07d3bcd16 performa invoice 2021-11-29 10:58:18 +08:00
omair saleh f017b30db4 performa invoice 2021-11-28 21:18:35 +08:00
omair saleh f4ae3c3cf2 currency orders page 2021-11-28 13:00:56 +08:00
omair saleh c863d304e8 remove dump errors 2021-11-22 10:15:41 +08:00
omair saleh 49c4362ba1 fix payment gateway & add regenerate invoices button 2021-11-21 23:30:59 +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
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 b3fccad498 sort customers by total payments 2021-10-09 12:41:37 +08:00
omair saleh d380e5f35e list companies without confirmed payments 2021-10-08 22:07:20 +08:00
omair saleh f94a5389c4 list companies without confirmed payments 2021-10-08 21:59:47 +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 fa4042ecff edit refund calculation to correct formulat 2021-09-08 23:41:56 +08:00
omair saleh 3ea234c635 display announcement on customers dashboard 2021-06-17 00:08:14 +08:00
weichien b741ae1f3c fix: query announcement with segment wherein. 2021-06-08 12:53:51 +08:00
LEE WC 5313911117 Merge branch 'master' into '152_annoucment' 
merge master to my working branch

See merge request CIEFWorldwideSdnBhd/exchange-2.0!49
 2021-06-05 14:06:01 +00:00
weichien fe065f4f2f add eloquent filter. 2021-06-05 15:56:56 +08:00
Fairuz 1218a31f2c Added issuer filter for transaction list 2021-05-31 13:26:06 +08:00
Fairuz 4c57620f99 Layout adjust for document viewer 2021-05-31 12:44:46 +08:00
omair saleh df83d2fc7b fixing bugs 2021-05-24 00:59:33 +08:00
Fairuz 9dd0a8d786 EXCHANGE-149, EXCHANGE-156 - Bug fixes, clean-up. Added seeder to create sample transactions 2021-05-15 13:23:23 +08:00
Fairuz 5a55c2c808 EXCHANGE-149 - Backend APIs bug fixes, clean-up 2021-05-12 16:54:22 +08:00
Fairuz 1682fe152a EXCHANGE-149 - Backend for process merge 2021-05-12 16:54:22 +08:00