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

fix/notification

Browse Source
This commit is contained in:
lonetrinity
2018-07-31 12:07:03 +08:00
parent ac77c0e0fc efa9ed6c91
commit 37127b447f
9 changed files with 199 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files
.gitignore
+1 -1
View File
@@ -3,7 +3,7 @@
/public/storage
/public/js
/public/css
public/mix-manifest.json
/public/mix-manifest.json
/storage/*.key
/vendor/**
/.idea
app/Http/Controllers/Auth/RegisterController.php
+5 -1
View File
@@ -46,7 +46,6 @@ class RegisterController extends Controller
protected function validator(array $data)
{
return Validator::make($data, [
'name' => 'required|name|max:255',
'marking' => 'required|max:255|unique:markings',
'email' => 'required|email|max:255|unique:users',
'password' => 'required|min:6|confirmed',
@@ -61,6 +60,11 @@ class RegisterController extends Controller
*/
protected function create(Request $data)
{
$this->validate($data, [
'email' => 'required|email|max:255|unique:users',
'password' => 'required|min:6|confirmed',
]);
$marking = Marking::Where('email',$data['email'])->first();
if(!$marking){
app/Http/Controllers/BookingController.php
+3 -3
View File
@@ -403,7 +403,7 @@ class BookingController extends Controller
}
$validator = Validator::make($request->all(), [
'file' => 'max:3072'
'file' => 'max:10000' // image size
]);
if($validator->fails())
@@ -497,7 +497,7 @@ class BookingController extends Controller
}
$validator = Validator::make($request->all(), [
'file' => 'max:3072'
'file' => 'max:10000'
]);
if($validator->fails())
@@ -767,7 +767,7 @@ class BookingController extends Controller
}
$validator = Validator::make($request->all(), [
'invoice_path' => 'max:3072'
'invoice_path' => 'max:10000'
]);
if($validator->fails())
app/Http/Controllers/ChinaBankSlipController.php
+1 -1
View File
@@ -32,7 +32,7 @@ class ChinaBankSlipController extends Controller
}
$validator = Validator::make($request->all(), [
'china_bank_slips' => 'max:3072'
'china_bank_slips' => 'max:10000'
]);
if($validator->fails()){
database/migrations/2018_07_30_162106_change_datatype_in_booking_table.php
+33
View File
@@ -0,0 +1,33 @@
<?php
use Illuminate\Support\Facades\Schema;
use Illuminate\Database\Schema\Blueprint;
use Illuminate\Database\Migrations\Migration;
class ChangeDatatypeInBookingTable extends Migration
{
/**
* Run the migrations.
*
* @return void
*/
public function up()
{
Schema::table('bookings', function (Blueprint $table) {
$table->string('account_num')->nullable()->change();
});
}
/**
* Reverse the migrations.
*
* @return void
*/
public function down()
{
Schema::table('bookings', function (Blueprint $table) {
//
});
}
}
resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+69 -1
View File
@@ -221,7 +221,7 @@
</el-date-picker>
</el-form-item> -->
<el-form-item prop="actual_transfer_amount">
<el-input v-model="chinaSlipForm.actual_transfer_amount" type="text" placeholder="Amount" style="width: 80%" />
<el-input v-model.number="chinaSlipForm.actual_transfer_amount" type="text" placeholder="Amount" style="width: 80%" />
</el-form-item>
<el-form-item prop="details">
@@ -247,6 +247,7 @@
import ProgressTrack from '~/components/AdminProgressTrack'
import axios from 'axios'
<<<<<<< HEAD
export default {
components: {
'progress-track': ProgressTrack
@@ -288,6 +289,73 @@ export default {
// message: 'Please input details',
// trigger: 'change'
// }]
=======
export default {
components: {
'progress-track': ProgressTrack
},
data() {
return {
trackerConfig :{
status: 5,
term: null
},
loading_btn: false,
booking_id: this.$route.params.id,
booking_details: {
id: null,
amount: null,
bia: null,
user_bankslip_path: null,
},
supplier: null,
supplier_options: null,
chinaSlipForm: {
actual_transfer_amount: null,
// date: null,
details: null,
},
rules: {
actual_transfer_amount: [
{ required: true, message: 'Please input amount',trigger: 'change'},
{ type: 'number', message: 'Amount must be a number',trigger: 'change'}],
// date: [{
// required: true,
// message: 'Please input date',
// trigger: 'change'
// }],
// details: [{
// required: true,
// message: 'Please input details',
// trigger: 'change'
// }]
},
// pickerOptions1: {
// disabledDate(time) {
// return time.getTime() > Date.now();
// },
// shortcuts: [{
// text: 'Today',
// onClick(picker) {
// picker.$emit('pick', new Date());
// }
// }, {
// text: 'Yesterday',
// onClick(picker) {
// const date = new Date();
// date.setTime(date.getTime() - 3600 * 1000 * 24);
// picker.$emit('pick', date);
// }
// }, {
// text: 'A week ago',
// onClick(picker) {
// const date = new Date();
// date.setTime(date.getTime() - 3600 * 1000 * 24 * 7);
// picker.$emit('pick', date);
// }
// }]
// }
>>>>>>> efa9ed6c91b98b6889eebd459e952a75a6c68708
}
// pickerOptions1: {
// disabledDate(time) {
resources/assets/js/pages/admin/home.vue
+7 -1
View File
@@ -57,7 +57,13 @@
<!-- Booking Table-end -->
</div>
</template>
<style type="text/css">
.el-table__column-filter-trigger i {
font-size: 18px;
font-weight: 900;
vertical-align: sub;
}
</style>
<script>
import axios from 'axios'
resources/assets/js/pages/auth/register.vue
+79
View File
@@ -1,4 +1,5 @@
<template>
<<<<<<< HEAD
<div class="container">
<div class="row">
<div class="col-lg-8 m-auto">
@@ -74,6 +75,84 @@
</div>
</div>
</div>
=======
<div class="container">
<div class="row">
<div class="col-lg-8 m-auto">
<card :title="$t('register')">
<form @submit.prevent="register" @keydown="form.onKeydown($event)">
<!-- Marking -->
<div class="form-group row">
<label class="col-md-3 col-form-label text-md-right">{{ $t('Marking') }}</label>
<div class="col-md-7">
<input v-model="form.marking" :class="{ 'is-invalid': form.errors.has('marking') }" class="form-control" type="text" name="marking">
<has-error :form="form" field="marking"/>
</div>
</div>
<!-- Email -->
<div class="form-group row">
<label class="col-md-3 col-form-label text-md-right">{{ $t('email') }}</label>
<div class="col-md-7">
<el-input v-model="form.email" type="email" name="email" placeholder="Email">
</el-input>
<has-error :form="form" field="email"/>
</div>
</div>
<!-- Password -->
<div class="form-group row">
<label class="col-md-3 col-form-label text-md-right">{{ $t('password') }}</label>
<div class="col-md-7">
<el-input v-if="password_visible" v-model="form.password" type="text" name="password" placeholder="Password">
<template slot="append">
<el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye"></i></el-button>
</template>
</el-input>
<el-input v-else v-model="form.password" type="password" name="password" placeholder="Password">
<template slot="append">
<el-button type="primary" @click="password_visible = !password_visible"><i class="fas fa-eye-slash"></i></el-button>
</template>
</el-input>
<has-error :form="form" field="password"/>
</div>
</div>
<!-- Password Confirmation -->
<div class="form-group row">
<label class="col-md-3 col-form-label text-md-right">{{ $t('confirm_password') }}</label>
<div class="col-md-7">
<el-input v-if="password_confirmation_visible" v-model="form.password_confirmation" type="text" name="password_confirmation" placeholder="Confirm Password">
<template slot="append">
<el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye"></i></el-button>
</template>
</el-input>
<el-input v-else v-model="form.password_confirmation" type="password" name="password_confirmation" placeholder="Confirm Password">
<template slot="append">
<el-button type="primary" @click="password_confirmation_visible = !password_confirmation_visible"><i class="fas fa-eye-slash"></i></el-button>
</template>
</el-input>
<has-error :form="form" field="password_confirmation"/>
</div>
</div>
<div class="form-group row">
<div class="col-md-7 offset-md-3 d-flex">
<!-- Submit Button -->
<v-button :loading="form.busy" :disabled="form.password=='' || form.password_confirmation=='' || form.email=='' || form.marking=='' ? true : false">
{{ $t('register') }}
</v-button>
<!-- GitHub Register Button -->
<login-with-github/>
</div>
</div>
</form>
</card>
</div>
</div>
</div>
>>>>>>> efa9ed6c91b98b6889eebd459e952a75a6c68708
</template>
<script>
resources/assets/js/pages/home.vue
+1 -1
View File
@@ -186,7 +186,7 @@
<td>Customer Marking : </td>
<td> {{ bookingConfirmTable.marking }}</td>
</tr>
<tr>
<tr v-if="bookingConfirmTable.order_no != null">
<td>Payment for (Order No.) : </td>
<td> {{ bookingConfirmTable.order_no }}</td>
</tr>