cief/izyim
1
0
Fork 0
mirror of https://gitlab.com/CIEFWorldwideSdnBhd/izyim.git synced 2026-08-28 17:03:57 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'IZYIM-14' into 'master'

Browse Source 
Izyim 14

See merge request CIEFWorldwideSdnBhd/izyim!17
This commit is contained in:
omair saleh
2019-04-12 14:13:50 +00:00
parent 9d3eb5e8b9 a20caf4e56
commit d7370679ac
2 changed files with 82 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files
resources/assets/vue/components/common/DatePickerComponent.vue
+4 -1
View File
@@ -12,7 +12,10 @@
todayBtn: true,
todayHighlight: true
}).on('changeDate',function(event){
vm.$emit('updateDate', event.target.value)
if(event.target.value !== ''){
vm.$emit('updateDate', event.target.value)
}
})
},
props: ['value']
resources/assets/vue/components/order/elements/ShippingStepComponenet.vue
+78 -51
View File
@@ -46,7 +46,7 @@
<div class="row w-100">
<div class="col no-padding">
<label class="muted block">ETD</label>
<date-picker-component name="ETD" v-on:updateDate="setDate($event, 'shippingArrangement.schedule.ETD')"></date-picker-component>
<date-picker-component class="ETD" name="ETD" v-on:updateDate="setDate($event, 'shippingArrangement.schedule.ETD')"></date-picker-component>
</div>
</div>
</div>
@@ -56,7 +56,7 @@
<div class="row w-100">
<div class="col no-padding">
<label class="muted block">ETA</label>
<date-picker-component name="ETA" v-on:updateDate="setDate($event, 'shippingArrangement.schedule.ETA')"></date-picker-component>
<date-picker-component class="ETA" name="ETA" v-on:updateDate="setDate($event, 'shippingArrangement.schedule.ETA')"></date-picker-component>
</div>
</div>
</div>
@@ -99,7 +99,7 @@
<div class="row w-100">
<div class="col no-padding">
<label class="muted block">ETD</label>
<date-picker-component name="ETD" v-on:updateDate="setDate($event, 'reschedule.ETD')"></date-picker-component>
<date-picker-component class="ETD" name="ETD" v-on:updateDate="setDate($event, 'reschedule.ETD')"></date-picker-component>
</div>
</div>
</div>
@@ -109,7 +109,7 @@
<div class="row w-100">
<div class="col no-padding">
<label class="muted block">ETA</label>
<date-picker-component name="ETA" v-on:updateDate="setDate($event, 'reschedule.ETA')"></date-picker-component>
<date-picker-component class="ETA" name="ETA" v-on:updateDate="setDate($event, 'reschedule.ETA')"></date-picker-component>
</div>
</div>
</div>
@@ -149,6 +149,7 @@
</template>
<script>
import moment from 'moment'
export default {
props: {
'data': {
@@ -178,52 +179,7 @@
}
},
mounted: function() {
$(this.$el).find('.shippingForm').validate({
rules: {
container_no: "required",
seal_no: "required",
ETD: "required",
ETA: "required"
},
errorPlacement: function ( error, element ) {
if(element.parents('.form-group').hasClass('form-group')){
error.insertAfter( element.parents('.form-group') );
} else {
error.insertAfter( element );
}
},
highlight: function(element) {
$(element).parents(".form-group").addClass('has-error');
},
unhighlight: function(element) {
$(element).parents(".form-group").removeClass('has-error')
}
});
$(this.$el).find('.rescheduleShipping').validate({
rules: {
ETD: "required",
ETA: "required",
remark: "required"
},
errorPlacement: function ( error, element ) {
if(element.parents('.form-group').hasClass('form-group')){
error.insertAfter( element.parents('.form-group') );
} else {
error.insertAfter( element );
}
},
highlight: function(element) {
$(element).parents(".form-group").addClass('has-error');
},
unhighlight: function(element) {
$(element).parents(".form-group").removeClass('has-error')
}
})
this.dataValidation();
},
created(){
if(this.attachments !== null){
@@ -233,25 +189,97 @@
}
},
methods: {
dataValidation() {
$(this.$el).find('.shippingForm').validate({
rules: {
container_no: "required",
seal_no: "required",
ETD: "required",
ETA: "required"
},
messages: {
ETA: {
min : 'ETA must be greater than ETD'
}
},
errorPlacement: function ( error, element ) {
if(element.parents('.form-group').hasClass('form-group')){
error.insertAfter( element.parents('.form-group') );
} else {
error.insertAfter( element );
}
},
highlight: function(element) {
$(element).parents(".form-group").addClass('has-error');
},
unhighlight: function(element) {
$(element).parents(".form-group").removeClass('has-error')
}
});
$(this.$el).find('.rescheduleShipping').validate({
rules: {
ETD: "required",
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')){
error.insertAfter( element.parents('.form-group') );
} else {
error.insertAfter( element );
}
},
highlight: function(element) {
$(element).parents(".form-group").addClass('has-error');
},
unhighlight: function(element) {
$(element).parents(".form-group").removeClass('has-error')
}
})
},
setDate(date, field){
if(field === 'shippingArrangement.schedule.ETD'){
$(this.$el).find('.shippingForm').valid();
this.shippingArrangement.schedule.ETD = date;
$(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('.shippingForm .ETD').datepicker('getDate') === null) {
let estimatedEtd = moment(date, "DD-MM-YYYY").subtract(3, 'days').format('DD-MM-YYYY');
$(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);
}
}
},
@@ -282,7 +310,6 @@
}
},
rescheduleShipping() {
console.log(this.reschedule);
if($(this.$el).find('.rescheduleShipping').valid()) {
//turn on loading animation
this.isLoading = true;