瀏覽代碼

Merge branch 'develop'

master^2
Fab 3 年之前
父節點
當前提交
256d48677e
共有 3 個文件被更改,包括 11 次插入3 次删除
  1. +2
    -2
      ShopBundle/Resources/views/backend/default/block/macros.html.twig
  2. +9
    -0
      ShopBundle/Resources/views/backend/default/field/status.html.twig
  3. +0
    -1
      ShopBundle/Twig/FrontendTwigExtension.php

+ 2
- 2
ShopBundle/Resources/views/backend/default/block/macros.html.twig 查看文件

@@ -353,13 +353,13 @@
{{ reductionCredit.value|format_price(false) }}
</td>
<td>
{% include '@EasyAdmin/default/field_boolean.html.twig' with {value: reductionCredit.status} %}
{% include '@LcShop/backend/default/field/status.html.twig' with {value: reductionCredit.status} %}
</td>
<td>
{% include '@EasyAdmin/default/field_boolean.html.twig' with {value: isUsed} %}
</td>
<td>
{% if isUsed == false %}
{% if isUsed == false and reductionCredit.status >=0 %}
{{ _self.button('ReductionCredit', 'edit', reductionCredit.id, 'primary') }}
{% endif %}
</td>

+ 9
- 0
ShopBundle/Resources/views/backend/default/field/status.html.twig 查看文件

@@ -0,0 +1,9 @@
{% trans_default_domain 'EasyAdminBundle' %}

{% if value == 1 %}
<span class="badge badge-success">{{ 'label.true'|trans }}</span>
{% elseif value == 0 %}
<span class="badge badge-danger">{{ 'label.false'|trans }}</span>
{% elseif value == -1 %}
<span class="badge badge-secondary">Supprimé</span>
{% endif %}

+ 0
- 1
ShopBundle/Twig/FrontendTwigExtension.php 查看文件

@@ -60,7 +60,6 @@ class FrontendTwigExtension extends AbstractExtension
new TwigFunction('get_merchants', [$this, 'getMerchants']),
new TwigFunction('get_file_manager_folder', [$this, 'getFileManagerFolder']),
new TwigFunction('lc_format_price', [$this, 'formatPrice']),
new TwigFunction('get_form_manage_notifications', [$this, 'getFormManageNotifications']),
);
}


Loading…
取消
儲存