Skip to content

Commit

Permalink
Merge branch 'master' into beta
Browse files Browse the repository at this point in the history
  • Loading branch information
zoic21 authored Sep 8, 2024
2 parents 1760519 + bee5986 commit 77689a7
Show file tree
Hide file tree
Showing 2 changed files with 3 additions and 3 deletions.
1 change: 1 addition & 0 deletions Dockerfile
Original file line number Diff line number Diff line change
Expand Up @@ -64,4 +64,5 @@ EXPOSE 80
EXPOSE 443
COPY --chown=root:root --chmod=550 install/OS_specific/Docker/init.sh /root/
COPY --chown=root:root --chmod=550 install/bashrc /root/.bashrc

CMD ["bash", "/root/init.sh"]
5 changes: 2 additions & 3 deletions core/repo/market.display.repo.php
Original file line number Diff line number Diff line change
Expand Up @@ -90,10 +90,9 @@
} else {
if (config::byKey('market::apikey') != '' || (config::byKey('market::username') != '' && config::byKey('market::password') != '')) {
$purchase_info = repo_market::getPurchaseInfo();
if (isset($purchase_info['user_id']) && is_numeric($purchase_info['user_id'])) {
?>
if (isset($purchase_info['user_id']) && is_numeric($purchase_info['user_id'])) { ?>
<a class="btn btn-default" href='<?php echo config::byKey('market::address'); ?>/index.php?v=d&p=profils' target="_blank"><i class="fa fa-eur"></i> {{Code promo}}</a>
<?php
<?php
if ($market->getCertification() !== 'Premium') {
echo '<a class="btn btn-default" target="_blank" href="' . config::byKey('market::address') . '/index.php?v=d&p=market_display&id=' . $market->getId() . '"><i class="fa fa-shopping-cart"></i> {{Acheter}}</a>';
} else {
Expand Down

0 comments on commit 77689a7

Please sign in to comment.