Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

feat(themes): Support loyalty program #448

Open
wants to merge 45 commits into
base: master
Choose a base branch
from
Open
Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
45 commits
Select commit Hold shift + click to select a range
8864cdd
Support loyalty program copmponent
eslamoo Aug 11, 2024
103a1fd
bugfixes
maalfaifi Aug 12, 2024
34da55e
add exchange points
maalfaifi Aug 13, 2024
2997986
Update master.twig
maalfaifi Aug 13, 2024
f57b440
apply colors, bugfixes
maalfaifi Aug 13, 2024
2ed34da
bugfixes
maalfaifi Aug 14, 2024
3f999d1
Update build
maalfaifi Aug 20, 2024
f9a6798
Update build
maalfaifi Aug 20, 2024
48b83ab
update cart
maalfaifi Aug 25, 2024
f438d39
bugfixes
maalfaifi Aug 25, 2024
88eef54
Update master.twig
maalfaifi Aug 25, 2024
68a9faa
Update master.twig
maalfaifi Aug 26, 2024
48c8154
update build
maalfaifi Aug 29, 2024
b4319df
Update build
maalfaifi Sep 1, 2024
dc16f89
Update app.css
maalfaifi Sep 1, 2024
8c69166
update build
maalfaifi Sep 4, 2024
765413a
Update build
maalfaifi Sep 5, 2024
2d801db
Update twilight
maalfaifi Sep 8, 2024
d86dccf
Update twilight
maalfaifi Sep 8, 2024
33c8715
add build: twilight + app.css + salla-loyalty-banner
maalfaifi Sep 8, 2024
d28c546
Update builds
maalfaifi Sep 9, 2024
db6e2d9
update build
maalfaifi Sep 9, 2024
dc525b0
Update builds
maalfaifi Sep 11, 2024
ba7f759
Update builds
maalfaifi Sep 11, 2024
3a24e0b
Update build
maalfaifi Sep 14, 2024
20d3632
update build
maalfaifi Sep 15, 2024
391498c
update build
maalfaifi Sep 15, 2024
1440999
Update build
maalfaifi Sep 16, 2024
19a74cc
Update build
maalfaifi Sep 16, 2024
20282c5
Update build
maalfaifi Sep 16, 2024
aa2b117
Update build
maalfaifi Sep 18, 2024
7a59a94
Update master.twig
maalfaifi Sep 18, 2024
c267bb8
Update raed
maalfaifi Sep 18, 2024
20cac88
build
maalfaifi Sep 26, 2024
0935d06
Update master.twig
maalfaifi Sep 26, 2024
e5f5a98
Update app.css
maalfaifi Sep 26, 2024
a619fba
Update master.twig
maalfaifi Sep 29, 2024
21773f5
Update master.twig
maalfaifi Sep 29, 2024
d2d32bb
Update master.twig
maalfaifi Sep 29, 2024
30ceb37
Update master.twig
maalfaifi Oct 3, 2024
79a01ef
Merge branch 'master' into feature/DAM-5606-fe-loyalty-new-points
maalfaifi Oct 23, 2024
1b15796
Update app.css
maalfaifi Oct 23, 2024
9e11103
Merge branch 'master' into feature/DAM-5606-fe-loyalty-new-points
naderm91 Oct 30, 2024
75ac6d7
chore: cleanup
maalfaifi Nov 3, 2024
236664b
chore: cleanup
maalfaifi Nov 3, 2024
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
28 changes: 23 additions & 5 deletions public/app.css

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion public/pages.js

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

42 changes: 0 additions & 42 deletions src/assets/js/loyalty.js

This file was deleted.

103 changes: 0 additions & 103 deletions src/assets/styles/04-components/loyalty.scss

This file was deleted.

2 changes: 0 additions & 2 deletions src/assets/styles/app.scss
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,6 @@
* Brands...............Specific styles for brands page.
* Placeholder..........Specific styles for no content placeholders.
* Gifting..............Specific styles for gifting system.
* Loyalty..............Specific styles for loyalty system.
*
* UTILITIES
* Chat Bots............Specific styles for chats bots widget.
Expand Down Expand Up @@ -80,7 +79,6 @@
@import './04-components/brands';
@import './04-components/no-content-placeholder';
@import './04-components/gifting';
@import './04-components/loyalty';
@import './04-components/virtooal';
@import './04-components/landing-page';
@import './04-components/filters';
Expand Down
12 changes: 6 additions & 6 deletions src/views/pages/cart.twig
Original file line number Diff line number Diff line change
Expand Up @@ -181,13 +181,13 @@
</div>
</div>
</div>

{% if loyalty and user.loyalty_points %}
<div class="shadow-default mb-5 rounded-md p-3 xs:p-7 bg-white">
<salla-loyalty customer-points='{{ user.loyalty_points }}'
prize-points='{{ loyalty.prize.points }}'
prize-title='{{ loyalty.prize.title }}'
></salla-loyalty>
</div>
<salla-loyalty-panel
customer-points='{{ user.loyalty_points }}'
prize-points='{{ loyalty.prize.points }}'
prize-title='{{ loyalty.prize.title }}'>
</salla-loyalty-panel>
{% endif %}

<div class="shadow-default bg-white p-5 xs:p-7 rounded-md mb-5 relative transition-height duration-1000">
Expand Down
Loading
Loading