Commit Graph

255 Commits

Author SHA1 Message Date
raymart e3a95b604e Check out Page, Mobile View - bottom navigation bar links issues 2024-04-16 10:12:45 +08:00
MarkHipe 669c13d97b Merge pull request 'jun-branch' (#55) from jun-branch into main
Reviewed-on: #55
2024-04-16 10:07:53 +08:00
Jun Barroga f7320150be Merge branch 'main' into jun-branch 2024-04-16 10:05:25 +08:00
Jun Barroga d056602c30 Apply Price Matrix, Admin Payout Token Renew, Admin Login Redirections 2024-04-16 10:04:25 +08:00
jouls 3609c5eee6 Merge branch 'louie_branch' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-12 16:05:32 +08:00
jouls 9a39b1e116 Merge branch 'louie_branch' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-12 16:05:06 +08:00
jouls 0adfc24884 Merge branch 'louie_branch' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-12 16:03:25 +08:00
jouls 82d8191c53 added token refresh on vendor payouts 2024-04-12 16:03:14 +08:00
jouls 7751fecf0c added token refresh on vendor payouts 2024-04-12 15:58:43 +08:00
jouls cf866edd41 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-04-12 08:33:06 +08:00
MarkHipe f86a0d84d5 Merge pull request 'stacy_branch' (#54) from stacy_branch into main
Reviewed-on: #54
2024-04-08 18:29:14 +08:00
Staycie 6cf3efad4b edit/delete vendor address 2024-04-08 18:24:45 +08:00
Staycie fd40d3bb34 fixed button issues, put product ellipsis & made images clickable 2024-04-08 18:21:49 +08:00
Staycie 395919bb24 search filter 2024-04-08 18:17:58 +08:00
Staycie 2b8d9ddf2a vendor name on header & endpoint issue 2024-04-08 18:13:47 +08:00
jouls 6feb68fde8 removed unneccesary comments 2024-04-05 12:59:25 +08:00
Jun Barroga da6b386ba6 Merge branch 'main' into jun-branch 2024-04-05 11:08:53 +08:00
Jun Barroga c530e8c7d7 Modified the Application of Price Matrix When Updating Order 2024-04-05 11:08:15 +08:00
jouls c94863aa99 Merge branch 'main' into louie_branch 2024-04-04 18:22:54 +08:00
MarkHipe 93c3d89423 Merge pull request 'Incorrect Password, Remove the negative quantity,' (#53) from raymart_branch into main
Reviewed-on: #53
2024-04-04 18:20:21 +08:00
raymart 28b88c1a61 Incorrect Password, Remove the negative quantity, 2024-04-04 18:18:05 +08:00
jouls c92635ca1c Merge branch 'main' into louie_branch 2024-04-04 18:10:57 +08:00
MarkHipe bb23ab4a1a Merge pull request 'Minor Bug Fixes and Initial Application of Price Matrix' (#52) from jun-branch into main
Reviewed-on: #52
2024-04-04 18:03:18 +08:00
Jun Barroga 10ccc1d7fe Minor Bug Fixes and Initial Application of Price Matrix 2024-04-04 18:01:18 +08:00
jouls f121a053ee removed unused codes 2024-04-02 10:37:35 +08:00
jouls d8f5ed576c Merge branch 'main' into louie_branch 2024-04-02 08:40:58 +08:00
MarkHipe 0f4d180411 Merge pull request 'stacy_branch' (#50) from stacy_branch into main
Reviewed-on: #50
2024-04-02 08:02:13 +08:00
Stacy 1b4746336f vendor-card icon & capital letters search 2024-04-01 18:33:01 +08:00
Stacy 2a4f5a4755 Dynamic API Endpoint Issues 2024-04-01 18:31:59 +08:00
Stacy a05bd1db37 Header Update 2024-04-01 18:27:45 +08:00
Stacy ba7ef1d47d Solved Terms Page and Prohibited Page Style Issues 2024-04-01 18:26:39 +08:00
jouls 55affaa372 Added remaining dynamic content on payout modal box 2024-03-26 18:15:52 +08:00
MarkHipe 424dfd8ca4 Merge pull request 'gelo_branch' (#49) from gelo_branch into main
Reviewed-on: #49
2024-03-26 16:45:01 +08:00
gelonspr 011ae8496e fixed vendor payment details modal and dynamic data display 2024-03-26 16:44:13 +08:00
gelonspr 7f571bd37a Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into gelo_branch 2024-03-26 16:42:01 +08:00
MarkHipe ae80b26726 Merge pull request 'louie_branch' (#48) from louie_branch into main
Reviewed-on: #48
2024-03-26 16:40:16 +08:00
jouls ff0fb59674 Merge branch 'main' into louie_branch 2024-03-26 16:38:23 +08:00
MarkHipe 5e606c9199 Merge pull request 'raymart_branch' (#47) from raymart_branch into main
Reviewed-on: #47
2024-03-26 16:29:49 +08:00
raymart 0e1d96069a Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into raymart_branch 2024-03-26 16:25:31 +08:00
raymart 342edfe2a0 minor changes for catalog and product 2024-03-26 16:24:48 +08:00
raymart 2fad9e25fc search bar for vendor name 2024-03-26 16:22:35 +08:00
jouls 844ef1ff6f Added Dynamic Upcoming Payout Amount 2024-03-26 16:21:36 +08:00
raymart c4f30aa999 add price matrix and function for edit & delete 2024-03-26 16:21:14 +08:00
MarkHipe 6648db6a5d Merge pull request 'stacy_branch' (#46) from stacy_branch into main
Reviewed-on: #46
2024-03-26 16:10:56 +08:00
Stacy 951859d610 Shows customer email in the email field of register customer 2024-03-26 15:53:32 +08:00
Stacy 3219755a31 Modified product image preview 2024-03-26 15:52:38 +08:00
Stacy 7ab78b909b Added "All Order" tab on customer's purchase history, Modified user refund history & vendor refund history 2024-03-26 15:42:06 +08:00
gelonspr 64c5c756c0 minor changes on vendor-payments 2024-03-26 14:57:36 +08:00
jouls 41e64df669 minor changes on payout table design 2024-03-26 14:36:37 +08:00
gelonspr 85d8f31847 fixed payment details modal and fixed data queries for dynamic data display 2024-03-26 14:08:25 +08:00