Merge branch 'master' of gitlab.com:CIEFWorldwideSdnBhd/izyim into changePassword

This commit is contained in:
Kawlll Maxso
2019-03-25 16:49:51 +08:00
5 changed files with 35 additions and 35 deletions
+4 -4
View File
@@ -6,10 +6,10 @@ $factory->define(App\Models\Package::class, function (Faker $faker) {
return [
'list_id' => $faker->numberBetween(1, 300),
'description' => $faker->realText(10),
'width' => $faker->numberBetween(1, 999),
'length' => $faker->numberBetween(1, 999),
'height' => $faker->numberBetween(1, 999),
'quantity' => $faker->numberBetween(1, 50),
'width' => $faker->numberBetween(1, 99),
'length' => $faker->numberBetween(1, 99),
'height' => $faker->numberBetween(1, 99),
'quantity' => $faker->numberBetween(1, 5),
'created_at' => $faker->dateTimeBetween($startDate = '-30 days', $endDate = '30 days'),
'updated_at' => $faker->dateTimeBetween($startDate = '-30 days', $endDate = '30 days')
];
@@ -5,14 +5,14 @@
<div class="col p-r-0">
<div class="row">
<div class="col p-r-0">
<input type="text" class="form-control no-border" v-model="query" @keyup="search()" :placeholder="placeholder" id="icon-filter" name="icon-filter">
<input type="text" class="form-control no-border" v-model="query" @keyup="search()" :placeholder="placeholder" id="icon-filter" name="icon-filter" autocomplete="off">
</div>
<div class="col-auto bg-white pointer" @click="closeSearch()">
<i class="fa fa-times fs-10 muted lh-35"></i>
</div>
</div>
<div class="row no-margin" :class="{'hide': !isActive}">
<div class="col b-t b-grey no-padding absolute w-100 bg-white" style="z-index: 1; box-shadow: 0px 1px 8px -4px rgba(0,0,0,0.75);">
<div class="col b-t b-grey no-padding absolute w-100 bg-white" style="z-index: 999; box-shadow: 0px 1px 8px -4px rgba(0,0,0,0.75);">
<div class="row no-margin b-b b-grey" v-for="result in results" v-bind:key="result.id">
<div class="col">
<a :href="route('companies.profile', {companyId: result.id})">
@@ -15,27 +15,27 @@
<div class="col no-padding">
<div class="form-group form-group-default required">
<label class="muted">Marking</label>
<input class="form-control" name="marking" v-model="company.marking">
<input class="form-control" name="marking" v-model="company.marking" autocomplete="off">
</div>
<div class="form-group form-group-default required">
<label class="muted">Company Name</label>
<input class="form-control" name="name" v-model="company.name">
<input class="form-control" name="name" v-model="company.name" autocomplete="off">
</div>
<div class="form-group form-group-default required">
<label class="muted">Email Address</label>
<input class="form-control" name="email" v-model="company.email">
<input class="form-control" name="email" v-model="company.email" autocomplete="off">
</div>
<div class="row">
<div class="col p-l-0">
<div class="form-group form-group-default required">
<label class="muted">Registration Number</label>
<input class="form-control" name="registration_no" v-model="company.registration_no">
<input class="form-control" name="registration_no" v-model="company.registration_no" autocomplete="off">
</div>
</div>
<div class="col p-r-0">
<div class="form-group form-group-default required">
<label class="muted">Tax Number</label>
<input class="form-control" name="tax_no" v-model="company.tax_no">
<input class="form-control" name="tax_no" v-model="company.tax_no" autocomplete="off">
</div>
</div>
</div>
@@ -3,23 +3,23 @@
<div class="col no-padding">
<div class="form-group form-group-default required">
<label class="muted">Address Line 1</label>
<input class="form-control" name="street_one" v-model="address.street_one" @change="changeAddress()">
<input class="form-control" name="street_one" v-model="address.street_one" @change="changeAddress()" autocomplete="off">
</div>
<div class="form-group form-group-default">
<label class="muted">Address Line 2</label>
<input class="form-control" name="street_two" v-model="address.street_two" @change="changeAddress()">
<input class="form-control" name="street_two" v-model="address.street_two" @change="changeAddress()" autocomplete="off">
</div>
<div class="row">
<div class="col p-l-0">
<div class="form-group form-group-default required">
<label class="muted">City</label>
<input class="form-control" name="city" v-model="address.city" @change="changeAddress()">
<input class="form-control" name="city" v-model="address.city" @change="changeAddress()" autocomplete="off">
</div>
</div>
<div class="col p-r-0">
<div class="form-group form-group-default required">
<label class="muted">State</label>
<input class="form-control" name="state" v-model="address.state" @change="changeAddress()">
<input class="form-control" name="state" v-model="address.state" @change="changeAddress()" autocomplete="off">
</div>
</div>
</div>
@@ -27,7 +27,7 @@
<div class="col-5 p-l-0">
<div class="form-group form-group-default required">
<label class="muted">Post Code</label>
<input class="form-control" name="post_code" v-model="address.post_code" @change="changeAddress()">
<input class="form-control" name="post_code" v-model="address.post_code" @change="changeAddress()" autocomplete="off">
</div>
</div>
<div class="col p-r-0">
@@ -73,6 +73,25 @@
</div>
</div>
<div class="row">
<div class="col p-l-5 p-r-0">
<div class="form-group form-group-default input-group">
<div class="row w-100">
<div class="col no-padding">
<label class="muted block">Length</label>
<input class="form-control block" v-model="item.length" v-on:keypress="isNumber(true)">
</div>
<div class="col-auto no-padding">
<div class="input-group-addon inline" style="min-width:auto;">
<div class="row align-items-center justify-content-center h-100">
<div class="col no-padding text-center">
<small>cm</small>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
<div class="col p-l-0 p-r-5">
<div class="form-group form-group-default input-group">
<div class="row w-100">
@@ -111,25 +130,6 @@
</div>
</div>
</div>
<div class="col p-l-5 p-r-0">
<div class="form-group form-group-default input-group">
<div class="row w-100">
<div class="col no-padding">
<label class="muted block">Length</label>
<input class="form-control block" v-model="item.length" v-on:keypress="isNumber(true)">
</div>
<div class="col-auto no-padding">
<div class="input-group-addon inline" style="min-width:auto;">
<div class="row align-items-center justify-content-center h-100">
<div class="col no-padding text-center">
<small>cm</small>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>
</div>