cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 12:33:56 +00:00
Code Issues Packages Projects Releases Wiki Activity
767 Commits 175 Branches 0 Tags
e3e4b490b02cc309bf71e695627f0d75ecdffa91
Commit Graph

63 Commits

Author SHA1 Message Date
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 b4c1a2e333 Merge branch 'task/EXC-353' into development 2021-11-08 16:15:05 +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
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
weichien 7ed4f9a33f feat: add attach/detach segment to annoucement controller and related modules. 2021-06-08 13:29:58 +08:00
weichien b0c0046b2a feat: add update announcement controller logic,service,rule, resources. 2021-06-07 17:57:48 +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 9fb852d1ea feat: add CLUD controller for announcement. 2021-06-05 13:40:04 +08:00
glovetleong 6b5f99925b admin account create and edit 2021-05-30 21:05:34 +08:00
omair saleh 678654cf89 Merge branch '154_edit_profile' into 'master' 
update: manupulate getUserName getter to show updated fullname after success...

See merge request CIEFWorldwideSdnBhd/exchange-2.0!43
 2021-05-26 06:39:21 +00:00
weichien a51d1dce38 feat: add reset password and generate reset pasword link controller. 2021-05-23 02:57:14 +08:00
Fairuz 609dd06bb8 EXCHANGE-149 - Layout, components for merge bookings (abit on backend for filter booking list) 2021-05-12 16:54:22 +08:00
weichien cdb54c67fc feat: [BE] Set a address as default billing address. 2021-03-19 07:07:23 +08:00
omair saleh 05401f6bbc large commit 2021-03-11 13:06:40 +08:00
omair saleh 13ddf458db Merge branch 'default_bank' into 'master' 
Default bank

See merge request CIEFWorldwideSdnBhd/exchange-2.0!18
 2021-01-05 05:22:41 +00:00
omair saleh 0a969b6261 Merge branch 'List-Bookings' into 'master' 
Add new feature of Booking Module - List Booking

See merge request CIEFWorldwideSdnBhd/exchange-2.0!17
 2021-01-05 05:22:29 +00:00
omair saleh ffe497b240 Merge branch 'weiken' into 'master' 
PO - Make Payment Action

See merge request CIEFWorldwideSdnBhd/exchange-2.0!16
 2021-01-05 05:21:16 +00:00
CheeSiong e05a801fff Update To Default Company Bank 2021-01-04 20:47:35 +08:00
Hafiz 822df0e115 Add new feature of Booking Module - List Booking 2021-01-03 22:16:55 +08:00
weiken.intex ceaf404b81 PO - Make Payment Action 2020-12-31 20:27:11 +08:00
CheeSiong 1dfb75545f List Currency Rate Logic Class 
Fetch Currency Rate Logic Class
 Create Currency Rate Logic Class
 Update Currency Rate Logic Class
Currency Rate Converter Rate
 2020-12-30 08:47:12 +08:00
omair saleh ab499f9ceb fix file structure and file names 2020-12-28 00:03:14 +08:00
omair saleh d0e391b4e5 Merge branch 'login_register' into 'master' 
login register front

See merge request CIEFWorldwideSdnBhd/exchange-2.0!13
 2020-12-11 04:26:12 +00:00
weiken.intex 4d8079c7a5 Receipt 2020-12-10 15:08:02 +08:00
omair saleh b224e53c21 Merge branch 'master' into 'login_register' 
# Conflicts:
#   routes/api.php
 2020-12-08 07:26:12 +00:00
omair saleh 9dcc89fb08 Merge branch 'master' into 'booking' 
# Conflicts:
#   app/Classes/Modules/Companies/Services/FetchesCompany.php
#   routes/api.php
 2020-12-08 07:25:11 +00:00
CheeSiong 03bdb13305 login register front 2020-12-07 16:35:00 +08:00
weiken.intex 9ed67e74e2 create Transaction & Transaction Detail 
- Supplier (AP)
	- PO
	- DO
	- INV

- Customer (AR)
	- PO
	- DO
	- INV
 2020-12-07 14:00:24 +08:00
weiken.intex f08a863e2c create Wallet Transaction - integration 2020-12-07 13:59:10 +08:00
CheeSiong db5128735c Merge branch 'master' of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0 into booking 2020-12-04 09:58:07 +08:00
CheeSiong c3f153fe4b Create Booking Logic Class 
Update Booking Logic Class
 Delete Booking Logic Class
 2020-12-04 09:49:47 +08:00
CheeSiong 5940fd16b0 ListCurrencyLogicClass 
Currency Converter Logic Class
 2020-12-02 17:31:00 +08:00
omair saleh 8fdadf5209 Merge branch 'currency' into 'master' 
Currency

See merge request CIEFWorldwideSdnBhd/exchange-2.0!10
 2020-11-30 13:27:35 +00:00