Commit Graph

217 Commits

Author SHA1 Message Date
d38bdb77dd Merge remote-tracking branch 'origin/master' 2025-06-21 18:13:09 +07:00
019b469556 fix price and chat date 2025-06-21 18:12:54 +07:00
4401daa310 fix search 2025-06-21 18:12:54 +07:00
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
88cf5f1457 Merge pull request #32
gracia
2025-06-21 16:56:22 +07:00
e4fb409097 all sells list 2025-06-21 15:16:29 +07:00
3c97b3b3de product change stock and price 2025-06-20 01:50:39 +07:00
25764c6b89 Merge branch 'screen-features' 2025-06-18 16:44:08 +07:00
6ced0d31dc fix price and chat date 2025-06-18 16:43:03 +07:00
a907a4f1d6 fix search 2025-06-18 14:00:20 +07:00
1b96a5a9df Merge branch 'screen-features'
# Conflicts:
#	app/src/main/AndroidManifest.xml
2025-06-18 00:41:47 +07:00
420208ba19 update display category list 2025-06-18 00:31:52 +07:00
95d5439050 update display product list and paid status 2025-06-17 16:20:30 +07:00
fe331e7bb3 update display product 2025-06-17 00:18:15 +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
c325937847 Merge pull request #31
gracia
2025-06-11 00:03:31 +07:00
1a3c2c466a payment and shipment confirmation 2025-06-11 00:03:02 +07:00
27d10957a9 Merge pull request #30
gracia
2025-06-08 17:37:11 +07:00
aa8229f0a0 sells detail 2025-06-08 17:36:20 +07:00
02475b6489 Merge pull request #29
sells detail
2025-06-03 00:24:40 +07:00
51882ff634 sells detail 2025-06-03 00:23:19 +07:00
d642505e2f Merge remote-tracking branch 'origin/master' 2025-06-02 17:05:27 +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
7d9f2b4d2f delete chatliststore and chatstoreadapter 2025-06-02 17:05:12 +07:00
1f47ca6d74 update chat customer and store 2025-06-02 17:05:12 +07:00
1e76b08be6 update chat store 2025-06-02 17:05:12 +07:00
c32b952f04 add chat store 2025-06-02 17:05:12 +07:00
c56d242cce add all order tab 2025-06-02 17:05:12 +07:00
90d8245f10 update font and chat 2025-06-02 17:05:11 +07:00
a93d039b27 sells update 2025-06-02 17:04:56 +07:00
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
1c443232ae update font and chat 2025-05-27 18:03:42 +07:00