Commit Graph

150 Commits

Author SHA1 Message Date
a3c3a9d499 sells update 2025-06-02 17:04:23 +07:00
0d2edb7ea2 fix sell order and confirm payment in detailpayment 2025-05-30 05:19:11 +07:00
e51e753a04 Merge branch 'screen-features' 2025-05-29 16:40:25 +07:00
e2d909d218 update payment and add evidence 2025-05-29 16:39:50 +07:00
67ebb9d2ea Merge branch 'screen-features' 2025-05-29 13:39:13 +07:00
b9f387a626 delete chatliststore and chatstoreadapter 2025-05-29 02:49:02 +07:00
f4e130b93a update chat customer and store 2025-05-29 02:46:31 +07:00
a81828e33b Merge branch 'screen-features' 2025-05-28 22:39:32 +07:00
3075af3f7b update chat store 2025-05-28 22:38:58 +07:00
86d195a353 Merge branch 'screen-features'
# Conflicts:
#	app/src/main/AndroidManifest.xml
2025-05-28 18:53:20 +07:00
9b0ae95dfc add chat store 2025-05-28 18:51:32 +07:00
17f5ad8f18 Merge branch 'screen-features' 2025-05-28 17:33:06 +07:00
b1db662494 add all order tab 2025-05-28 17:32:36 +07:00
fdf410bc5c Merge branch 'screen-features'
# Conflicts:
#	app/src/main/AndroidManifest.xml
2025-05-27 17:41:55 +07:00
d93874d831 fixed chat 2025-05-27 17:39:51 +07:00
67964d43cb store address update 2025-05-27 00:06:50 +07:00
996071ff71 edit store profile 2025-05-26 18:57:32 +07:00
6a887a22aa edit store profile 2025-05-26 04:41:47 +07:00
e9b4d7a8f1 product create, update, delete 2025-05-25 17:31:07 +07:00
59e2e6a43b product create, update, delete 2025-05-24 18:05:13 +07:00
fca21743d6 not fixed order seller 2025-05-22 16:26:47 +07:00
93f554836d Merge remote-tracking branch 'origin/master' 2025-05-22 10:35:30 +07:00
e7fbace532 update ui and detail store 2025-05-22 04:17:55 +07:00
5bebfa4dd0 pending status 2025-05-22 00:17:16 +07:00
419eddee90 update cart wholesale 2025-05-21 21:57:42 +07:00
aa0c01140b Merge branch 'gracia' 2025-05-21 17:47:16 +07:00
4d195fe483 update registerstore worked 2025-05-21 17:44:08 +07:00
b154c91152 Merge remote-tracking branch 'origin/master' into gracia
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	gradle/libs.versions.toml
2025-05-21 12:19:24 +07:00
02b7d7559a fix order wholesale 2025-05-21 12:03:46 +07:00
4f65b845d6 sells store 2025-05-21 00:26:00 +07:00
b5e47050b9 add list notif 2025-05-20 14:57:15 +07:00
0c49be5ae6 update sent fcmtoken 2025-05-20 09:14:13 +07:00
e41f599814 Merge branch 'screen-features' 2025-05-20 08:33:26 +07:00
98e82cb6db update addrses in register 2025-05-20 08:32:33 +07:00
907d8365fd Merge branch 'screen-features' 2025-05-19 18:50:08 +07:00
ae6ca21a98 update fcm 2025-05-19 18:47:57 +07:00
e6b5b25072 Merge pull request #23
gracia
2025-05-19 14:32:44 +07:00
4e4faf25be shipping services config 2025-05-19 14:30:55 +07:00
08b096860e add verifregisterreponse 2025-05-19 13:57:35 +07:00
e014ff3aa6 Merge pull request #22 from shaulascr/gracia
BASE_URL config
2025-05-19 13:56:55 +07:00
1ebe44e062 BASE_URL config 2025-05-19 13:54:08 +07:00
19f8910e25 add verifregisterreponse 2025-05-19 13:31:04 +07:00
d726c5ccc6 update ui 2025-05-19 13:28:21 +07:00
2b2418cdf4 add cancel and logout 2025-05-19 07:09:18 +07:00
e71a39747c add registerstoreuser 2025-05-15 03:41:38 +07:00
b988a2e4bc fix apiservice 2025-05-14 23:02:08 +07:00
0ad1d7b9f2 fix apiservice 2025-05-14 21:47:24 +07:00
afd2819192 add push notif firebase 2025-05-14 21:40:19 +07:00
ce8a6b24b4 fix checkout 2025-05-14 04:56:31 +07:00
648385835c Merge branch 'master' into screen-features
# Conflicts:
#	app/src/main/AndroidManifest.xml
#	app/src/main/java/com/alya/ecommerce_serang/data/api/retrofit/ApiService.kt
#	app/src/main/java/com/alya/ecommerce_serang/data/repository/OrderRepository.kt
#	app/src/main/java/com/alya/ecommerce_serang/ui/order/CheckoutActivity.kt
2025-05-14 04:27:42 +07:00