diff --git a/resources/assets/vue/components/order/forms/OrderFormComponent.vue b/resources/assets/vue/components/order/forms/OrderFormComponent.vue
index 0d1e9b4..7fecd0b 100644
--- a/resources/assets/vue/components/order/forms/OrderFormComponent.vue
+++ b/resources/assets/vue/components/order/forms/OrderFormComponent.vue
@@ -37,7 +37,7 @@
                                     <div class="col no-padding">
                                         <div class="form-group form-group-default form-group-default-select2 b-rad-none m-b-0" >
                                             <label class="muted" style="z-index: 10000;">Warehouse</label>
-                                            <select-component  :options="this.warehouses" v-model="order.warehouse_id"></select-component>
+                                            <select-component  :options="this.warehouses" name="warehouse_id"  v-model="order.warehouse_id"></select-component>
                                         </div>
                                     </div>
                                     <div class="col-auto padding-5 bg-master-lighter pointer hide" @click="showWarehouse = !showWarehouse; order.warehouse_id = null">
@@ -56,7 +56,7 @@
                                 <div class="row">
                                     <div class="col no-padding">
                                         <button class="btn b-rad-none btn-default" data-dismiss="modal">Cancel</button>
-                                        <button type="button" class="btn b-rad-none btn-primary" @click="addOrder()" data-dismiss="modal">Create Order</button>
+                                        <button type="button" class="btn b-rad-none btn-primary" @click="addOrder()">Create Order</button>
                                     </div>
                                 </div>
                             </div>
@@ -94,7 +94,8 @@
         mounted: function() {
             $(this.$el).find('form').validate({
                 rules: {
-                    marking: "required"
+                    marking: "required",
+                    warehouse_id: "required"
                 },
                 errorPlacement: function ( error, element ) {
 
@@ -148,6 +149,7 @@
                             'content-type': 'application/json'
                         }
                     }).then(response => {
+                        $('.modal').modal('hide');
                         this.clearForm();
                         //turn off loading animation
                         this.isLoading = false;