Commit Graph

327 Commits

Author SHA1 Message Date
MarkHipe 82815035da Merge pull request 'added address label on vendor and buyer profile settings, initialized map on admin, fixed missing header on vendor-payments' (#85) from gelo_branch into main
Reviewed-on: #85
2024-05-21 09:17:37 +08:00
gelonspr bc7c212b91 added address label on vendor and buyer profile settings, initialized map on admin, fixed missing header on vendor-payments 2024-05-21 09:15:21 +08:00
MarkHipe 0f48dfc231 Merge pull request 'louie_branch' (#84) from louie_branch into main
Reviewed-on: #84
2024-05-21 09:12:13 +08:00
jouls af34ad5738 improved styling of badge for order status on vendor dashboard 2024-05-15 18:16:59 +08:00
jouls 53698a00b0 changed button size on admin order-history to medium 2024-05-15 18:14:52 +08:00
jouls 813f7eb8b9 added javascript for line chart of monthly users 2024-05-15 18:14:32 +08:00
jouls a5b1d41094 added badge and improved styling on order status, fixed profile size on new customers and new vendors 2024-05-15 18:14:16 +08:00
jouls e1d31a0a47 imporvements on stylings and renaming of line chart for monthly users 2024-05-15 18:13:34 +08:00
jouls 092afe0fa1 fixed bug on edit and delete bank function 2024-05-15 18:10:19 +08:00
jouls 68959b61ce added array_reverse on payout data table to show latest payouts first on the table 2024-05-15 18:09:39 +08:00
jouls 40549f484e added required field for tracking number and courier name in to ship status on orders edit 2024-05-15 18:08:53 +08:00
jouls 3b6e0b843d fixed display of vendor or customer name on index 2024-05-15 18:08:02 +08:00
jouls 67ef426e36 removed to upper on first name and last name 2024-05-15 18:07:04 +08:00
MarkHipe 0b12c0bae7 Merge pull request 'mark_4' (#83) from mark_4 into main
Reviewed-on: #83
2024-05-08 18:07:24 +08:00
mark H 2c47485103 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into mark_4 2024-05-08 18:05:13 +08:00
mark H 94012e7ccb update exempt To checkout status 2024-05-08 18:04:59 +08:00
MarkHipe 3a513218c5 Merge pull request 'gelo_branch' (#82) from gelo_branch into main
Reviewed-on: #82
2024-05-08 18:03:59 +08:00
gelonspr f2adac3fbc minor changes 2024-05-08 18:02:41 +08:00
gelonspr d0f51e2a03 minor changes in user-profile.php 2024-05-08 18:01:19 +08:00
gelonspr 6efdc5f4dd added message if wishlist is empty 2024-05-08 18:00:36 +08:00
gelonspr 9e5694145a Remove checkout option on Account icon and removed category button in login.php 2024-05-08 18:00:10 +08:00
gelonspr 2ef5f188d7 Add function to checkbox by clicking the category text on sidebar under shop-list-left-sidebar.php and Adjust Naming on shop-list-left-sidebar.php 2024-05-08 17:57:53 +08:00
MarkHipe bf27328ec3 Merge pull request 'louie_branch' (#81) from louie_branch into main
Reviewed-on: #81
2024-05-08 17:54:16 +08:00
jouls 4fe563d212 added dynamic information of vendor in admin vendor profile 2024-05-08 17:49:41 +08:00
jouls ac7fcc6942 added required prop on certain input fields 2024-05-08 17:49:16 +08:00
jouls b254e6241d added reload on delete selected products 2024-05-08 15:39:59 +08:00
jouls eed7c3d7b1 added edit and delete functionality on vendors bank information 2024-05-08 14:20:48 +08:00
jouls d0e49d0ea4 added strtoupper to control possible errors on payment status 2024-05-08 14:20:14 +08:00
MarkHipe fd8016afd0 Merge pull request 'mark_4' (#80) from mark_4 into main
Reviewed-on: #80
2024-05-03 18:46:44 +08:00
mark H 7c5c0cab4f Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into mark_4 2024-05-03 18:24:24 +08:00
mark H 6160b494c9 new update 2024-05-03 18:21:20 +08:00
MarkHipe 478b74c465 Merge pull request 'stacy_branch' (#79) from stacy_branch into main
Reviewed-on: #79
2024-05-03 18:15:57 +08:00
Stacy 62c2d9ae1b pagination & search filter 2024-05-03 18:13:39 +08:00
Stacy 7d44fae6bd cart & wishlist countdown in mobile view 2024-05-03 18:12:24 +08:00
Stacy 02b2f799db removed products for Sale/Inquiry in Vendor's Page 2024-05-03 18:09:25 +08:00
Stacy 1d6b14208d Vendor: Remove Buttons - Wishlist and Cart 2024-05-03 18:07:31 +08:00
Stacy 8439191bbc selection button for address 2024-05-03 18:05:45 +08:00
MarkHipe 3d686c607f Merge pull request 'fixed dynamic data for admin sales report chart' (#78) from gelo_branch into main
Reviewed-on: #78
2024-05-03 17:05:16 +08:00
gelonspr 22a3a404aa fixed dynamic data for admin sales report chart 2024-05-03 17:00:39 +08:00
MarkHipe eec3c04121 Merge pull request 'louie_branch' (#77) from louie_branch into main
Reviewed-on: #77
2024-05-03 16:58:01 +08:00
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