Commit Graph

187 Commits

Author SHA1 Message Date
jouls 54fff000ea Merge branch 'main' into louie_branch 2024-03-22 09:40:28 +08:00
MarkHipe b04a48a68c Merge pull request 'added vendor payments tab and vendor payments details modal box' (#42) from gelo_branch into main
Reviewed-on: #42
2024-03-22 09:27:29 +08:00
gelonspr cb6440b1b5 fixed vendor user tabs 2024-03-22 09:24:17 +08:00
jouls a16c916761 slight changes on user tab 2024-03-22 09:23:48 +08:00
gelonspr 52dae43eff Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into gelo_branch 2024-03-22 09:19:13 +08:00
gelonspr 3d1b73ee47 added louie's vendor-payout tab 2024-03-22 09:11:52 +08:00
jouls a810ab6bed added masking on back acc number 2024-03-22 09:07:08 +08:00
MarkHipe 16bdbef65b Merge pull request 'louie_branch' (#43) from louie_branch into main
Reviewed-on: #43
2024-03-22 09:06:10 +08:00
jouls 41fe727f03 changed table to show depositted status only 2024-03-21 18:10:12 +08:00
jouls 2ea2e1ffcc Payout - Added dynamic data table, changed modal box design 2024-03-21 17:22:36 +08:00
gelonspr 8fa22bb766 added vendor payments tab and vendor payments details modal box 2024-03-21 17:20:34 +08:00
Jun Barroga ed30d71290 Merge branch 'main' into jun-branch 2024-03-21 09:05:09 +08:00
Jun Barroga 7be0e0cfb7 admin payout 2024-03-21 09:04:09 +08:00
jouls d1d081aabf minor changes on comments 2024-03-20 17:05:12 +08:00
jouls 2ee9074e86 Added Stylings to Payout Details, and Table 2024-03-20 17:03:45 +08:00
MarkHipe b8ac4eafc1 Merge pull request 'louie_branch' (#41) from louie_branch into main
Reviewed-on: #41
2024-03-20 15:03:14 +08:00
jouls b8ac7f827d added payout table and modal 2024-03-20 14:59:13 +08:00
jouls 54a1bf6306 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch 2024-03-20 14:56:48 +08:00
MarkHipe 8c0454570a Merge pull request 'dynamic search bar and filtering min & max' (#40) from raymart_branch into main
Reviewed-on: #40
2024-03-20 14:52:00 +08:00
raymart 19e95fc7e4 dynamic search bar and filtering min & max 2024-03-20 14:46:03 +08:00
MarkHipe 2eb2086cb0 Merge pull request 'Added all order tab on customer purchase history' (#39) from stacy_branch into main
Reviewed-on: #39
2024-03-20 14:15:15 +08:00
Stacy 877e2c6a81 Added all order tab on customer purchase history 2024-03-20 13:54:50 +08:00
MarkHipe 25bb47e57e Merge pull request 'jun-branch' (#38) from jun-branch into main
Reviewed-on: #38
2024-03-20 13:22:48 +08:00
Jun Barroga a1a6ab2efb Merge branch 'main' into jun-branch 2024-03-20 09:37:38 +08:00
Jun Barroga 14609b9693 Bank Account 2024-03-20 09:36:52 +08:00
JunBarroga 2289cce143 modified: admin/vendor-profile.php 2024-03-20 08:12:40 +08:00
JunBarroga e9a0505450 modified: cart1.php
modified:   catalog-single-vendor.php
	new file:   faq.php
	modified:   footer.php
	modified:   header.php
2024-03-19 18:28:43 +08:00
jouls 6d0170decf added payout page and route 2024-03-19 17:15:54 +08:00
Erwin Galang 70b3011c6a new file: .gitignore 2024-03-18 01:59:26 +00:00
JunBarroga da67badbec modified: admin/upload_monitor.php 2024-03-18 09:41:10 +08:00
MarkHipe 61781cbff3 Merge pull request 'wrapping the text, update the prize, replace product image to images' (#37) from raymart_branch into main
Reviewed-on: #37
2024-03-13 11:37:37 +08:00
raymart efb1d4a960 wrapping the text, update the prize, replace product image to images 2024-03-13 11:32:12 +08:00
MarkHipe 15977f1b02 Merge pull request 'placeholder for vendor & customer image, paginations, vendor search button, modified admin icon & modified vendor user tabs' (#36) from stacy_branch into main
Reviewed-on: #36
2024-03-13 11:13:57 +08:00
Stacy 38ff115b1f placeholder for vendor & customer image, paginations, vendor search button, modified admin icon & modified vendor user tabs 2024-03-13 10:59:15 +08:00
MarkHipe 42f89fa7ef Merge pull request 'stacy_branch' (#35) from stacy_branch into main
Reviewed-on: #35
2024-03-07 11:40:01 +08:00
Stacy 639bccf3e5 added delete and edit for user profile and modified category slider 2024-03-07 11:06:56 +08:00
Stacy b400d75494 <li> 2024-03-07 10:53:15 +08:00
MarkHipe 64c06a749f Merge pull request 'raymart_branch' (#34) from raymart_branch into main
Reviewed-on: #34
2024-03-07 10:40:49 +08:00
raymart cd922a186f March 7 2024 merge 2024-03-07 10:35:05 +08:00
raymart 157edf72a8 Add Delete and Edit Address Function on checkouttest.php 2024-03-07 10:27:30 +08:00
MarkHipe 00b4ca7a61 Merge pull request 'checkout_page_updates' (#33) from jun-branch into main
Reviewed-on: #33
2024-03-07 10:19:56 +08:00
Jun Barroga 2e505256f6 checkout_page_updates 2024-03-07 10:18:12 +08:00
MarkHipe 78d0915ba2 Merge pull request 'Catalog Slidebar & Admin Vendor Edit' (#32) from stacy_branch into main
Reviewed-on: #32
2024-02-29 16:42:46 +08:00
Stacy f91e552a89 Catalog Slidebar & Admin Vendor Edit 2024-02-29 16:00:50 +08:00
MarkHipe 214aa11028 Merge pull request 'index files; improve the CSS styles for the Product Image to ensure uniformity' (#31) from raymart_branch into main
Reviewed-on: #31
2024-02-29 15:06:36 +08:00
raymart 8982f54971 index files; improve the CSS styles for the Product Image to ensure uniformity 2024-02-29 15:05:09 +08:00
MarkHipe cd347af5f2 Merge pull request 'Admin Vendor Edit Vendor Details Bug' (#30) from jun-branch into main
Reviewed-on: #30
2024-02-29 13:42:40 +08:00
Jun Barroga d9aae2efda Admin Vendor Edit Vendor Details Bug 2024-02-29 13:21:33 +08:00
MarkHipe 8d98f924ee Merge pull request 'Category Slider File' (#29) from jun-branch into main
Reviewed-on: #29
2024-02-27 09:42:37 +08:00
Jun Barroga 5ef99b16ff Category Slider File 2024-02-27 09:40:54 +08:00