Merge branch 'dev'

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

@@ -255,7 +255,7 @@ var app = new Vue({
                             app.comment = null ;
                             app.delivery = false ;
                             app.deliveryAddress = null ;
-                            if(app.user.address.length > 0) {
+                            if(app.user.address && app.user.address.length > 0) {
                                 app.deliveryAddress = app.user.address ;
                             }
                         }