omair/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/uldvstar/exchange-2.0.git synced 2026-08-19 12:34:24 +00:00
Code Issues Packages Projects Releases Wiki Activity
1,276 Commits 23 Branches 0 Tags
1858faef0ddfa04ec8f4e04ca4c118e5e509b46d
Commit Graph

92 Commits

Author SHA1 Message Date
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
omair saleh 9fa522f105 fix wallet bug 2022-03-02 11:43:20 +08:00
omair saleh 2685d11a07 fix wallet bug 2022-03-02 11:41:34 +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 70a2979d2d download billing documents 2022-03-02 04:31:51 +08:00
omair saleh abc449dd83 download billing documents 2022-03-02 04:27:58 +08:00
omair saleh be6ebdfde8 download billing documents 2022-03-02 03:50:47 +08:00
omair saleh 1446a8b34e download billing documents 2022-03-02 03:47:21 +08:00
ahmedsophyudden 016de0cd47 Create update refund status api and credit wallet processor 2022-03-01 16:04:38 +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
ahmedsophyudden 5eb24878f9 Create download api for booking document (invoice, purchase order, deliver order, supplier deliver order) 2022-02-27 23:09:12 +08:00
edmondlang 9ebf5d7f9d update wallets page 2022-02-25 23:43:54 +08:00
ahmedsophyudden 592024d462 Create api to get bank account balance by bank id 2022-02-22 11:35:12 +08:00
glovetleong ae392dd052 debtor 2022-02-21 08:57:39 +08:00
edmondlang 61eda2291a add back missing codes from - update payment and billings documents 2022-02-15 23:56:34 +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 36c659c84e Transfer Fee Transaction - Company Balance Account API 2022-01-11 23:07:49 +08:00
glovetleong f9db00356b bill transaction status update 2021-12-23 21:57:08 +08:00
glovetleong 44ed2f55e9 delete transaction 2021-12-22 14:22:38 +08:00
omair saleh fc796a9bb8 update billplz to production 2021-12-21 12:57:42 +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
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
ahmedsophyudden b4c1a2e333 Merge branch 'task/EXC-353' into development 2021-11-08 16:15:05 +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 30884201bd regenerate booking invoice 2021-10-19 21:51:47 +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
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 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
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
ahmedsophyudden 410c55e2bf Add credit note controller and logic 2021-08-29 20:52:43 +08:00
ahmedsophyudden f63f57ad57 Add update transaction status to refunded transaction 2021-08-28 10:39:00 +08:00
ahmedsophyudden 16f5897750 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into full-payment-request-refund 2021-08-28 10:21:09 +08:00
ahmedsophyudden 5857317fa4 Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into credit-note-request-refund 2021-08-27 19:05:26 +08:00
omair saleh 42d064d07f add cancel order and restore order function 2021-08-26 15:09:32 +08:00
ahmedsophyudden 50f2127d42 Refund request - api endpoint for refund request 2021-08-21 21:38:02 +08:00
omair saleh f4752003ab export transaction to excel 2021-07-02 18:13:38 +08:00
omair saleh 89b81f2773 remove unused classes and empty spaces 2021-06-29 12:35:32 +08:00
omair saleh f3d2dabb53 added function to export company details to excel 2021-06-23 18:06:01 +08:00
omair saleh 824eab1d92 fix class incorrect name 2021-06-09 14:09:28 +08:00
weichien b938c1b452 fix: namespace misdefined 2021-06-09 12:03:18 +08:00