Commit Graph

53 Commits

Author SHA1 Message Date
RryAn05 4bc084358c Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into stacy_branch 2024-02-20 13:04:33 +08:00
RryAn05 2f7eb29f43 Cart Floating Side-Bar UI & Contact Seller 2024-02-20 13:01:25 +08:00
MarkHipe 351acf87dd Merge pull request 'raymart_branch' (#18) from raymart_branch into main
Reviewed-on: #18
2024-02-20 11:36:26 +08:00
raymart 13fed959b1 Wishlist Multiple Delete 2024-02-20 11:24:13 +08:00
raymart 3fd03351c3 Wishlist Multiple Delete and Wishlist Select All Delete 2024-02-20 11:21:23 +08:00
MarkHipe 09d777cb80 Merge pull request 'Same Day Delivery' (#17) from jun-branch into main
Reviewed-on: #17
2024-02-20 09:38:57 +08:00
Jun Barroga 105c93079c Same Day Delivery 2024-02-20 09:23:54 +08:00
MarkHipe 5cc36505fe Merge pull request 'enabled same-day delivery page' (#16) from erwin_branch into main
Reviewed-on: #16
2024-02-19 11:20:54 +08:00
Erwin Galang 815f0937f2 enabled same-day delivery page 2024-02-19 11:01:44 +08:00
erwin 0f015cce5f Merge pull request 'config enhancement - enabled dynamic url for upload monitoring & switching of js between test and prod' (#15) from erwin_branch into main
Reviewed-on: #15
2024-02-16 14:48:38 +08:00
Erwin Galang cbb11d60c6 config enhancement - enabled dynamic url for upload monitoring 2024-02-16 14:43:40 +08:00
Erwin Galang 51ff64d054 config file enhancement - enabled switching of js between test and prod 2024-02-16 13:38:10 +08:00
MarkHipe 1c1150334b Merge pull request 'stacy_branch' (#14) from stacy_branch into main
Reviewed-on: #14
2024-02-16 13:27:41 +08:00
Staycie 4a6b027f9c Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into stacy_branch 2024-02-16 13:07:40 +08:00
Staycie 01c736b868 Contact Us Page 2024-02-16 12:59:22 +08:00
erwin 5ad26fa20b Merge pull request 'fixes to conflicts in config based settings' (#13) from erwin_branch into main
Reviewed-on: #13
2024-02-16 11:21:46 +08:00
Erwin Galang 431336cf14 fixes to conflicts in config based settings 2024-02-16 11:18:40 +08:00
Staycie 3c343d6266 message sent pop up 2024-02-16 11:05:02 +08:00
Erwin Galang 152d9832ff fixed vendor-uploads.php conflicts 2024-02-16 10:00:30 +08:00
Erwin Galang 155cd3df6e fixed vendor-uploads.php 2024-02-16 09:51:46 +08:00
Staycie a12dd88621 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into stacy_branch 2024-02-16 09:23:28 +08:00
erwin c8529f58cf Merge pull request 'updated api links to follow config.php' (#12) from erwin_branch into main
Reviewed-on: #12
2024-02-15 22:25:59 +08:00
Erwin Galang 2bb8b8062b updated api links to follow config.php 2024-02-15 22:24:47 +08:00
erwin 2a6882fd75 Merge pull request 'introduced config.php - test mode, test email, data endpoint' (#10) from erwin_branch into main
Reviewed-on: #10
2024-02-15 21:59:02 +08:00
Erwin Galang 02387180ee Merge branch 'erwin_branch' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into erwin_branch 2024-02-15 21:56:49 +08:00
webdeveloper 4f8a0c5471 introduced config.php - test mode, test email, data endpoint 2024-02-15 20:42:37 +08:00
MarkHipe 129a9e7734 Merge pull request 'Vendor Product Add and Edit page Multiple Image' (#9) from jun-branch into main
Reviewed-on: #9
2024-02-15 17:34:40 +08:00
Jun Barroga 8bd8211b3d Vendor Product Add and Edit page Multiple Image 2024-02-15 17:32:28 +08:00
Staycie c41774adc4 modified 2024-02-15 16:12:28 +08:00
Staycie 2c8467bcca removed required 2024-02-15 10:37:08 +08:00
MarkHipe 89d0535af8 Merge pull request 'NEW file' (#8) from stacy_branch into main
Reviewed-on: #8
2024-02-15 09:41:56 +08:00
Staycie 593b99e8f6 NEW file 2024-02-15 09:28:08 +08:00
MarkHipe b97836f1bc Merge pull request 'raymart_branch' (#7) from raymart_branch into main
Reviewed-on: #7
2024-02-14 18:20:45 +08:00
raymart fd712f1ad9 Merge branch 'main' of https://code.obanana.io/Obanana.Corporation/obanana_b2b_test into raymart_branch 2024-02-14 02:16:10 -08:00
raymart 3652cc560e mak 2024-02-14 02:03:59 -08:00
MarkHipe 97c6a51083 Merge pull request 'Vendor User Tabs' (#6) from jun-branch into main
Reviewed-on: #6
2024-02-14 17:55:21 +08:00
Jun Barroga a004d1e7d5 Vendor User Tabs 2024-02-14 17:47:28 +08:00
erwin 61d9aaf104 Merge pull request 'include parent in selection list for variable product' (#5) from jun-branch into main
Reviewed-on: #5
2024-02-14 11:02:21 +08:00
erwin ac3de653e4 Merge pull request 'revert d1cb60d90878ce4df748fa7c93d8f93f0e72c0b5' (#4) from erwin-patch-1 into main
Reviewed-on: #4
2024-02-14 10:33:10 +08:00
erwin 13f24b47d2 revert d1cb60d908
revert Merge pull request 'first commit for highlighting active tab' (#3) from stacy_branch into main

Reviewed-on: #3
2024-02-14 10:32:33 +08:00
erwin d1cb60d908 Merge pull request 'first commit for highlighting active tab' (#3) from stacy_branch into main
Reviewed-on: #3
2024-02-14 10:13:12 +08:00
raymart dd254035c4 edit admin/vendor weight, height, length, width 2024-02-13 17:20:20 -08:00
erwin b8cb888883 Merge pull request 'raymart_branch' (#2) from raymart_branch into main
Reviewed-on: #2
2024-02-14 09:09:25 +08:00
erwin 37e3b8da2a Merge branch 'main' into raymart_branch 2024-02-14 09:08:29 +08:00
raymart 44a3232c79 edit admin/vendor weight, height, length, width 2024-02-13 02:29:15 -08:00
raymart 2f20bc4f9b edit admin/vendor for weight, height, length, width 2024-02-13 02:12:34 -08:00
Jun Barroga 959f2e6258 First Commit 2024-02-13 17:54:24 +08:00
erwin 3d60c27c7c Merge pull request 'edit weight, height, width, length' (#1) from raymart_branch into main
Reviewed-on: #1
2024-02-13 17:12:09 +08:00
raymart cc9209ac9a edit weight, height, width, length 2024-02-13 00:55:06 -08:00
Erwin Galang 33b48d2e4b enabled About Us page 2024-02-13 16:13:58 +08:00