Commit Graph

189 Commits

Author SHA1 Message Date
omair saleh b2f4d10c10 fix wallet bug 2022-03-02 11:34:34 +08:00
omair saleh 07d1bbd921 fix billing page 2022-03-02 02:24:54 +08:00
edmondlang c2ddd7e114 billing ui 2022-03-02 00:06:17 +08:00
omair saleh c02e469841 fix wallets transaction lists 2022-02-28 12:59:41 +08:00
omair saleh 407d10fce9 fix wallets transaction lists 2022-02-28 11:10:24 +08:00
omair saleh d5ecd0330e Merge branch 'recency-frequency-monetary' into 'development'
Recency frequency monetary

See merge request CIEFWorldwideSdnBhd/exchange-2.0!82
2022-02-27 12:25:26 +00:00
edmondlang 9ebf5d7f9d update wallets page 2022-02-25 23:43:54 +08:00
omair saleh 53401d6c53 remove teh supplier from account admin 2022-02-22 16:22:20 +08:00
edmondlang b0fa7107f6 update RFM search ui 2022-02-17 22:41:47 +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 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
glovetleong efc5811403 filter 2022-02-16 15:09:52 +08:00
omair saleh 2558defa5f fix Supplier delivery order 2022-02-13 15:07:40 +08:00
omair saleh 799829f58d wallet batch polishing 2022-02-07 13:10:15 +08:00
omair saleh fe29f2198f wallet batch polishing 2022-02-06 22:03:49 +08:00
omair saleh 3459667f76 wallet batch polishing 2022-02-06 21:51:57 +08:00
edmondlang a5c96f4e89 implement api wallets for customer 2022-02-05 18:02:36 +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
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
glovetleong f56369d707 transaction bill 2022-01-13 22:49:02 +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
edmondlang 0579be05d8 wallet updates 2022-01-10 00:33:35 +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 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 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 19588f4cba Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/exchange-2.0 into wallet-ui
# Conflicts:
#	app/Http/Resources/TransactionResource.php
#	routes/web.php
2021-12-16 20:22:15 +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