diff --git a/resources/assets/vue/components/order/elements/ShippingStepComponenet.vue b/resources/assets/vue/components/order/elements/ShippingStepComponenet.vue
index aaa6373..d415d32 100644
--- a/resources/assets/vue/components/order/elements/ShippingStepComponenet.vue
+++ b/resources/assets/vue/components/order/elements/ShippingStepComponenet.vue
@@ -225,6 +225,11 @@
                         ETA: "required",
                         remark: "required"
                     },
+                    messages: {
+                        ETA: {
+                            min : 'ETA must be greater than ETD'
+                        }
+                    },
                     errorPlacement: function ( error, element ) {
 
                         if(element.parents('.form-group').hasClass('form-group')){
@@ -246,28 +251,35 @@
                 if(field === 'shippingArrangement.schedule.ETD'){
                     $(this.$el).find('.shippingForm').valid();
                     this.shippingArrangement.schedule.ETD = date;
-                    $(this.$el).find('.ETA').rules( "add", {
-                        min: this.shippingArrangement.schedule.ETD + 1
+                    $(this.$el).find('.shippingForm .ETA').rules("add", {
+                        min: moment(this.shippingArrangement.schedule.ETD, "DD-MM-YYYY").add(1, 'days').format('DD-MM-YYYY')
                     })
                 }
 
                 if(field === 'shippingArrangement.schedule.ETA'){
                     $(this.$el).find('.shippingForm').valid();
                     this.shippingArrangement.schedule.ETA = date;
-                    if($(this.$el).find('.ETD').datepicker('getDate') === null) {
+                    if($(this.$el).find('.shippingForm .ETD').datepicker('getDate') === null) {
                         let estimatedEtd = moment(date, "DD-MM-YYYY").subtract(3, 'days').format('DD-MM-YYYY');
-                        $(this.$el).find('.ETD').datepicker('setDate', estimatedEtd);
+                        $(this.$el).find('.shippingForm .ETD').datepicker('setDate', estimatedEtd);
                     }
                 }
 
                 if(field === 'reschedule.ETD'){
                     $(this.$el).find('.rescheduleShipping').valid();
                     this.reschedule.ETD = date;
+                    $(this.$el).find('.rescheduleShipping .ETA').rules("add", {
+                        min: moment(this.reschedule.ETD, "DD-MM-YYYY").add(1, 'days').format('DD-MM-YYYY')
+                    })
                 }
 
                 if(field === 'reschedule.ETA'){
                     $(this.$el).find('.rescheduleShipping').valid();
                     this.reschedule.ETA = date;
+                    if($(this.$el).find('.rescheduleShipping .ETD').datepicker('getDate') === null) {
+                        let estimatedEtd = moment(date, "DD-MM-YYYY").subtract(3, 'days').format('DD-MM-YYYY');
+                        $(this.$el).find('.rescheduleShipping .ETD').datepicker('setDate', estimatedEtd);
+                    }
                 }
 
             },