From 05757911b19079b5b767626b564697298d9e645a Mon Sep 17 00:00:00 2001 From: lonetrinity Date: Fri, 27 Jul 2018 11:30:19 +0800 Subject: [PATCH 1/4] Lingges/Fix_no_refNo --- resources/assets/js/pages/admin/complete-orders.vue | 2 +- resources/assets/js/pages/admin/home.vue | 2 +- resources/assets/js/pages/home.vue | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/resources/assets/js/pages/admin/complete-orders.vue b/resources/assets/js/pages/admin/complete-orders.vue index bccc9a90..9ed8dac5 100644 --- a/resources/assets/js/pages/admin/complete-orders.vue +++ b/resources/assets/js/pages/admin/complete-orders.vue @@ -6,7 +6,7 @@

Completed Orders

- + diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue index 8c689d93..2fbabad2 100644 --- a/resources/assets/js/pages/admin/home.vue +++ b/resources/assets/js/pages/admin/home.vue @@ -10,7 +10,7 @@
- + Update {{ scope.row.id }} diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index b1f4b9a0..e1807e69 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -254,7 +254,7 @@
- + Update {{ scope.row.id }} From f1d49ef82c57ce81a7288e14352894e6afd9f05e Mon Sep 17 00:00:00 2001 From: lonetrinity Date: Fri, 27 Jul 2018 17:24:37 +0800 Subject: [PATCH 2/4] Fix-OrderNo/RefNo --- resources/assets/js/pages/admin/booking/bookingDetail.vue | 2 +- resources/assets/js/pages/admin/booking/completed.vue | 4 ++-- .../assets/js/pages/admin/booking/supplierBooking.vue | 2 +- resources/assets/js/pages/admin/booking/supplierReport.vue | 4 ++-- .../assets/js/pages/admin/booking/uploadChinaBankslip.vue | 2 +- resources/assets/js/pages/admin/booking/uploadInvoice.vue | 2 +- resources/assets/js/pages/admin/booking/verification.vue | 2 +- .../assets/js/pages/admin/upload-supplier-bank-slip.vue | 2 +- resources/assets/js/pages/booking/completed.vue | 4 ++-- resources/assets/js/pages/booking/confirmation.vue | 2 +- resources/assets/js/pages/booking/po.vue | 2 +- resources/assets/js/pages/booking/poComplete.vue | 2 +- resources/assets/js/pages/booking/transfer.vue | 2 +- resources/assets/js/pages/booking/uploadPo.vue | 2 +- resources/assets/js/pages/home.vue | 2 +- resources/assets/js/pages/settings/admin-malaysia-bank.vue | 7 +------ 16 files changed, 19 insertions(+), 24 deletions(-) diff --git a/resources/assets/js/pages/admin/booking/bookingDetail.vue b/resources/assets/js/pages/admin/booking/bookingDetail.vue index 002b219e..197f77c9 100644 --- a/resources/assets/js/pages/admin/booking/bookingDetail.vue +++ b/resources/assets/js/pages/admin/booking/bookingDetail.vue @@ -28,7 +28,7 @@ -
Order Number :
+
Ref No :
{{ booking_details.id }}
diff --git a/resources/assets/js/pages/admin/booking/completed.vue b/resources/assets/js/pages/admin/booking/completed.vue index eee2c21b..e3f14b71 100644 --- a/resources/assets/js/pages/admin/booking/completed.vue +++ b/resources/assets/js/pages/admin/booking/completed.vue @@ -37,7 +37,7 @@
-
+

Download

@@ -101,7 +101,7 @@ -
Order Number :
+
Ref No :
{{ booking_details.id }}
diff --git a/resources/assets/js/pages/admin/booking/supplierBooking.vue b/resources/assets/js/pages/admin/booking/supplierBooking.vue index dc4910c0..56c2e9fc 100644 --- a/resources/assets/js/pages/admin/booking/supplierBooking.vue +++ b/resources/assets/js/pages/admin/booking/supplierBooking.vue @@ -29,7 +29,7 @@ -
Order Number :
+
Ref No :
{{ booking_details.id }}
diff --git a/resources/assets/js/pages/admin/booking/supplierReport.vue b/resources/assets/js/pages/admin/booking/supplierReport.vue index b5e6e75d..0656fb9e 100644 --- a/resources/assets/js/pages/admin/booking/supplierReport.vue +++ b/resources/assets/js/pages/admin/booking/supplierReport.vue @@ -29,7 +29,7 @@ -
Order Number :
+
Ref No :
{{ booking_details.id }}
@@ -464,7 +464,7 @@ ctx.fillStyle = "#000000"; ctx.font = "13px Arial"; //// Row 4 - ctx.fillText("Payment For(Order No.) :", column1X, rowHeight[4] - 5); + ctx.fillText("Payment For(Ref No) :", column1X, rowHeight[4] - 5); ctx.fillText(binding.value.id, column3X, rowHeight[4] - 5); //// Row 4 ctx.fillText("Payment For :", column1X, rowHeight[5] - 5); diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue index 5ac9ede6..fa8be99f 100644 --- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue +++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue @@ -29,7 +29,7 @@ -
Order Number :
+
Ref No :
{{ booking_details.id }}
diff --git a/resources/assets/js/pages/admin/booking/uploadInvoice.vue b/resources/assets/js/pages/admin/booking/uploadInvoice.vue index fa8adcd4..13c9016d 100644 --- a/resources/assets/js/pages/admin/booking/uploadInvoice.vue +++ b/resources/assets/js/pages/admin/booking/uploadInvoice.vue @@ -36,7 +36,7 @@ -
Order Number :
+
Ref No :
{{ booking_details.id }}
diff --git a/resources/assets/js/pages/admin/booking/verification.vue b/resources/assets/js/pages/admin/booking/verification.vue index 65b13a07..39b2f2b3 100644 --- a/resources/assets/js/pages/admin/booking/verification.vue +++ b/resources/assets/js/pages/admin/booking/verification.vue @@ -31,7 +31,7 @@ -
Order Number :
+
Ref No :
{{ booking_details.id }}
diff --git a/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue b/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue index 7f853d77..7dcbc597 100644 --- a/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue +++ b/resources/assets/js/pages/admin/upload-supplier-bank-slip.vue @@ -5,7 +5,7 @@ Add New

- + diff --git a/resources/assets/js/pages/booking/completed.vue b/resources/assets/js/pages/booking/completed.vue index e3446bfe..19c6c4e8 100644 --- a/resources/assets/js/pages/booking/completed.vue +++ b/resources/assets/js/pages/booking/completed.vue @@ -24,7 +24,7 @@
China Bank Slip
-
+

Download

@@ -57,7 +57,7 @@ - + diff --git a/resources/assets/js/pages/booking/confirmation.vue b/resources/assets/js/pages/booking/confirmation.vue index 18b06a6f..24dc64a5 100644 --- a/resources/assets/js/pages/booking/confirmation.vue +++ b/resources/assets/js/pages/booking/confirmation.vue @@ -13,7 +13,7 @@
Order Number :Ref No : {{ booking_details.id }}
- + diff --git a/resources/assets/js/pages/booking/po.vue b/resources/assets/js/pages/booking/po.vue index ab8d5d5f..8f248d6b 100644 --- a/resources/assets/js/pages/booking/po.vue +++ b/resources/assets/js/pages/booking/po.vue @@ -53,7 +53,7 @@
Order Number :Ref No : {{ booking_details.id }}
- + diff --git a/resources/assets/js/pages/booking/poComplete.vue b/resources/assets/js/pages/booking/poComplete.vue index 2bcec40f..78a53e43 100644 --- a/resources/assets/js/pages/booking/poComplete.vue +++ b/resources/assets/js/pages/booking/poComplete.vue @@ -69,7 +69,7 @@
Order Number :Ref No : {{ booking_details.id }}
- + diff --git a/resources/assets/js/pages/booking/transfer.vue b/resources/assets/js/pages/booking/transfer.vue index 1346fc78..877f757b 100644 --- a/resources/assets/js/pages/booking/transfer.vue +++ b/resources/assets/js/pages/booking/transfer.vue @@ -15,7 +15,7 @@
Order Number :Ref No : {{ booking_details.id }}
- + diff --git a/resources/assets/js/pages/booking/uploadPo.vue b/resources/assets/js/pages/booking/uploadPo.vue index 12a28cb6..b6de792a 100644 --- a/resources/assets/js/pages/booking/uploadPo.vue +++ b/resources/assets/js/pages/booking/uploadPo.vue @@ -64,7 +64,7 @@
Order Number :Ref No: {{ booking_details.id }}
- + diff --git a/resources/assets/js/pages/home.vue b/resources/assets/js/pages/home.vue index e1807e69..d768b0d7 100644 --- a/resources/assets/js/pages/home.vue +++ b/resources/assets/js/pages/home.vue @@ -179,7 +179,7 @@ - + diff --git a/resources/assets/js/pages/settings/admin-malaysia-bank.vue b/resources/assets/js/pages/settings/admin-malaysia-bank.vue index b8cffbd4..74e28fca 100644 --- a/resources/assets/js/pages/settings/admin-malaysia-bank.vue +++ b/resources/assets/js/pages/settings/admin-malaysia-bank.vue @@ -187,12 +187,7 @@ .then((response) => { this.loading_btn = false; this.tableData = response.data; - this.$message({ - showClose: true, - message: 'Data Updated Successfully', - type: 'success', - duration: 5000 - }); + }) .catch((error) => { From a707977ab27368fbd542f7ed9d43ef0df3c76894 Mon Sep 17 00:00:00 2001 From: weiweitoo Date: Fri, 27 Jul 2018 17:44:32 +0800 Subject: [PATCH 3/4] fix bug --- .../admin/booking/uploadChinaBankslip.vue | 10 ++++------ resources/assets/js/pages/admin/home.vue | 8 +++++++- .../js/pages/booking/uploadUserBankSlip.vue | 2 +- resources/assets/js/pages/home.vue | 20 +++++++++---------- 4 files changed, 22 insertions(+), 18 deletions(-) diff --git a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue index 5ac9ede6..6a81f8c6 100644 --- a/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue +++ b/resources/assets/js/pages/admin/booking/uploadChinaBankslip.vue @@ -221,7 +221,7 @@ --> - + @@ -273,11 +273,9 @@ details: null, }, rules: { - actual_transfer_amount: [{ - required: true, - message: 'Please input transfer amount', - trigger: 'change' - }], + 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', diff --git a/resources/assets/js/pages/admin/home.vue b/resources/assets/js/pages/admin/home.vue index 167a4daf..e01db5f1 100644 --- a/resources/assets/js/pages/admin/home.vue +++ b/resources/assets/js/pages/admin/home.vue @@ -57,7 +57,13 @@ - +
Order Number :Ref No : {{ booking_details.id }}
{{ bookingConfirmTable.marking }}
Payment for (Order No.) : Payment for (Ref No.) : {{ bookingConfirmTable.payment_order }}