Merge branch 'dev'

producer/web/js/vuejs/order-order.js

@@ -84,12 +84,6 @@ var app = new Vue({
         
         this.init('first') ;
 
-        if(dateDefined) {
-            if(this.producer && this.producer.option_order_entry_point == 'date') {
-                this.changeStep('point-sale') ;
-            }
-        }
-
         this.loadingInit = false ;
     },
     methods: {
@@ -270,6 +264,9 @@ var app = new Vue({
                         if(app.producer.option_order_entry_point == 'point-sale') {
                             app.step = 'point-sale' ;
                         }
+                        else if(app.getDate() && app.producer && app.producer.option_order_entry_point == 'date') {
+                            app.step = 'point-sale' ;
+                        }
                         else {
                             app.step = 'date' ;
                         }