making changes related to user management

nivas90 · Nov 26, 2015 · c9f9e34 · c9f9e34
1 parent 5ef5491
commit c9f9e34
Show file tree

Hide file tree

Showing 3 changed files with 7 additions and 5 deletions.
diff --git a/src/main/java/com/ots/controller/HomeController.java b/src/main/java/com/ots/controller/HomeController.java
@@ -399,7 +399,7 @@ public ModelAndView placeOrder(ModelMap model, HttpServletRequest request,
 		}
 
 		orderSummaryBean.setQuantity((orderSummaryBean.getQuantity() - orderSummaryBean.getCommisisioninoil()));
-		orderSummaryBean.setAmount((orderSummaryBean.getAmount() - orderSummaryBean.getCommissionindollar()));
+		orderSummaryBean.setAmount((orderSummaryBean.getAmount() + orderSummaryBean.getCommissionindollar()));
 
 		System.out.println("after applying commission" + orderSummaryBean);
 

diff --git a/src/main/java/com/ots/dao/OrderDaoImpl.java b/src/main/java/com/ots/dao/OrderDaoImpl.java
@@ -69,7 +69,7 @@ public Float getTotalAmountByOrderIds(final List<String> orderIds) {
 		for (String orderId : orderIds) {
 			if(orderId.trim().length()>0){
 			if (selectQueries.toString().length() == 0) {
-				selectQueries.append("Select sum(total_amt) from orders where id in( ?" );
+				selectQueries.append("Select sum(total_amt) as total from orders where id in( ?" );
 			} else {
 				selectQueries.append(",?" );
 			}
@@ -91,7 +91,7 @@ public void setValues(java.sql.PreparedStatement ps) throws SQLException {
 					}
 				}, new RowMapper<Float>() {
 					  public Float mapRow(ResultSet rs, int rowNum) throws SQLException {
-					        return rs.getFloat(1);
+					        return rs.getFloat("total");
 					  }
 
 					});

diff --git a/src/main/webapp/WEB-INF/view/payment.jsp b/src/main/webapp/WEB-INF/view/payment.jsp
@@ -19,8 +19,10 @@
 					method="POST">
 					<script src="https://checkout.stripe.com/checkout.js"
 						class="stripe-button" data-key="pk_test_6pRNASCoBOKtIshFeQd4XMUh"
-						data-amount="${amountDue}" data-name="Demo Site"
-						data-description="Total Charge" data-image="/128x128.png"
+						data-amount="${amountDue}" data-name="Oil Transaction System"
+						data-email	="${selectedClient.userBean.emailId}"
+						data-description="Total Charge" 
+						data-label="Total Charges for Oil"
 						data-locale="auto">
 					</script>
 				</form>