Commit Graph

187 Commits

Author SHA1 Message Date
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
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
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
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
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
jouls c3523bfddc Added Data Table Responsiveness 2024-03-26 13:53:58 +08:00
jouls 957b1f2249 Added Pagination on payouts table 2024-03-26 11:46:03 +08:00
jouls d941237b30 Changes on auth token in vendor payouts 2024-03-26 10:10:44 +08:00
jouls 00bcc4441f Merge branch 'main' into louie_branch 2024-03-26 09:45:13 +08:00
jouls ecf89b070f Minor changes on payout details 2024-03-26 09:22:33 +08:00
MarkHipe c6c1995baf Merge pull request 'jun-branch' (#45) from jun-branch into main
Reviewed-on: #45
2024-03-25 18:22:58 +08:00
Jun Barroga d4584e6cf1 admin payout 2024-03-25 18:03:49 +08:00
jouls 1067ee2efd added dynamic date to the payout table 2024-03-23 12:30:23 +08:00
jouls 8eb07ad94f added bankNum masking in modal box 2024-03-23 12:01:46 +08:00
jouls 947f491a23 added dynamic values to modal box 2024-03-22 18:21:43 +08:00
Jun Barroga 07c80ce000 Merge branch 'main' into jun-branch 2024-03-22 14:27:30 +08:00
Jun Barroga 1f3d512192 Resolved merge conflicts 2024-03-22 14:26:35 +08:00
Jun Barroga e30c1453e1 admin payout 2024-03-22 14:18:39 +08:00
jouls ce9edf6593 added get payout by Id function 2024-03-22 14:10:51 +08:00
jouls 9d3c301ab5 changes on the data table format 2024-03-22 10:40:44 +08:00
Erwin Galang 8a6cc056dd Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test 2024-03-22 02:32:42 +00:00
Erwin Galang 098858fb38 new file: admin/.gitignore 2024-03-22 02:25:00 +00:00
MarkHipe caab356be3 Merge pull request 'louie_branch' (#44) from louie_branch into main
Reviewed-on: #44
2024-03-22 09:47:07 +08:00