Commit Graph

133 Commits

Author SHA1 Message Date
Reza Taghizadeh
1f9a7ec551 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into reza-dev 2025-10-08 14:16:48 +03:30
7ef9b26330 merged 2025-10-07 19:02:36 +03:30
c264b461f3 2.65.0 2025-10-07 18:59:16 +03:30
c9481ec099 (feat): update Rose Assistant page based on new Figma design (partial) 2025-10-07 18:57:37 +03:30
Reza Taghizadeh
888c3f39c2 fix: resolve build bugs 2025-10-07 16:49:23 +03:30
Reza Taghizadeh
3bb57537d7 fix: resolve build bugs 2025-10-07 16:38:55 +03:30
Reza Taghizadeh
4cca0ed829 feat : add build config 2025-10-07 15:05:00 +03:30
Reza Taghizadeh
685f5ab547 fix : resolve pwa bugs 2025-10-07 14:47:03 +03:30
Reza Taghizadeh
4f670537af fix : resolve build bugs 2025-10-07 14:45:20 +03:30
Reza Taghizadeh
875765b87b fix : resolve pwa bugs 2025-10-07 14:41:24 +03:30
Reza Taghizadeh
20100c8345 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into reza-dev 2025-10-07 13:33:10 +03:30
Reza Taghizadeh
5875b03de9 Merge branch 'main' of https://github.com/erfan2220/Salona-new-version into reza-dev 2025-10-07 13:30:52 +03:30
Reza Taghizadeh
5663e1e6bf Merge pull request #5 from erfan2220/reza-dev
fix: resolve some bugs
2025-10-07 00:32:28 +03:30
Reza Taghizadeh
7d1bfe9385 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into reza-dev 2025-10-07 00:32:12 +03:30
Reza Taghizadeh
59268f2ff3 Revert "fix: resolve some bugs"
This reverts commit 77cfc1be3e.
2025-10-07 00:20:52 +03:30
Erfan Hashemi
543d8355cf feature/add theme color 2025-10-07 00:14:27 +03:30
Reza Taghizadeh
7dbd708e5f Merge pull request #4 from erfan2220/reza-dev
Reza dev
2025-10-07 00:02:49 +03:30
Reza Taghizadeh
77cfc1be3e fix: resolve some bugs 2025-10-07 00:00:30 +03:30
2584476db7 fixed 2025-10-06 20:20:22 +03:30
133caef423 version 1.5.0 2025-10-06 20:06:09 +03:30
1d580f83c4 Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into erf-dev 2025-10-06 18:57:21 +03:30
1f2623e9e1 (feat) - rose assistant modified 2025-10-06 18:52:55 +03:30
f34bb3f4b7 Merge branch 'erf-dev' into test 2025-10-06 00:29:17 +03:30
00b395359b merge 2025-10-06 00:28:51 +03:30
3621a15484 merge 2025-10-05 23:15:40 +03:30
f3d8ad450d (feat) - visit card modified 2025-10-05 23:10:51 +03:30
Reza Taghizadeh
800d0a4890 Merge pull request #3 from erfan2220/reza-dev
fix: resolve issue
2025-10-05 20:07:42 +03:30
Reza Taghizadeh
147494b273 fix: resolve issue 2025-10-05 20:04:25 +03:30
Reza Taghizadeh
352d178c61 Merge pull request #2 from erfan2220/reza-dev
Reza dev
2025-10-05 19:53:03 +03:30
Reza Taghizadeh
ee599e9f4c Merge branch 'test' of https://github.com/erfan2220/Salona-new-version into reza-dev 2025-10-05 19:52:13 +03:30
Reza Taghizadeh
0b4a3ed1e0 feat: add some feature to opinionSMS , refactor and code optimization 2025-10-05 19:24:20 +03:30
Reza Taghizadeh
ab84e18917 feat: create opinionSMS forms 2025-10-01 16:50:48 +03:30
2d8ac7a08c (feat) - visit card - location and physical card slider added 2025-10-01 14:55:09 +03:30
542b0b4eab 1.4.0 2025-09-30 20:25:41 +03:30
6292a5a14b (feat) - 2 section of add visit card completed 2025-09-30 20:24:57 +03:30
400d6a4c68 1.3.0 2025-09-30 02:34:22 +03:30
19339edb70 1.2.0 2025-09-30 02:32:51 +03:30
b096ac7ca0 (fix): updated Explore page gift card and events section based on Figma
(feat): added visit card image in Explore
(feat): implemented online visit card, view, and details section
2025-09-30 02:25:13 +03:30
Reza Taghizadeh
4b05a7d0c8 feat: add report-all component for accounting section , fix some ui issues 2025-09-29 16:55:37 +03:30
4146ddb2d0 Merge branch 'erf-dev' into test 2025-09-29 02:43:03 +03:30
49a0045c72 Merge branch 'test2' of https://github.com/erfan2220/Salona-new-version into test2 2025-09-28 18:12:50 +03:30
dbb584d4f4 (feat) -> UI gift card completed 2025-09-28 18:11:35 +03:30
Reza Taghizadeh
1ce60e0011 Merge pull request #1 from erfan2220/test2
Test2
2025-09-28 15:19:07 +03:30
Reza Taghizadeh
4c2c65a5e0 feat: add qrcode scanner component 2025-09-28 14:45:45 +03:30
fb310cb6c7 Merge branch 'test5' of https://github.com/erfan2220/Salona-new-version into test5 2025-09-27 22:54:35 +03:30
7da3f07332 (feat) -- purchase page modified
(feat) -- gift card page modified
2025-09-27 22:52:45 +03:30
45eb9460b2 (feat) -- purchase page modified
(feat) -- gift card page modified
2025-09-27 19:36:02 +03:30
bc470b85f3 bug fixed 2025-09-24 22:09:48 +03:30
73fbac6e31 (feat) - discount event UI completed 2025-09-24 18:22:42 +03:30
2c38a8e2ce (feat) - loyalty card config completed 2025-09-23 18:38:00 +03:30