Commit Graph

1061 Commits

Author SHA1 Message Date
omair saleh 7b02e735a7 clean up wallet 2022-02-07 16:08:37 +08:00
omair saleh 5a9318d67b clean up wallet 2022-02-07 15:41:55 +08:00
omair saleh 799829f58d wallet batch polishing 2022-02-07 13:10:15 +08:00
omair saleh 4df9c9dbe5 wallet batch polishing 2022-02-07 13:04:52 +08:00
omair saleh 350f02c899 wallet batch polishing 2022-02-07 10:40:50 +08:00
omair saleh b25b12a164 wallet batch polishing 2022-02-07 00:00:21 +08:00
omair saleh 45dc1dd69b wallet batch polishing 2022-02-06 23:58:22 +08:00
omair saleh 4ac7a1b004 wallet batch polishing 2022-02-06 23:55:28 +08:00
omair saleh ac711cdcaa wallet batch polishing 2022-02-06 22:15:10 +08:00
omair saleh fe29f2198f wallet batch polishing 2022-02-06 22:03:49 +08:00
omair saleh 89a51e6fbd wallet batch polishing 2022-02-06 22:02:34 +08:00
omair saleh 25d9fb3cfc wallet batch polishing 2022-02-06 21:59:44 +08:00
omair saleh fd9578dfd4 wallet batch polishing 2022-02-06 21:57:00 +08:00
omair saleh 37dd7e2722 wallet batch polishing 2022-02-06 21:56:24 +08:00
omair saleh 9b23b4e302 wallet batch polishing 2022-02-06 21:56:07 +08:00
omair saleh e8af91799a wallet batch polishing 2022-02-06 21:52:35 +08:00
omair saleh 3459667f76 wallet batch polishing 2022-02-06 21:51:57 +08:00
omair saleh 0f0362f4df Merge remote-tracking branch 'origin/development' into development 2022-02-06 12:30:13 +08:00
omair saleh 22124c1e6c update booking details ui to be more mobile friendly 2022-02-06 12:29:37 +08:00
edmondlang 434f0d673a Merge branch 'development' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-up-with-api 2022-02-05 23:02:29 +08:00
edmondlang de3179a4ad admin top up api 2022-02-05 23:01:07 +08:00
edmondlang d507584e1b update wallet controller logic 2022-02-05 22:01:10 +08:00
edmondlang c52621c405 Merge branch 'wallet-ui' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-up-with-api
# Conflicts:
#	resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
#	routes/web.php
2022-02-05 21:39:31 +08:00
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
Leong Chee Siong 747e493837 Merge branch 'user_wallet_topup_withdraw' into 'development'
wallet

See merge request CIEFWorldwideSdnBhd/exchange-2.0!78
2022-02-04 05:48:54 +00: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 89c4debe14 update chinese new year announcement 2022-01-28 18:15:06 +08:00
omair saleh a36acea928 update chinese new year announcement 2022-01-28 18:13:34 +08:00
omair saleh 0fe4b6d3e3 fix duplicated bill plz problem 2022-01-22 14:18:04 +08:00
omair saleh ffefea75c0 fix duplicated bill plz problem 2022-01-22 14:00:13 +08:00
omair saleh ec4ef36cce fix duplicated bill plz problem 2022-01-22 13:59:55 +08:00
omair saleh 0d2b2af6d5 fix duplicated bill plz problem 2022-01-22 13:57:45 +08:00
omair saleh 4254257e5f fix duplicated bill plz problem 2022-01-22 13:35:36 +08:00
omair saleh 9f27ceefdf fix duplicated bill plz problem 2022-01-22 11:44:05 +08:00
omair saleh 27cd2c06db add vue versions for cache issues 2022-01-21 19:23:01 +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 ce885693e1 export random products to excel 2022-01-14 19:32:39 +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