Sfoglia il codice sorgente

Merge branch 'dev'

master
parent
commit
1a85e6ce14
1 ha cambiato i file con 3 aggiunte e 3 eliminazioni
  1. +3
    -3
      producer/controllers/OrderController.php

+ 3
- 3
producer/controllers/OrderController.php Vedi File

@@ -344,9 +344,9 @@ class OrderController extends ProducerBaseController
$amountRemaining = $order->getAmount(Order::AMOUNT_REMAINING) ;
if($credit && $pointSale->credit &&
( $posts['use_credit'] ||
$pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_MANDATORY ||
($pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_USER && $userProducer->credit_active)
( ($pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_OPTIONAL && $posts['use_credit']) ||
$pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_MANDATORY ||
($pointSale->credit_functioning == Producer::CREDIT_FUNCTIONING_USER && $userProducer->credit_active)
)) {

// à payer

Loading…
Annulla
Salva