Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
15 changes: 10 additions & 5 deletions assets/src/frontend/components/CustomerSearch.vue
Original file line number Diff line number Diff line change
Expand Up @@ -68,11 +68,11 @@
<div class="wepos-new-customer-form">
<form action="" class="wepos-form" autocomplete="off">
<div class="form-row col-2">
<input type="text" :placeholder="__( 'First Name', 'wepos' )" v-model="customer.first_name">
<input type="text" :placeholder="__( 'First Name*', 'wepos' )" v-model="customer.first_name">
<input type="text" :placeholder="__( 'Last Name', 'wepos' )" v-model="customer.last_name">
</div>
<div class="form-row">
<input type="email" :placeholder="__( 'Email', 'wepos' )" v-model="customer.email">
<input type="email" :placeholder="__( 'Email*', 'wepos' )" v-model="customer.email">
</div>
<div class="form-row col-2">
<input type="text" :placeholder="__( 'Address 1', 'wepos' )" v-model="customer.address_1">
Expand Down Expand Up @@ -216,8 +216,7 @@ export default {
this.isDisabled = true;
if (
val.first_name !== undefined && val.first_name.trim() != ''
&& val.last_name !== undefined && val.last_name.trim() != ''
&& val.email !== undefined && val.email.trim() != ''
&& val.email !== undefined && val.email.trim() != '' && this.isValidEmail( val.email )
) {
this.isDisabled = false;
}
Expand Down Expand Up @@ -323,8 +322,14 @@ export default {
$contentWrap.unblock();
this.closeNewCustomerModal();
}).fail( response => {
let errorMessage = response?.responseJSON?.message;

if ( 'rest_invalid_email' === response?.responseJSON?.data?.details?.billing.code ) {
errorMessage = response.responseJSON.data.details.billing.message;
}

$contentWrap.unblock();
alert( response.responseJSON.message );
alert( errorMessage );
} );
} else {
alert( this.__( 'Please enter an email address for customer', 'wepos' ) );
Expand Down
5 changes: 5 additions & 0 deletions assets/src/utils/Mixin.js
Original file line number Diff line number Diff line change
Expand Up @@ -154,6 +154,11 @@ export default {

return product.stock_quantity > productCartQty;
},

isValidEmail ( email ) {
const re = /^(([^<>()[\]\\.,;:\s@"]+(\.[^<>()[\]\\.,;:\s@"]+)*)|(".+"))@((\[[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\.[0-9]{1,3}\])|(([a-zA-Z\-0-9]+\.)+[a-zA-Z]{2,}))$/;
return re.test( email );
},
},

computed: {
Expand Down