Merge branch 'master' into dev

backend/controllers/OrderController.php

@@ -825,7 +825,7 @@ class OrderController extends BackendController
                 if (preg_match("/^[0-9]{4}-(0[1-9]|1[0-2])-(0[1-9]|[1-2][0-9]|3[0-1])$/", $date) &&
                         ($idUser || strlen($username)) &&
                         $pointSale &&
-                        count($products) &&
+                        count(get_object_vars($products)) &&
                         $distribution) {
 
                         $order = new Order;

backend/views/layouts/content.php

@@ -57,7 +57,7 @@ use dmstr\widgets\Alert;
                 } ?>
                 
                 <?php 
-                    if(count($this->buttons)) {
+                    if($this->buttons && count($this->buttons)) {
                         foreach($this->buttons as $button) {
                             echo '<a href="'.Yii::$app->urlManagerBackend->createUrl($button['url']).'" class="'.$button['class'].'">'.$button['label'].'</a>' ;
                         }

common/models/CreditHistory.php

@@ -302,7 +302,7 @@ class CreditHistory extends ActiveRecordCommon
         }
         
         if($this->type == self::TYPE_PAYMENT || $this->type == self::TYPE_REFUND) {
-            if(isset($this->order)) {
+            if(isset($this->order) && isset($this->order->distribution)) {
                 $str .= '<br />Commande : '.date('d/m/Y',strtotime($this->order->distribution->date)) ;
             }
             else {

common/models/Producer.php

@@ -820,7 +820,7 @@ class Producer extends ActiveRecordCommon
 
     public function isOnlinePaymentActive()
     {
-        return $this->online_payment || ($this->option_stripe_mode_test && Yii::$app->user->identity->status > 10);
+        return $this->online_payment || ($this->option_stripe_mode_test && !Yii::$app->user->isGuest && Yii::$app->user->identity->status > 10);
     }
 
     public function isOnlinePaymentActiveAndTypeOrder()

common/models/ProductDistribution.php

@@ -38,8 +38,6 @@ termes.
 
 namespace common\models;
 
-use Yii ;
-use yii\base\Object;
 use common\components\ActiveRecordCommon ;
 
 /**

composer.json

@@ -40,7 +40,10 @@
         "codeception/codeception": "^2.3"
     },
     "config": {
-        "process-timeout": 1800
+        "process-timeout": 1800,
+        "allow-plugins": {
+            "yiisoft/yii2-composer": true
+        }
     },
     "extra": {
         "asset-installer-paths": {

producer/views/layouts/main.php

@@ -269,7 +269,7 @@ if (!Yii::$app->user->isGuest) {
                 <h2 id="page-title">
                         <?= $this->getTitle(); ?>
                         <?php
-                        if (count($this->buttons)): ?>
+                        if ($this->buttons && count($this->buttons)): ?>
                             <span id="buttons">
                             <?php foreach ($this->buttons as $button) {
                                     echo '<a href="' . Yii::$app->urlManagerProducer->createUrl($button['url']) . '" class="' . $button['class'] . '">' . $button['label'] . '</a>';

setPermissionsOpenDistrib.sh

@@ -1,12 +1,15 @@
 #!/usr/bin/env bash
-sudo chown fab:www-data frontend/runtime/ -R
+
+sudo chown guillaume:www-data . -R
+
+sudo chown guillaume:www-data frontend/runtime/ -R
 chmod 775 frontend/runtime/
 
-sudo chown fab:www-data frontend/web/assets/ -R
+sudo chown guillaume:www-data frontend/web/assets/ -R
 sudo chmod 775 frontend/web/assets/ -R
 
-sudo chown fab:www-data backend/runtime/ -R
+sudo chown guillaume:www-data backend/runtime/ -R
 sudo chmod 775 backend/runtime/ -R
 
-sudo chown fab:www-data backend/web/assets/ -R
+sudo chown guillaume:www-data backend/web/assets/ -R
 sudo chmod 775 backend/web/assets/ -R