diff --git a/.gitignore b/.gitignore
index edb24e42..62c8afa4 100644
--- a/.gitignore
+++ b/.gitignore
@@ -3,7 +3,7 @@
/public/storage
/public/js
/public/css
-public/mix-manifest.json
+/public/mix-manifest.json
/storage/*.key
/vendor/**
/.idea
diff --git a/app/Http/Controllers/Auth/RegisterController.php b/app/Http/Controllers/Auth/RegisterController.php
index e86685b1..95881ae5 100644
--- a/app/Http/Controllers/Auth/RegisterController.php
+++ b/app/Http/Controllers/Auth/RegisterController.php
@@ -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){
diff --git a/app/Http/Controllers/BookingController.php b/app/Http/Controllers/BookingController.php
index 844754e1..a18e9cf6 100644
--- a/app/Http/Controllers/BookingController.php
+++ b/app/Http/Controllers/BookingController.php
@@ -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())
diff --git a/app/Http/Controllers/ChinaBankSlipController.php b/app/Http/Controllers/ChinaBankSlipController.php
index 58aad3a0..0ed406ed 100644
--- a/app/Http/Controllers/ChinaBankSlipController.php
+++ b/app/Http/Controllers/ChinaBankSlipController.php
@@ -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()){
diff --git a/database/migrations/2018_07_30_162106_change_datatype_in_booking_table.php b/database/migrations/2018_07_30_162106_change_datatype_in_booking_table.php
new file mode 100644
index 00000000..fa2cb486
--- /dev/null
+++ b/database/migrations/2018_07_30_162106_change_datatype_in_booking_table.php
@@ -0,0 +1,33 @@
+string('account_num')->nullable()->change();
+
+ });
+ }
+
+ /**
+ * Reverse the migrations.
+ *
+ * @return void
+ */
+ public function down()
+ {
+ Schema::table('bookings', function (Blueprint $table) {
+ //
+ });
+ }
+}
diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
index 93d9ff19..3afaf10f 100644
--- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
+++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue
@@ -221,7 +221,7 @@
-->
-
+
@@ -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) {
diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue
index 69fd9697..27878a3c 100644
--- a/resources/assets/js/pages/admin/home.vue
+++ b/resources/assets/js/pages/admin/home.vue
@@ -57,7 +57,13 @@
-
+