Merge branch 'dev'

frontend/web/js/frontend.js

@@ -46,6 +46,11 @@ function opendistrib_signup()
         $('#option-user, #option-producer').change(function() {
             opendistrib_signup_fields_producer() ;
         }) ;
+        
+        opendistrib_signup_code_producer() ;
+        $('#signupform-id_producer').change(function() {
+            opendistrib_signup_code_producer() ;
+        }) ;
     }
 }
 
@@ -62,4 +67,13 @@ function opendistrib_signup_fields_producer()
     }
 }
 
+function opendistrib_signup_code_producer() {
+    if($('#signupform-id_producer  option:selected').hasClass('lock')){
+        $('#bloc-code-acces').fadeIn() ;
+    }
+    else {
+        $('#bloc-code-acces').hide() ;
+    }
+}
+
 

producer/controllers/OrderController.php

@@ -570,7 +570,7 @@ class OrderController extends ProducerBaseController
             
             $favoritePointSale = User::getCurrent()->getFavoritePointSale() ;
             
-            if($favoritePointSale) {
+            /*if($favoritePointSale) {
                 $newPointSaleArray = [] ;
                 
                 foreach($pointsSaleArray as $pointSale) {
@@ -588,7 +588,9 @@ class OrderController extends ProducerBaseController
             }
             else {
                 $newPointSaleArray = $pointsSaleArray ;
-            }
+            }*/
+            
+            $newPointSaleArray = $pointsSaleArray ;
             
             $json['points_sale'] = $newPointSaleArray;
             

producer/web/js/producer.js

@@ -111,4 +111,4 @@ function opendistrib_base_url(with_slug) {
         base_url += $('meta[name=slug-producer]').attr('content')+'/' ;
     }
     return base_url ;
-}
+}