Pārlūkot izejas kodu

Merge branch 'dev'

master
Guillaume Bourgeois pirms 5 gadiem
vecāks
revīzija
7fc8fa79e3
2 mainītis faili ar 5 papildinājumiem un 1 dzēšanām
  1. +2
    -0
      backend/views/distribution/index.php
  2. +3
    -1
      common/models/PointSale.php

+ 2
- 0
backend/views/distribution/index.php Parādīt failu

@@ -261,6 +261,8 @@ $this->setPageTitle('Distributions') ;
<span class="label label-default input-group-addon" v-else-if="order.amount_paid == 0">non réglé</span>
<span class="label label-default input-group-addon" v-else-if="order.amount_paid > order.amount">surplus</span>
<span class="label label-warning input-group-addon" v-else-if="order.amount_paid < order.amount">reste à payer</span>
<span class="glyphicon glyphicon-time" title="Paiement automatique" v-if="order.auto_payment && producer.credit && (order.amount_paid == 0 || order.amount_paid < order.amount)"></span>
</div>
</td>
<td class="column-payment" v-if="producer.credit">

+ 3
- 1
common/models/PointSale.php Parādīt failu

@@ -341,7 +341,9 @@ class PointSale extends ActiveRecordCommon
*/
public function getCreditFunctioning()
{
return $this->credit_functioning ? $this->credit_functioning : Producer::getConfig('credit_functioning') ;
return strlen($this->credit_functioning) > 0 ?
$this->credit_functioning :
Producer::getConfig('credit_functioning') ;
}
/**

Notiek ielāde…
Atcelt
Saglabāt