Commit Graph

1026 Commits

Author SHA1 Message Date
edmondlang 6fa98bbd26 update 'public/transfer/marking' page include wallet balance and include wallet as a new payment method 2022-02-05 21:35:03 +08:00
edmondlang 64446d9b50 tidy up code 2022-02-05 20:29:09 +08:00
edmondlang a5c96f4e89 implement api wallets for customer 2022-02-05 18:02:36 +08:00
glovetleong c065c5cd6c wallet 2022-02-05 13:06:26 +08:00
edmondlang 1e49baa5f1 update nav bar bg color and close btn color 2022-02-04 22:31:10 +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
glovetleong b54f977330 wallet 2022-02-04 13:02:17 +08:00
omair saleh bb9c47278e Merge branch 'update-service-content' into 'development'
Update service content

See merge request CIEFWorldwideSdnBhd/exchange-2.0!77
2022-02-02 05:55:26 +00:00
omair saleh e3752965b4 Merge branch 'development' into 'update-service-content'
# Conflicts:
#   routes/web.php
2022-02-02 05:55:11 +00:00
omair saleh a36acea928 update chinese new year announcement 2022-01-28 18:13:34 +08:00
omair saleh f3ac6c14fd add vue versions for cache issues 2022-01-21 19:22:27 +08:00
omair saleh da66f011f9 Merge remote-tracking branch 'origin/development' into development 2022-01-19 10:42:58 +08:00
omair saleh 90021ba796 generate xpo 2022-01-19 10:42:41 +08:00
edmondlang 9cf30d559e wallets ui 2022-01-16 22:45:36 +08:00
edmondlang 0a0da91c21 update wallet-ui 2022-01-16 20:33:55 +08:00
omair saleh a3d3d73267 export products list 2022-01-14 19:29:15 +08:00
edmondlang 70adbae1d4 Merge branch 'wallet-ui' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Http/Resources/TransactionResource.php
#	routes/web.php
2022-01-12 23:35:03 +08:00
omair saleh 2e3d002dc6 fix route name for xpo generator controller 2022-01-12 15:53:14 +08:00
omair saleh 9b20734a04 fix route name for xpo generator controller 2022-01-12 15:52:36 +08:00
omair saleh 2a534d564b fix route name for xpo generator controller 2022-01-12 15:47:03 +08:00
omair saleh 29250ae400 fix route name for xpo generator controller 2022-01-12 15:43:17 +08:00
omair saleh 2a270b264e fix route name for xpo generator controller 2022-01-12 15:36:48 +08:00
omair saleh 559337313a fix route name for xpo generator controller 2022-01-12 15:36:17 +08:00
omair saleh dba0a1a59e fix route name for xpo generator controller 2022-01-12 15:35:46 +08:00
omair saleh 9a8cf7188b fix route name for xpo generator controller 2022-01-12 15:35:02 +08:00
omair saleh a06a8d58af fix route name for xpo generator controller 2022-01-12 15:34:03 +08:00
omair saleh 1096f9bb63 fix route name for xpo generator controller 2022-01-12 15:29:14 +08:00
omair saleh 0f18dcf117 fix route name for xpo generator controller 2022-01-12 15:28:11 +08:00
Leong Chee Siong 3ed9d6f821 Merge branch 'do_packing_list_auto_fill' into 'development'
created at

See merge request CIEFWorldwideSdnBhd/exchange-2.0!74
2022-01-10 06:43:21 +00:00
glovetleong 2b150e9a75 created at 2022-01-10 14:41:49 +08:00
Leong Chee Siong 71c30552f6 Merge branch 'do_packing_list_auto_fill' into 'development'
auto generate product list

See merge request CIEFWorldwideSdnBhd/exchange-2.0!72
2022-01-10 03:25:50 +00:00
edmondlang 0579be05d8 wallet updates 2022-01-10 00:33:35 +08:00
glovetleong 8305b66e83 auto generate product list 2022-01-09 22:40:41 +08:00
edmondlang 8801a943f0 update-service-content 2022-01-04 22:29:20 +08:00
omair saleh 5332bace52 1688 data 2022-01-03 18:23:03 +08:00
omair saleh 4f405fdec0 1688 data 2022-01-03 18:18:03 +08:00
omair saleh 7e3ff2b7cd 1688 data 2022-01-03 18:17:07 +08:00
omair saleh d9e9c5029a 1688 data 2022-01-03 18:14:16 +08:00
omair saleh a099164524 1688 data 2022-01-03 18:00:49 +08:00
omair saleh 22b4cf2f14 1688 data 2022-01-03 14:39:41 +08:00
omair saleh 2ffd59fd17 1688 data 2022-01-03 14:35:53 +08:00
omair saleh 1d0271d2e3 change postcode to string to keep leading zero 2021-12-30 12:56:08 +08:00
edmondlang 7dc3102585 add in function to approve / reject transaction on currency_orders - VERIFICATION tab 2021-12-27 14:46:23 +08:00
edmondlang 1290ccd2ce Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2021-12-27 14:03:44 +08:00
edmondlang 9068c33492 update delete transaction modal to default confirmation modal size 2021-12-27 14:02:52 +08:00
omair saleh a163af86be Revert "fix admin permission issues"
This reverts commit da3408ad78
2021-12-27 06:00:50 +00:00
omair saleh 313d319272 fix admin permission issues 2021-12-27 12:06:38 +08:00
omair saleh d0bee3da8c fix admin permission issues 2021-12-27 12:01:34 +08:00
omair saleh f3dfb5ed7c fix admin permission issues 2021-12-27 11:58:32 +08:00
omair saleh c48cb3be88 fix admin permission issues 2021-12-27 11:56:52 +08:00