Merge branch 'develop'

ShopBundle/Resources/views/backend/default/block/macros.html.twig

@@ -331,7 +331,7 @@
 
 
 
-{% macro list_reduction_credits(reductionCredits) %}
+{% macro list_reduction_credits(reductionCredits, user) %}
     <table class="table table-condensed">
         <thead>
         <tr>
@@ -344,7 +344,7 @@
         </thead>
         <tbody>
         {% for reductionCredit in reductionCredits %}
-            {% set isUsed = orderUtils.isReductionCreditUsed(reductionCredit) %}
+            {% set isUsed = orderUtils.isReductionCreditUsed(reductionCredit, user) %}
             <tr>
                 <td>{{ reductionCredit.title }}</td>
                 <td>

ShopBundle/Resources/views/backend/user/show.html.twig

@@ -53,7 +53,7 @@
 
                 {% if entity.reductionCredits|length %}
                     {{ macros.card_start('ReductionCredit.list', 'warning card-outline', false) }}
-                    {{ macros.list_reduction_credits(entity.reductionCredits) }}
+                    {{ macros.list_reduction_credits(entity.reductionCredits, entity) }}
                     {{ macros.card_end() }}
                 {% endif %}
 

ShopBundle/Services/Order/OrderUtilsReductionTrait.php

@@ -200,8 +200,8 @@ trait OrderUtilsReductionTrait
                 }
         }
 
-        public function isReductionCreditUsed($reductionCredit){
-                if($this->orderShopRepo->countValidOrderWithReductionCredit($reductionCredit)) {
+        public function isReductionCreditUsed($reductionCredit, $user = false){
+                if($this->orderShopRepo->countValidOrderWithReductionCredit($reductionCredit, $user)) {
                         return true;
                 }else{
                         return false;