Commit Graph

1081 Commits

Author SHA1 Message Date
omair saleh aa3d50e125 fix bill seeder 2022-02-18 09:47:30 +08:00
omair saleh 9f89b87249 Merge branch 'transaction_bill_owner' into development 2022-02-17 20:21:43 +08:00
omair saleh 66f2339788 Merge branch 'development' into 'transaction_bill_owner'
# Conflicts:
#   app/Http/Resources/TransactionResource.php
2022-02-17 12:19:54 +00:00
omair saleh 33fff4189f Merge remote-tracking branch 'origin/development' into development 2022-02-17 20:00:44 +08:00
omair saleh 99a3a11267 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	resources/assets/vue/components/companies/sections/customerDashboardSectionComponent.vue
#	routes/web.php
2022-02-17 20:00:29 +08:00
edmondlang 61eda2291a add back missing codes from - update payment and billings documents 2022-02-15 23:56:34 +08:00
edmondlang 67ba347fe4 update currency orders page - add 'cancel this order' on PAYMENT PROOF tab 2022-02-15 22:56:46 +08:00
omair saleh a6038a47ba fix Supplier delivery order 2022-02-13 15:36:16 +08:00
omair saleh 2558defa5f fix Supplier delivery order 2022-02-13 15:07:40 +08:00
omair saleh 2cfeea79cc fix Supplier delivery order 2022-02-13 14:54:07 +08:00
omair saleh 36ff2c3be0 fix $ is not a function bug 2022-02-10 11:26:38 +08:00
omair saleh a4749406f4 fix $ is not a function bug 2022-02-10 11:15:21 +08:00
omair saleh cee0f99dc9 clean up wallet 2022-02-10 10:50:17 +08:00
omair saleh 1585dcfa5a clean up wallet 2022-02-10 10:28:26 +08:00
omair saleh e8ff49163d clean up wallet 2022-02-09 15:02:48 +08:00
omair saleh b6ec128614 clean up wallet 2022-02-07 16:18:18 +08:00
omair saleh 0459d56f8d clean up wallet 2022-02-07 16:17:01 +08:00
omair saleh 3b04b3630a clean up wallet 2022-02-07 16:16:21 +08:00
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 fcb2de9453 remove chinese new year announcement 2022-02-07 14:13:10 +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