Commit Graph

121 Commits

Author SHA1 Message Date
28b0d5b082 update display category list 2025-06-21 18:12:54 +07:00
b37848e513 update display product list and paid status 2025-06-21 18:12:54 +07:00
6659ba4288 update 2025-06-21 18:12:45 +07:00
3c97b3b3de product change stock and price 2025-06-20 01:50:39 +07:00
454498d6eb payment and shipment confirmation 2025-06-12 23:11:30 +07:00
178dbf78fa Merge branch 'screen-features' 2025-06-12 21:48:13 +07:00
7ee6296e53 fix store detail & courier cost 2025-06-12 15:38:30 +07:00
1a3c2c466a payment and shipment confirmation 2025-06-11 00:03:02 +07:00
aa8229f0a0 sells detail 2025-06-08 17:36:20 +07:00
51882ff634 sells detail 2025-06-03 00:23:19 +07:00
1085305910 sells update 2025-06-02 17:05:12 +07:00
aecd257180 fix sell order and confirm payment in detailpayment 2025-06-02 17:05:12 +07:00
968292a35a update payment and add evidence 2025-06-02 17:05:12 +07:00
1f47ca6d74 update chat customer and store 2025-06-02 17:05:12 +07:00
c32b952f04 add chat store 2025-06-02 17:05:12 +07:00
a93d039b27 sells update 2025-06-02 17:04:56 +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
f4e130b93a update chat customer and store 2025-05-29 02:46:31 +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
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
6a887a22aa edit store profile 2025-05-26 04:41:47 +07:00
e7fbace532 update ui and detail store 2025-05-22 04:17:55 +07:00
419eddee90 update cart wholesale 2025-05-21 21:57:42 +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
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
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
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
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
c956e54166 add edit profile activity 2025-05-14 02:52:59 +07:00
bf810ddc3e edit store profile & topup 2025-05-13 19:39:54 +07:00
79c32fc5ee update detail order 2025-05-13 17:01:52 +07:00
edddecaaf0 update add review, fix cart, fix order 2025-05-13 11:07:30 +07:00
4497300d12 edit store profile & topup 2025-05-12 16:50:31 +07:00
5916b2494d Merge branch 'master' into gracia 2025-05-12 13:30:32 +07:00
b3ab3de964 update 2025-05-12 12:04:29 +07:00
5bf89f3b86 add 2025-05-11 17:25:51 +07:00