cief/exchange-2.0
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/exchange-2.0.git synced 2026-08-19 04:23:55 +00:00
Code Issues Packages Projects Releases Wiki Activity
999 Commits 175 Branches 0 Tags
f3ac6c14fd6c9956d2b2218234fc627f179da679
Commit Graph

999 Commits

This Branch
This Branch
All Branches
Author SHA1 Message Date
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
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 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 4255fb8a78 Merge remote-tracking branch 'origin/development' into development 2021-12-27 11:52:10 +08:00
omair saleh da3408ad78 fix admin permission issues 2021-12-27 11:51:43 +08:00
Leong Chee Siong 92691c49b0 Merge branch 'bill_transaction_status_update' into 'development' 
bill transaction status update

See merge request CIEFWorldwideSdnBhd/exchange-2.0!71
 2021-12-27 02:59:58 +00:00
edmondlang 8bf6b69e63 update PaymentProofComponent - add in function to delete transaction on currency_orders - VERIFICATION tab 2021-12-25 11:20:38 +08:00
glovetleong f9db00356b bill transaction status update 2021-12-23 21:57:08 +08:00
omair saleh 2293ab1c16 update customer reports 2021-12-23 14:41:04 +08:00
omair saleh 1c73338718 update old and new customer list to order by total spending 2021-12-23 12:36:51 +08:00
omair saleh 1ddfb5e074 update old and new customer list to order by total spending 2021-12-23 12:36:02 +08:00
omair saleh cac9935c2f update old and new customer list to order by total spending 2021-12-23 12:35:08 +08:00
omair saleh 91bc9adfb8 update old and new customer list to order by total spending 2021-12-23 12:34:52 +08:00
omair saleh b8b0bcd4d0 fix payment proof no document bug 2021-12-23 12:14:29 +08:00
omair saleh dbf18a0d62 fix payment proof no document bug 2021-12-23 12:10:23 +08:00
omair saleh 4e71f6db41 hide upload documents button on after china bank slip is uploaded 2021-12-23 12:07:26 +08:00
omair saleh 85ba5f074e delete duplicated purchase orders on approval 2021-12-23 12:00:30 +08:00
omair saleh 6b21e162b6 Merge branch 'development' into 'master' 
base_portal.blade

See merge request CIEFWorldwideSdnBhd/exchange-2.0!70
 2021-12-23 03:56:10 +00:00
omair saleh f043843fe0 Merge branch 'improve-responsive-ui' into 'development' 
base_portal.blade

See merge request CIEFWorldwideSdnBhd/exchange-2.0!66
 2021-12-23 03:53:21 +00:00
omair saleh 6d73a6bc1e Merge branch 'development' into 'improve-responsive-ui' 
# Conflicts:
#   resources/assets/vue/components/bookings/sections/BookingDetailsSectionComponent.vue
 2021-12-23 03:52:55 +00:00
omair saleh 22da749359 update urgent list show 1688 banks 2021-12-22 19:16:05 +08:00
omair saleh cda55c0d42 update urgent list show 1688 banks 2021-12-22 19:11:58 +08:00
omair saleh 100bff6d22 update urgent list show 1688 banks 2021-12-22 19:06:44 +08:00
omair saleh b7c109031d update urgent list show 1688 banks 2021-12-22 19:04:20 +08:00
omair saleh c577ab1779 update urgent list show 1688 banks 2021-12-22 19:01:44 +08:00
omair saleh 06d7ae9874 add new customers list 2021-12-22 16:57:24 +08:00
omair saleh 4afb7f622f add new customers list 2021-12-22 16:54:45 +08:00
omair saleh a71136db16 add new customers list 2021-12-22 16:53:59 +08:00