Commit Graph

202 Commits

Author SHA1 Message Date
omair saleh 27cd2c06db add vue versions for cache issues 2022-01-21 19:23:01 +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 91bc9adfb8 update old and new customer list to order by total spending 2021-12-23 12:34:52 +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 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 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
omair saleh b83809c03d remove the word company from invoices 2021-12-21 21:24:21 +08:00
omair saleh 1a8754f2b0 hide wallet credit from header 2021-12-21 21:11:54 +08:00
omair saleh 671d3ec553 Merge remote-tracking branch 'origin/master' 2021-12-21 20:39:24 +08:00
omair saleh 5d22c4e7e2 update jacks module status 2021-12-21 20:39:05 +08:00
omair saleh 5eee532ff7 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development
# Conflicts:
#	app/Http/Resources/TransactionResource.php
#	resources/assets/vue/components/bookings/elements/PaymentHistoryComponent.vue
#	routes/web.php
2021-12-21 19:42:28 +08:00
omair saleh 8d8ebb98ab update billplz to production 2021-12-21 12:50:16 +08:00
omair saleh 27acd0c5de update billplz to sandbox 2021-12-21 12:22:18 +08:00
omair saleh 98568e75fb update billplz to production 2021-12-21 09:48:34 +08:00
omair saleh 3717ea9a7e fix bill plz callback transaction status 2021-12-19 19:14:58 +08:00
omair saleh 2cafa4e28b fix bill plz callback transaction status 2021-12-19 19:08:02 +08:00
omair saleh ff5a066950 fix bill plz callback transaction status 2021-12-19 19:06:17 +08:00
omair saleh fe1f0e4b1f fix bill plz callback transaction status 2021-12-19 19:02:25 +08:00
omair saleh 1558db9bc4 update transaction status on call back 2021-12-19 15:41:36 +08:00
omair saleh cff5e0e486 update transaction status on call back 2021-12-19 15:26:08 +08:00
omair saleh a827b87d17 update transaction status on call back 2021-12-19 15:14:53 +08:00
edmondlang db83ac4ca9 update address for invoice, proforma Invoice, purchase order, delivery order when user update their address 2021-12-16 18:12:05 +08:00
omair saleh 436e964b33 switch to sandbox billplz account 2021-12-12 15:19:18 +08:00
omair saleh 3172cc33fb switch to production billplz account 2021-12-08 16:11:41 +08:00
edmondlang d91d110d49 move responsive navbar from shipping portal 2021-11-30 22:29:57 +08:00
edmondlang 1bcb37f724 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into improve-responsive-ui 2021-11-30 18:04:14 +08:00
omair saleh e039730c59 fix account admin dashboard ui 2021-11-29 20:31:37 +08:00
omair saleh 50dd599288 performa invoice 2021-11-28 22:14:49 +08:00
edmondlang fb4d17b46f rename performa to proforma 2021-11-28 21:10:46 +08:00
omair saleh b0dcf4a0f6 Merge remote-tracking branch 'origin/development' into development 2021-11-28 16:29:11 +08:00
omair saleh 83bf277543 performa invoice 2021-11-28 16:28:53 +08:00
omair saleh 4e90dcda7d currency orders page 2021-11-28 13:39:34 +08:00
omair saleh b2d6a1ca20 currency orders page 2021-11-28 13:32:35 +08:00
omair saleh 46b1ba5204 currency orders page 2021-11-28 13:31:53 +08:00
omair saleh 8f1e5f18c5 currency orders page 2021-11-28 13:06:21 +08:00
omair saleh 78984e8c38 currency orders page 2021-11-28 13:03:25 +08:00
omair saleh f4ae3c3cf2 currency orders page 2021-11-28 13:00:56 +08:00
edmondlang 2153774cde Merge branch 'change-booking-price' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into development 2021-11-25 15:20:34 +08:00
omair saleh 5cc5255e50 fix missing reference number from invoices 2021-11-22 00:00:22 +08:00
omair saleh 8f62c42368 temp change supplier id in development branch 2021-11-21 23:55:19 +08:00
omair saleh 49c4362ba1 fix payment gateway & add regenerate invoices button 2021-11-21 23:30:59 +08:00
edmondlang 5f5b7cf119 wallet-ui
request refund
online-transfer (payment gateway)
2021-11-17 02:27:25 +08:00
edmondlang a0df6a33c9 Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui 2021-11-10 23:14:49 +08:00
ahmedsophyudden b4c1a2e333 Merge branch 'task/EXC-353' into development 2021-11-08 16:15:05 +08:00
omair saleh 5883a3d8c1 update responsiveness for account admin 2021-11-08 12:03:38 +08:00
ahmedsophyudden 39a8ac83b2 Merge branch 'online-payment-billplz-integration' into development 2021-11-08 09:43:09 +08:00
glovetleong 70f95f511d transaction status downgrade 2021-10-27 14:22:32 +08:00