From 59efdff53422ca2ef78fe5a79c50bed4537a325d Mon Sep 17 00:00:00 2001 From: Amir Date: Mon, 13 Feb 2023 15:19:40 +0800 Subject: [PATCH 1/9] Add bank account number to cdm payment --- src/components/pay/SelectOutlet.vue | 43 ++++++++++++++++++++++---- src/components/result/ResultDetail.vue | 35 +++++++++++++++++++-- 2 files changed, 69 insertions(+), 9 deletions(-) diff --git a/src/components/pay/SelectOutlet.vue b/src/components/pay/SelectOutlet.vue index 801250f..c29d4b5 100644 --- a/src/components/pay/SelectOutlet.vue +++ b/src/components/pay/SelectOutlet.vue @@ -46,8 +46,8 @@ -->
@@ -211,6 +211,20 @@ :style="{ width: '50vw' }" :modal="true" > +
+
Lakukan bayaran ke akaun tersebut.
+
+
+
+
PERMODALAN KELANTAN BERHAD
+
03139010016326
+
BANK ISLAM
+
+
+
+
+
Sila muat naik gambar resit.
+
Pastikan gambar yang dimuat naik adalah JELAS.
-
Saiz maksimum gambar adalah 2MB.
Jenis gambar yang diterima adalah PNG dan JPG.
@@ -249,7 +262,7 @@ import SelectId from "./SelectId.vue"; import TermsAndConditionsDetails from "../authentication/TermsAndConditionsDetails.vue"; import axios from "axios"; -import { required, integer, between } from "@vuelidate/validators"; +import { required, integer, minValue} from "@vuelidate/validators"; import useVuelidate from "@vuelidate/core"; export default { @@ -309,7 +322,7 @@ export default { }, validations() { return { - fileSize: { required, integer, betweenValue: between(1, 2200000) }, + fileSize: { required, integer, minValueValue: minValue(10) }, }; }, mounted() { @@ -507,4 +520,22 @@ export default { }, }, }; - \ No newline at end of file + + + \ No newline at end of file diff --git a/src/components/result/ResultDetail.vue b/src/components/result/ResultDetail.vue index 7f847fa..ee70e0d 100644 --- a/src/components/result/ResultDetail.vue +++ b/src/components/result/ResultDetail.vue @@ -191,6 +191,20 @@ :style="{ width: '50vw' }" :modal="true" > +
+
Lakukan bayaran ke akaun tersebut.
+
+
+
+
PERMODALAN KELANTAN BERHAD
+
03139010016326
+
BANK ISLAM
+
+
+
+
+
Sila muat naik gambar resit.
+
Pastikan gambar yang dimuat naik adalah JELAS.
-
Saiz maksimum gambar adalah 2MB.
Jenis gambar yang diterima adalah PNG dan JPG.
@@ -520,7 +533,7 @@ import VueHtml2pdf from "vue-html2pdf"; import axios from "axios"; import ItemMasterImageModal from "../list/ItemMasterImageModal.vue"; import ReceiptImage from "../pay/ReceiptImage.vue"; -import { required, integer, between } from "@vuelidate/validators"; +import { required, integer, minValue } from "@vuelidate/validators"; import useVuelidate from "@vuelidate/core"; export default { @@ -556,7 +569,7 @@ export default { }, validations() { return { - fileSize: { required, integer, betweenValue: between(1, 2200000) }, + fileSize: { required, integer, minValueValue: minValue(10) }, }; }, created() { @@ -760,4 +773,20 @@ export default { .container-height { min-height: 70vh; } + +.div-card-bank { + display: flex; + justify-content: center; +} + +.card-bank { + background: #2f68c51c; + color: #2f68c5f2; + width: 300px; + height: 125px; + border-radius: 16px; + display: flex; + justify-content: center; + align-items: center; +} \ No newline at end of file From 80867575b767d667c09753130af05e484681343b Mon Sep 17 00:00:00 2001 From: Amir Date: Tue, 21 Feb 2023 05:22:21 +0800 Subject: [PATCH 2/9] Add desc upload image format PNG, JPG for CDM --- src/components/pay/SelectOutlet.vue | 2 +- src/components/result/ResultDetail.vue | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/components/pay/SelectOutlet.vue b/src/components/pay/SelectOutlet.vue index c29d4b5..1e0f881 100644 --- a/src/components/pay/SelectOutlet.vue +++ b/src/components/pay/SelectOutlet.vue @@ -223,7 +223,7 @@
-
Sila muat naik gambar resit.
+
Sila muat naik gambar resit dalam bentuk PNG atau JPG.
Pastikan gambar yang dimuat naik adalah JELAS.
-
Sila muat naik gambar resit.
+
Sila muat naik gambar resit dalam bentuk PNG atau JPG.
Pastikan gambar yang dimuat naik adalah JELAS.
Date: Tue, 21 Feb 2023 05:24:24 +0800 Subject: [PATCH 3/9] Fix max length upload CDM receipt to 15 --- src/components/result/ResultDetail.vue | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/components/result/ResultDetail.vue b/src/components/result/ResultDetail.vue index c257d4a..54f32d2 100644 --- a/src/components/result/ResultDetail.vue +++ b/src/components/result/ResultDetail.vue @@ -174,7 +174,7 @@
+
+ Lupa Katalaluan + +
diff --git a/src/router/index.js b/src/router/index.js index 68ac13c..aae3091 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -132,7 +132,8 @@ import ResultDetail from "../components/result/ResultDetail.vue"; import ResultReceipt from "../components/result/ResultReceipt.vue" import ThePay from "../components/pay/ThePay.vue"; import ThePayCdm from "../components/pay/ThePayCdm.vue"; -import ThePolicy from "../components/policy/ThePolicy.vue" +import ThePolicy from "../components/policy/ThePolicy.vue"; +import TheForgotPassword from "../components/authentication/TheForgotPassword.vue"; import { createRouter, @@ -162,6 +163,11 @@ const routes = [ name: "login", component: TheLogin, }, + { + path: "/forgot-password", + name: "forgot-password", + component: TheForgotPassword, + }, { path: "/home", name: "home", From e863d3fd4eb59d74e81fcbf7200edfbc70e0e9d9 Mon Sep 17 00:00:00 2001 From: Amir Hassan Date: Wed, 22 Feb 2023 11:31:58 +0800 Subject: [PATCH 5/9] Change read store using pinia instead localstorage --- src/components/home/CurrentKaratDetail.vue | 3 ++- src/components/home/LelongNextDetail.vue | 3 ++- src/components/home/LelongTodayDetail.vue | 9 ++------- 3 files changed, 6 insertions(+), 9 deletions(-) diff --git a/src/components/home/CurrentKaratDetail.vue b/src/components/home/CurrentKaratDetail.vue index b6acfbc..950412c 100644 --- a/src/components/home/CurrentKaratDetail.vue +++ b/src/components/home/CurrentKaratDetail.vue @@ -48,6 +48,7 @@