Merge branch 'dev'

common/models/Subscription.php

@@ -286,9 +286,10 @@ class Subscription extends ActiveRecordCommon
     {
         if(is_array($arrayOrders) && count($arrayOrders) > 0) {
             foreach($arrayOrders as $order) {
-                if(($order->id_user == $this->id_user || $order->username == $this->username) && 
-                   $order->id_point_sale == $this->id_point_sale) {
-                    return true ;
+                if((($order->id_user > 0 && $order->id_user == $this->id_user) || 
+                    (!$order->id_user && $order->username == $this->username)) && 
+                        $order->id_point_sale == $this->id_point_sale) {
+                          return true ;
                 }
             }
         }