Commit Graph

Select branches

Hide Pull Requests

gelo_branch

jun-branch

louie_branch

main

mark

mark_2

mark_3

mark_4

raymart_branch

stacy_branch

working_vendor_upload_branch

#1

#10

#11

#12

#13

#14

#15

#16

#17

#18

#19

#2

#20

#21

#22

#23

#24

#25

#26

#27

#28

#29

#3

#30

#31

#32

#33

#34

#35

#36

#37

#38

#39

#4

#40

#41

#42

#43

#44

#45

#46

#47

#48

#49

#5

#50

#51

#52

#53

#54

#55

#56

#57

#58

#59

#6

#60

#61

#62

#63

#64

#65

#66

#67

#68

#69

#7

#70

#71

#72

#73

#74

#75

#76

#77

#78

#79

#8

#80

#81

#82

#83

#84

#85

#86

#87

#88

#89

#9

#90

#91

#92

Mono Color

• c1c7611bb3 Merge pull request 'louie_branch' (#92) from louie_branch into main main MarkHipe 2024-06-05 15:53:37 +0800
• bdc6f313e6 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch louie_branch jouls 2024-06-05 15:44:12 +0800
• c0f77b9415 added required fields for vendor first name jouls 2024-06-05 15:43:47 +0800
• 58281130a5 Merge pull request 'new changes' (#91) from mark_4 into main MarkHipe 2024-06-05 15:41:22 +0800
• 86bd2d6f47 new changes mark_4 mark H 2024-06-05 15:40:23 +0800
• cfe9c96697 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch jouls 2024-06-03 10:59:53 +0800
• c382fa82bf added total payouts per vendor card in admin side jouls 2024-05-31 18:39:17 +0800
• b5fd8dae3c Merge pull request 'search prod fix error' (#90) from mark_4 into main gelo_branch MarkHipe 2024-05-30 13:38:33 +0800
• bcfae881a6 search prod fix error mark H 2024-05-30 13:37:52 +0800
• f24b1e303d Merge pull request 'minor fixes in label in user-profile/vendor-settings and minor ui changes in header.php' (#89) from gelo_branch into main MarkHipe 2024-05-30 10:34:17 +0800
• cb52a82b40 minor fixes in label in user-profile/vendor-settings and minor ui changes in header.php gelonspr 2024-05-30 10:33:40 +0800
• 35928618e9 Merge pull request 'mark_4' (#88) from mark_4 into main MarkHipe 2024-05-30 10:30:28 +0800
• 306edd1db5 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into mark_4 mark H 2024-05-30 10:29:44 +0800
• 3e8caa1e28 obanana rating mark H 2024-05-30 10:03:49 +0800
• ba91559ff3 Merge pull request 'louie_branch' (#87) from louie_branch into main MarkHipe 2024-05-30 10:03:35 +0800
• 4a8603ee48 fixed address section of vendor-settings and user-profile jouls 2024-05-28 18:23:48 +0800
• 58ac2155cb Added required prop on product name, slug, width, height, length, and weight. jouls 2024-05-28 15:53:17 +0800
• 25e991dc37 renamed displayed property on vendor profile under admin page jouls 2024-05-28 14:34:12 +0800
• b2deee4405 added logical handling for seller since with empty date_registered fields jouls 2024-05-23 10:49:46 +0800
• fbb4cd8082 removed duplicated contact us number and email jouls 2024-05-23 10:49:26 +0800
• f616306a45 added pagination admin vendor payments and payouts table jouls 2024-05-22 18:46:36 +0800
• 4620fde33d fixed vendor name and customer name on index jouls 2024-05-22 15:46:35 +0800
• cffda7e9e5 edited vendor payouts breadcrumbs jouls 2024-05-22 15:46:15 +0800
• 69a94fdfb0 Merge pull request 'mark_4' (#86) from mark_4 into main MarkHipe 2024-05-21 09:56:39 +0800
• ac3209663e Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into mark_4 mark H 2024-05-21 09:43:55 +0800
• 4b996b873c obanana chat mark H 2024-05-21 09:18:10 +0800
• 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 MarkHipe 2024-05-21 09:17:37 +0800
• bc7c212b91 added address label on vendor and buyer profile settings, initialized map on admin, fixed missing header on vendor-payments gelonspr 2024-05-21 09:15:21 +0800
• 0f48dfc231 Merge pull request 'louie_branch' (#84) from louie_branch into main MarkHipe 2024-05-21 09:12:13 +0800
• af34ad5738 improved styling of badge for order status on vendor dashboard jouls 2024-05-15 18:16:59 +0800
• 53698a00b0 changed button size on admin order-history to medium jouls 2024-05-15 18:14:52 +0800
• 813f7eb8b9 added javascript for line chart of monthly users jouls 2024-05-15 18:14:32 +0800
• a5b1d41094 added badge and improved styling on order status, fixed profile size on new customers and new vendors jouls 2024-05-15 18:14:16 +0800
• e1d31a0a47 imporvements on stylings and renaming of line chart for monthly users jouls 2024-05-15 18:13:34 +0800
• 092afe0fa1 fixed bug on edit and delete bank function jouls 2024-05-15 18:10:19 +0800
• 68959b61ce added array_reverse on payout data table to show latest payouts first on the table jouls 2024-05-15 18:09:39 +0800
• 40549f484e added required field for tracking number and courier name in to ship status on orders edit jouls 2024-05-15 18:08:53 +0800
• 3b6e0b843d fixed display of vendor or customer name on index jouls 2024-05-15 18:08:02 +0800
• 67ef426e36 removed to upper on first name and last name jouls 2024-05-15 18:07:04 +0800
• 0b12c0bae7 Merge pull request 'mark_4' (#83) from mark_4 into main MarkHipe 2024-05-08 18:07:24 +0800
• 2c47485103 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into mark_4 mark H 2024-05-08 18:05:13 +0800
• 94012e7ccb update exempt To checkout status mark H 2024-05-08 18:04:59 +0800
• 3a513218c5 Merge pull request 'gelo_branch' (#82) from gelo_branch into main MarkHipe 2024-05-08 18:03:59 +0800
• f2adac3fbc minor changes gelonspr 2024-05-08 18:02:41 +0800
• d0f51e2a03 minor changes in user-profile.php gelonspr 2024-05-08 18:01:19 +0800
• 6efdc5f4dd added message if wishlist is empty gelonspr 2024-05-08 18:00:36 +0800
• 9e5694145a Remove checkout option on Account icon and removed category button in login.php gelonspr 2024-05-08 18:00:10 +0800
• 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 gelonspr 2024-05-08 17:57:53 +0800
• bf27328ec3 Merge pull request 'louie_branch' (#81) from louie_branch into main MarkHipe 2024-05-08 17:54:16 +0800
• 4fe563d212 added dynamic information of vendor in admin vendor profile jouls 2024-05-08 17:49:41 +0800
• ac7fcc6942 added required prop on certain input fields jouls 2024-05-08 17:49:16 +0800
• b254e6241d added reload on delete selected products jouls 2024-05-08 15:39:59 +0800
• eed7c3d7b1 added edit and delete functionality on vendors bank information jouls 2024-05-08 14:20:48 +0800
• d0e49d0ea4 added strtoupper to control possible errors on payment status jouls 2024-05-08 14:20:14 +0800
• fd8016afd0 Merge pull request 'mark_4' (#80) from mark_4 into main MarkHipe 2024-05-03 18:46:44 +0800
• 7c5c0cab4f Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into mark_4 mark H 2024-05-03 18:24:24 +0800
• 6160b494c9 new update mark H 2024-05-03 18:21:20 +0800
• 478b74c465 Merge pull request 'stacy_branch' (#79) from stacy_branch into main MarkHipe 2024-05-03 18:15:57 +0800
• 62c2d9ae1b pagination & search filter stacy_branch Stacy 2024-05-03 18:13:39 +0800
• 7d44fae6bd cart & wishlist countdown in mobile view Stacy 2024-05-03 18:12:24 +0800
• 02b2f799db removed products for Sale/Inquiry in Vendor's Page Stacy 2024-05-03 18:09:25 +0800
• 1d6b14208d Vendor: Remove Buttons - Wishlist and Cart Stacy 2024-05-03 18:07:31 +0800
• 8439191bbc selection button for address Stacy 2024-05-03 18:05:45 +0800
• 3d686c607f Merge pull request 'fixed dynamic data for admin sales report chart' (#78) from gelo_branch into main MarkHipe 2024-05-03 17:05:16 +0800
• 22a3a404aa fixed dynamic data for admin sales report chart gelonspr 2024-05-03 17:00:39 +0800
• eec3c04121 Merge pull request 'louie_branch' (#77) from louie_branch into main MarkHipe 2024-05-03 16:58:01 +0800
• 0728acbcc6 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch jouls 2024-05-03 16:55:32 +0800
• d4f61153d2 Merge pull request 'minor bugs' (#76) from raymart_branch into main MarkHipe 2024-05-03 16:34:13 +0800
• 7679dad1e6 minor bugs raymart_branch raymart 2024-05-03 16:31:55 +0800
• 4200c4e155 minor fixes on stylings inside modal box jouls 2024-05-02 17:22:39 +0800
• 2da9f77349 Improved data table and layout of vendouy payouts page jouls 2024-05-02 15:59:16 +0800
• 4d7a47b158 Merge pull request 'mark_4' (#75) from mark_4 into main MarkHipe 2024-04-30 14:49:08 +0800
• 613325f68d new update mark H 2024-04-30 14:46:53 +0800
• 0c368796a7 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into mark_4 mark H 2024-04-30 14:42:33 +0800
• a9853d178c - new update mark H 2024-04-30 14:25:28 +0800
• a7a4b1482d Merge pull request 'stacy_branch' (#74) from stacy_branch into main MarkHipe 2024-04-30 14:17:02 +0800
• c361a31143 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into stacy_branch Stacy 2024-04-30 14:12:32 +0800
• 2cb98f24d6 Merge pull request 'fixed admin dashboard download csv and initialized dynamic dataset for sales report' (#73) from gelo_branch into main MarkHipe 2024-04-30 14:10:49 +0800
• f278bb854d fixed admin dashboard download csv and initialized dynamic dataset for sales report gelonspr 2024-04-30 14:09:53 +0800
• c154d801d2 Merge pull request 'louie_branch' (#72) from louie_branch into main MarkHipe 2024-04-30 14:07:17 +0800
• 32fd214c51 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into louie_branch jouls 2024-04-30 14:03:55 +0800
• 3fdab75955 applied price matrix on hover addtocart buttons Stacy 2024-04-30 13:47:33 +0800
• 3e3ebfe66c created back button Stacy 2024-04-30 13:46:28 +0800
• 3f334715f3 updated quantity UI Stacy 2024-04-30 13:45:35 +0800
• 7d847cd447 removed some reload and modified console Stacy 2024-04-30 13:44:23 +0800
• b4b69ba223 added dynamic bank information on upcoming payouts based on the default bank payout set by the user jouls 2024-04-30 09:26:24 +0800
• b92be0667d Merge pull request 'minor bugs, add +63 in contact at modal, pagination in admin' (#71) from raymart_branch into main MarkHipe 2024-04-30 09:12:20 +0800
• e6ea65914e minor bugs, add +63 in contact at modal, pagination in admin raymart 2024-04-30 09:11:18 +0800
• ca799e9c23 added bank name in upcoming payouts in payouts tab jouls 2024-04-30 09:04:40 +0800
• 465679ae48 Merge pull request 'Updates on checkout, product page, user history, vendor settings, vendor profile' (#70) from jun-branch into main MarkHipe 2024-04-30 08:28:00 +0800
• e1771dccdc Updates on checkout, product page, user history, vendor settings, vendor profile jun-branch Jun Barroga 2024-04-30 08:22:40 +0800
• 2ad0c9e955 changed logic of summation of daily revenue jouls 2024-04-26 17:36:12 +0800
• e8b5b6b50c added return status column on recent orders table jouls 2024-04-26 17:35:53 +0800
• 0dd203aba2 added error handling for routes on vendor pages jouls 2024-04-26 15:47:05 +0800
• 88ae2713bb improvements on new vendors table jouls 2024-04-26 14:26:32 +0800
• e30cbcebd7 improvements on admin dashboard and order history jouls 2024-04-26 13:01:28 +0800
• 0dfa648b19 Added total users and new vendors table, improvements on recent orders table jouls 2024-04-25 18:21:15 +0800
• 8858763cd6 Added New Customers Table jouls 2024-04-25 17:18:36 +0800
• 793afa339f Added Daily Signup Counter jouls 2024-04-25 15:35:16 +0800
• 35a6c3b693 added functions for getAllCustomers and getAllVendors jouls 2024-04-25 15:34:57 +0800