Browse Source

Merge branch 'develop'

master
Guillaume Bourgeois 6 months ago
parent
commit
5a64a9caf8
4 changed files with 6 additions and 5 deletions
  1. +2
    -2
      backend/models/MailForm.php
  2. +1
    -1
      common/views/maintenance.php
  3. +1
    -0
      producer/controllers/OrderController.php
  4. +2
    -2
      producer/views/order/order.php

+ 2
- 2
backend/models/MailForm.php View File

@@ -239,8 +239,8 @@ Me désinscrire : ".$linkUnsubscribe;
if(count($body['Messages']) > 0) {
$response = $mj->post(\Mailjet\Resources::$Email, ['body' => $body]);
}
$success = $response->success() ;
$success = (isset($response) && $response) ? $response->success() : false ;
if(!$success) {
Yii::error($response->getBody(), 'Mailjet');

+ 1
- 1
common/views/maintenance.php View File

@@ -13,6 +13,6 @@
<h1>Souke est en maintenance</h1>
<div>
<p>Le site sera bientôt accessible, merci pour votre patience.<br />
Si besoin, vous pouvez <a href="<?= Yii::$app->params['adminEmail']; ?>">me contacter</a>.</p>
Si besoin, vous pouvez <a href="mailto:<?= Yii::$app->params['adminEmail']; ?>">me contacter</a>.</p>
</div>
</article>

+ 1
- 0
producer/controllers/OrderController.php View File

@@ -458,6 +458,7 @@ class OrderController extends ProducerBaseController
$orderModule->initOrder($order);

if ($credit
&& $this->getUserCurrent()
&& $pointSale->payment_method_credit
&& $posts['payment_method'] == 'credit'
&& ($creditFunctioning == Producer::CREDIT_FUNCTIONING_OPTIONAL ||

+ 2
- 2
producer/views/order/order.php View File

@@ -284,7 +284,7 @@ $this->setTitle('Commander');
</div>
</form>
</div>
<div v-if="!user && producer.credit == 1 && pointSale.credit == 1">
<div v-if="!user && producer.credit == 1 && pointSale.payment_method_credit == 1">
<a :href="urlLogin" class="btn btn-secondary">
<i class="bi bi-box-arrow-in-right"></i>
Connexion obligatoire
@@ -503,7 +503,7 @@ $this->setTitle('Commander');
</label>
</div>
<div class="col-md-4" v-if="isPaymentMethodCreditActive()">
<template v-if="(pointSaleActive.credit_functioning == 'mandatory' || (pointSaleActive.credit_functioning == 'user' && user.credit_active)) && !checkCreditLimit(order) ">
<template v-if="user && (pointSaleActive.credit_functioning == 'mandatory' || (pointSaleActive.credit_functioning == 'user' && user.credit_active)) && !checkCreditLimit(order) ">
<div class="alert alert-danger">
<i class="bi bi-piggy-bank"></i>
Vous devez

Loading…
Cancel
Save