Ajith
/
Coworkspace_live
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity
Browse Source

building id dynamically and live issue fixed (wrong build & category) booking by user & fixed the changes officerdashboard page for caretaker2

master
AJITH 8 months ago
parent
d9358e997e
commit
dbccf7649e
3 changed files with 124 additions and 125 deletions
Whitespace
Show all changes Ignore whitespace when comparing lines Ignore changes in amount of whitespace Ignore changes in whitespace at EOL
Split View
Diff Options
Show Stats Download Patch File Download Diff File
  1. 35
      src/main/java/com/gcc/coworkspace/configuration/DataSourceConfig.java
  2. 11
      src/main/java/com/gcc/coworkspace/constants/AppConstants.java
  3. 61
      src/main/resources/templates/user/razor-pay.html

35
src/main/java/com/gcc/coworkspace/configuration/DataSourceConfig.java
View File

@ -20,32 +20,30 @@ import org.springframework.web.client.RestTemplate;
@Configuration
@EnableTransactionManagement
public class DataSourceConfig {
// host - 13.232.20.48
// user - root
// pass - Bonton#2K24
// DB:- coworkspace
// host - 13.232.20.48
// user - root
// pass - Bonton#2K24
// DB:- coworkspace
//private static String host = "13.232.20.48";
//private static String dbpassword = "Bonton#2K24";
// private static String host = "13.232.20.48";
// private static String dbpassword = "Bonton#2K24";
// AWS
private static String host = "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306";
private static String dbpassword = "gcc-facial-password";
// private static String host =
// "gcc-facial-db-instance-1.cf48eqcciziq.ap-south-1.rds.amazonaws.com:3306";
// private static String dbpassword = "gcc-facial-password";
//private static String host ="localhost:3306";
//private static String dbpassword = "root";
//private static String dbpassword = "";
private static String host = "localhost:3306";
private static String dbpassword = "root";
// private static String dbpassword = "";
// Sampath Local
// private static String host ="localhost";
// private static String dbpassword = "12345678";
@Configuration
@EnableTransactionManagement
@EnableJpaRepositories(
entityManagerFactoryRef = "appEntityManagerFactory",
transactionManagerRef = "appTransactionManager")
@EnableJpaRepositories(entityManagerFactoryRef = "appEntityManagerFactory", transactionManagerRef = "appTransactionManager")
// basePackages = {"in.gov.chennaicorporation"})
public static class MysqlAppDataSourceConfig {
@ -54,14 +52,14 @@ public class DataSourceConfig {
public DataSource mysqlAppDataSource() {
DriverManagerDataSource dataSource = new DriverManagerDataSource();
dataSource.setDriverClassName("com.mysql.cj.jdbc.Driver");
dataSource.setUrl("jdbc:mysql://"+host+"/coworkingspace");
dataSource.setUrl("jdbc:mysql://" + host + "/coworkingspace");
dataSource.setUsername("root");
dataSource.setPassword(dbpassword);
return dataSource;
}
@Primary
@Bean(name="appEntityManagerFactory")
@Bean(name = "appEntityManagerFactory")
public LocalContainerEntityManagerFactoryBean entityManagerFactory(
@Qualifier("mysqlAppDataSource") DataSource dataSource) {
LocalContainerEntityManagerFactoryBean entityManagerFactoryBean = new LocalContainerEntityManagerFactoryBean();
@ -77,7 +75,8 @@ public class DataSourceConfig {
@Primary
@Bean(name = "appTransactionManager")
public PlatformTransactionManager transactionManager(@Qualifier("appEntityManagerFactory") jakarta.persistence.EntityManagerFactory entityManagerFactory) {
public PlatformTransactionManager transactionManager(
@Qualifier("appEntityManagerFactory") jakarta.persistence.EntityManagerFactory entityManagerFactory) {
return new JpaTransactionManager(entityManagerFactory);
}
}

11
src/main/java/com/gcc/coworkspace/constants/AppConstants.java
View File

@ -1,11 +1,10 @@
package com.gcc.coworkspace.constants;
public final class AppConstants {
public static String key_id="rzp_live_ySI5Ns54Y7qOcJ";
public static String key_secret="Nwf1TjhUtaskof8vePkRR8Sb";
// public static String key_id="rzp_live_ySI5Ns54Y7qOcJ";
// public static String key_secret="Nwf1TjhUtaskof8vePkRR8Sb";
//uncomment for testing payment
//public static String key_id="rzp_test_tDkHFEqWXmuEi8";
//public static String key_secret="cBQUjMcKZ4J6vmOKSyNZ92py";
// uncomment for testing payment
public static String key_id = "rzp_test_tDkHFEqWXmuEi8";
public static String key_secret = "cBQUjMcKZ4J6vmOKSyNZ92py";
}

61
src/main/resources/templates/user/razor-pay.html
View File

@ -1,32 +1,32 @@
<html>
<header>
<html>
<header>
<script src="https://checkout.razorpay.com/v1/checkout.js"></script>
<script src="https://unpkg.com/sweetalert/dist/sweetalert.min.js"></script>
<script src="https://unpkg.com/sweetalert/dist/sweetalert.min.js"></script>
<script src="https://code.jquery.com/jquery-3.6.0.min.js"></script>
<script type="text/javascript">
const paymentStart=(id)=>{
console.log("payment started :-"+id);
const paymentStart = (id) => {
console.log("payment started :-" + id);
$.ajax({
url:'/muthalvarpadaippagam/book/api/create_order',
data:{id:id},
type:'POST',
dataType:'json',
success:function(response){
url: '/muthalvarpadaippagam/book/api/create_order',
data: { id: id },
type: 'POST',
dataType: 'json',
success: function (response) {
let amt = response.amount;
console.log("FIRST:==>");
console.log(response);
if(response.status=="created"){
if (response.status == "created") {
let options = {
"key": "[[${keyId}]]",
//"key" : "rzp_test_tDkHFEqWXmuEi8", // Enter the Key ID generated from the Dashboard
// "key": "[[${keyId}]]",
"key": "rzp_test_tDkHFEqWXmuEi8", // Enter the Key ID generated from the Dashboard
"amount": response.amount, // Amount is in currency subunits. Default currency is INR. Hence, 50000 refers to 50000 paise
"currency": "INR",
"name": "Greater Chennai Corporation",
"description": "Co-workspace Transaction",
"image": "https://upload.wikimedia.org/wikipedia/commons/a/a8/Chennai_Corporation_Emblem.png",
"order_id": response.id, //This is a sample Order ID. Pass the `id` obtained in the response of Step 1
"handler": function (response){
"handler": function (response) {
console.log("second==>\n");
console.log(response);
console.log(response.razorpay_payment_id);
@ -34,7 +34,7 @@
console.log(response.razorpay_signature);
console.log("payment success");
alert("congrates !payment successfull");
updatePaymentInServer(response.razorpay_payment_id,response.razorpay_order_id,"paid",id,amt);
updatePaymentInServer(response.razorpay_payment_id, response.razorpay_order_id, "paid", id, amt);
},
"prefill": {
"name": "",
@ -49,7 +49,7 @@
}
};
var rzp1 = new Razorpay(options);
rzp1.on('payment.failed', function (response){
rzp1.on('payment.failed', function (response) {
console.log(response.error.code);
console.log(response.error.description);
console.log(response.error.source);
@ -62,34 +62,35 @@
}
},
error:function(error){
error: function (error) {
console.log(error);
alert("error");
}
})
};
function updatePaymentInServer(payment_id,order_id,status,id,amt){
function updatePaymentInServer(payment_id, order_id, status, id, amt) {
$.ajax({
url:'/muthalvarpadaippagam/book/api/Confirm',
data:JSON.stringify({payment_id:payment_id,order_id:order_id,status:status,id:id,amount:amt}),
contentType:'application/json',
type:'POST',
dataType:'json',
success:function(response){
url: '/muthalvarpadaippagam/book/api/Confirm',
data: JSON.stringify({ payment_id: payment_id, order_id: order_id, status: status, id: id, amount: amt }),
contentType: 'application/json',
type: 'POST',
dataType: 'json',
success: function (response) {
console.log("update payment in server");
//alert(response);
if(response != "error"){
window.location.href = "/muthalvarpadaippagam/bookingQRCode?booking_id="+response;
}else{
if (response != "error") {
window.location.href = "/muthalvarpadaippagam/bookingQRCode?booking_id=" + response;
} else {
alert("please contact GCC. If amount is debited from your account!!\nThank You");
window.location.href = "/muthalvarpadaippagam";
}
},
error:function(error){
error: function (error) {
swal("Failed`!", "We will check & contact you soon", "error");
}
});
};
</script>
</header>
</html>
</header>
</html>
Write Preview
Loading…
Cancel
Save