diff --git a/src/components/Cart.vue b/src/components/Cart.vue index d187746..ece8b12 100644 --- a/src/components/Cart.vue +++ b/src/components/Cart.vue @@ -706,21 +706,21 @@ export default { hargabida: "", }, formPayment: { - email: "amirhassan.hamzan@gmail.com", - notel: "0192020100", - name: "amir", + email: localStorage.getItem('email'), + notel: localStorage.getItem('notelbimbit'), + name: localStorage.getItem('name'), user_id: localStorage.getItem('id'), lelong_id: localStorage.getItem('lelong_id') }, test: localStorage.getItem('id'), formCheck: { user_id: localStorage.getItem("id"), - lelong_id: "4", + lelong_id: localStorage.getItem('lelong_id'), }, formRegisterBid: { - lelong_id: "4", + lelong_id: localStorage.getItem("lelong_id"), user_id: localStorage.getItem("id"), - name: "pembida", + name: localStorage.getItem('name'), }, }; }, @@ -844,6 +844,7 @@ export default { }) .catch((error) => { console.log(error); + alert(error); }); }, checkFeePayment() { diff --git a/src/components/Login.vue b/src/components/Login.vue index 63ae433..0327696 100644 --- a/src/components/Login.vue +++ b/src/components/Login.vue @@ -216,9 +216,16 @@ export default { localStorage.setItem("token", response.data.token); localStorage.setItem("id", response.data.user.id); localStorage.setItem("nokp", response.data.user.nokp); + localStorage.setItem("name", response.data.user.name); + localStorage.setItem("email", response.data.user.email); + localStorage.setItem("notelbimbit", response.data.user.notelbimbit); this.$router.push("/"); console.log(response); - }); + }) + .catch((response) => { + alert(response.message); + console.log(response); + }); }, }, }; diff --git a/src/components/Navbar.vue b/src/components/Navbar.vue index 023b99e..45fe966 100644 --- a/src/components/Navbar.vue +++ b/src/components/Navbar.vue @@ -36,6 +36,12 @@ + + @@ -84,9 +90,10 @@ export default { } ) .then((response) => { - localStorage.removeItem("token"); - localStorage.removeItem("id"); - localStorage.removeItem("nokp"); + // localStorage.removeItem("token"); + // localStorage.removeItem("id"); + // localStorage.removeItem("nokp"); + localStorage.clear(); this.$router.push("/login"); }) .catch((error) => { diff --git a/src/components/Register.vue b/src/components/Register.vue index 660cc1d..521dd7d 100644 --- a/src/components/Register.vue +++ b/src/components/Register.vue @@ -301,6 +301,14 @@ /> +
+ + +
@@ -346,7 +354,18 @@ export default { password: "", email: "", notelbimbit: "", - register_agree: "", + register_agree: "1", + password_confirmation: "", + images: { + file1: { + file_type: "png", + filename: "imagein64string", + }, + file2: { + file_type: "jpg", + filename: "imagein64string", + }, + }, }, }; }, @@ -355,11 +374,17 @@ export default { axios .post("/register", this.form) .then((response) => { - localStorage.setItem("token", response.data.token); - this.$router.push("/login"); - console.log(response); + if (response.data.success != "error") { + localStorage.setItem("token", response.data.token); + this.$router.push("/login"); + console.log(response); + } else { + console.log(response.data); + alert(response.data.success); + } }) .catch((error) => { + alert(error); console.log(error); }); }, diff --git a/src/components/Test.vue b/src/components/Test.vue new file mode 100644 index 0000000..6f46592 --- /dev/null +++ b/src/components/Test.vue @@ -0,0 +1,24 @@ + + + \ No newline at end of file diff --git a/src/components/result/ToPay.vue b/src/components/result/ToPay.vue index 1cf305e..9e030d7 100644 --- a/src/components/result/ToPay.vue +++ b/src/components/result/ToPay.vue @@ -283,12 +283,12 @@ export default { total_hargabida: "", loading: false, formPayment: { - email: "amirhassan.hamzan@gmail.com", - notel: "0192020100", - name: "amir", + email: localStorage.getItem("email"), + notel: localStorage.getItem("notel"), + name: localStorage.getItem("name"), user_id: localStorage.getItem("id"), lelong_id: localStorage.getItem("lelong_id"), - total: "1890", + total: "", }, }; }, @@ -317,16 +317,18 @@ export default { bidPayment() { axios .post("/bidpayment", { - email: this.formPayment.email, - notel: this.formPayment.notel, - name: this.formPayment.name, - user_id: this.formPayment.user_id, - lelong_id: this.formPayment.lelong_id, + email: localStorage.getItem("email"), + notel: localStorage.getItem("notel"), + name: localStorage.getItem("name"), + user_id: localStorage.getItem("id"), + lelong_id: localStorage.getItem("lelong_id"), total: this.total_hargabida, }) .then((response) => { console.log(response); window.open(response.data.message + "?auto_submit=true"); + // window.location.href = response.data.message + '?auto_submit=true'; + }) .catch((error) => { console.log(error); diff --git a/src/router/index.js b/src/router/index.js index 616f070..b5f3a88 100644 --- a/src/router/index.js +++ b/src/router/index.js @@ -7,6 +7,8 @@ import List from './../components/List.vue' import Pay from '../components/Pay.vue' import Profile from './../components/Profile.vue' import BidHistory from '../components/BidHistory.vue' +import Test from "../components/Test.vue" +Test import IndexPaymentHistory from '../components/IndexPaymentHistory.vue' // import Modals from './../components/Modal.vue' // import { Modal } from "bootstrap"; @@ -73,6 +75,13 @@ const routes = [ component: IndexPaymentHistory, // meta: { requiresAuth: true } + }, + { + path: '/test', + name: 'test', + component: Test, + // meta: { requiresAuth: true } + }, // { // name: 'Modal',