Commit Graph

337 Commits

Author SHA1 Message Date
jouls 0728acbcc6 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-05-03 16:55:32 +08:00
MarkHipe d4f61153d2 Merge pull request 'minor bugs' (#76) from raymart_branch into main
Reviewed-on: #76
2024-05-03 16:34:13 +08:00
raymart 7679dad1e6 minor bugs 2024-05-03 16:31:55 +08:00
jouls 4200c4e155 minor fixes on stylings inside modal box 2024-05-02 17:22:39 +08:00
jouls 2da9f77349 Improved data table and layout of vendouy payouts page 2024-05-02 15:59:16 +08:00
MarkHipe 4d7a47b158 Merge pull request 'mark_4' (#75) from mark_4 into main
Reviewed-on: #75
2024-04-30 14:49:08 +08:00
mark H 613325f68d new update 2024-04-30 14:46:53 +08:00
mark H 0c368796a7 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into mark_4 2024-04-30 14:42:33 +08:00
mark H a9853d178c - new update 2024-04-30 14:25:28 +08:00
MarkHipe a7a4b1482d Merge pull request 'stacy_branch' (#74) from stacy_branch into main
Reviewed-on: #74
2024-04-30 14:17:02 +08:00
Stacy c361a31143 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into stacy_branch 2024-04-30 14:12:32 +08:00
MarkHipe 2cb98f24d6 Merge pull request 'fixed admin dashboard download csv and initialized dynamic dataset for sales report' (#73) from gelo_branch into main
Reviewed-on: #73
2024-04-30 14:10:49 +08:00
gelonspr f278bb854d fixed admin dashboard download csv and initialized dynamic dataset for sales report 2024-04-30 14:09:53 +08:00
MarkHipe c154d801d2 Merge pull request 'louie_branch' (#72) from louie_branch into main
Reviewed-on: #72
2024-04-30 14:07:17 +08:00
jouls 32fd214c51 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-30 14:03:55 +08:00
Stacy 3fdab75955 applied price matrix on hover addtocart buttons 2024-04-30 13:47:33 +08:00
Stacy 3e3ebfe66c created back button 2024-04-30 13:46:28 +08:00
Stacy 3f334715f3 updated quantity UI 2024-04-30 13:45:35 +08:00
Stacy 7d847cd447 removed some reload and modified console 2024-04-30 13:44:23 +08:00
jouls b4b69ba223 added dynamic bank information on upcoming payouts based on the default bank payout set by the user 2024-04-30 09:26:24 +08:00
MarkHipe b92be0667d Merge pull request 'minor bugs, add +63 in contact at modal, pagination in admin' (#71) from raymart_branch into main
Reviewed-on: #71
2024-04-30 09:12:20 +08:00
raymart e6ea65914e minor bugs, add +63 in contact at modal, pagination in admin 2024-04-30 09:11:18 +08:00
jouls ca799e9c23 added bank name in upcoming payouts in payouts tab 2024-04-30 09:04:40 +08:00
MarkHipe 465679ae48 Merge pull request 'Updates on checkout, product page, user history, vendor settings, vendor profile' (#70) from jun-branch into main
Reviewed-on: #70
2024-04-30 08:28:00 +08:00
Jun Barroga e1771dccdc Updates on checkout, product page, user history, vendor settings, vendor profile 2024-04-30 08:22:40 +08:00
jouls 2ad0c9e955 changed logic of summation of daily revenue 2024-04-26 17:36:12 +08:00
jouls e8b5b6b50c added return status column on recent orders table 2024-04-26 17:35:53 +08:00
jouls 0dd203aba2 added error handling for routes on vendor pages 2024-04-26 15:47:05 +08:00
jouls 88ae2713bb improvements on new vendors table 2024-04-26 14:26:32 +08:00
jouls e30cbcebd7 improvements on admin dashboard and order history 2024-04-26 13:01:28 +08:00
jouls 0dfa648b19 Added total users and new vendors table, improvements on recent orders table 2024-04-25 18:21:15 +08:00
jouls 8858763cd6 Added New Customers Table 2024-04-25 17:18:36 +08:00
jouls 793afa339f Added Daily Signup Counter 2024-04-25 15:35:16 +08:00
jouls 35a6c3b693 added functions for getAllCustomers and getAllVendors 2024-04-25 15:34:57 +08:00
jouls 46995fef7b removed forgot pass in register user 2024-04-25 15:16:37 +08:00
MarkHipe 69afa41d33 Merge pull request 'fix error' (#69) from mark_3 into main
Reviewed-on: #69
2024-04-24 09:50:50 +08:00
mark H 12a5e426b5 fix error 2024-04-24 09:49:23 +08:00
MarkHipe fc13003509 Merge pull request 'new update lazy loading, search, filter ant etc' (#68) from mark into main
Reviewed-on: #68
2024-04-23 13:19:13 +08:00
mark H e1a8c82baf new update lazy loading, search, filter ant etc 2024-04-23 11:17:55 +08:00
MarkHipe a4bf959c5e Merge pull request 'jun-branch' (#67) from jun-branch into main
Reviewed-on: #67
2024-04-23 09:40:17 +08:00
Jun Barroga dd97fd134c Merge branch 'main' into jun-branch 2024-04-23 09:38:48 +08:00
Jun Barroga 5f1aa3ab36 Fix Variable and Variation Bugs 2024-04-23 09:38:06 +08:00
MarkHipe 2f45d91e53 Merge pull request 'fixed vendor-payments and added doughnut chart for admin dashboard' (#66) from gelo_branch into main
Reviewed-on: #66
2024-04-23 09:36:46 +08:00
gelonspr 95d2332aa2 fixed vendor-payments and added doughnut chart for admin dashboard 2024-04-23 09:34:12 +08:00
MarkHipe db76cbc13a Merge pull request 'louie_branch' (#65) from louie_branch into main
Reviewed-on: #65
2024-04-23 09:32:23 +08:00
jouls c3c8d36238 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-23 09:31:13 +08:00
MarkHipe 36289d353a Merge pull request 'stacy_branch' (#64) from stacy_branch into main
Reviewed-on: #64
2024-04-23 09:17:25 +08:00
Stacy 3a0f07e6fa Product Single page CSS & Double click add to cart UI issue 2024-04-23 09:10:36 +08:00
Stacy 31910967a4 Modal spacing issues 2024-04-23 08:58:19 +08:00
Stacy fea6570001 Changed the icon 2024-04-22 17:22:59 +08:00