[Ils-source] r1312 - in branches/1.6: . addons/konakart addons/konakart/src/com/konakart/bl webapp

[scribe at crosswire.org]

Author: scribe
Date: 2015-05-05 13:44:37 -0700 (Tue, 05 May 2015)
New Revision: 1312

Modified:
   branches/1.6/
   branches/1.6/addons/konakart/ilsIntegration.jar
   branches/1.6/addons/konakart/src/com/konakart/bl/ILSOrderIntegrationMgr.java
   branches/1.6/webapp/admin_profilemanagement.jsp
   branches/1.6/webapp/pagingfooter.jsp
Log:
merged in some extra konakart error handling.
handled checkboxes on subsequent pages. ILS-1
fixed page footer off by one bug. ILS-3




Property changes on: branches/1.6
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:796-1303,1306-1307
   + /trunk:796-1303,1306-1307,1309-1311

Modified: branches/1.6/addons/konakart/ilsIntegration.jar
===================================================================
(Binary files differ)

Modified: branches/1.6/addons/konakart/src/com/konakart/bl/ILSOrderIntegrationMgr.java
===================================================================
--- branches/1.6/addons/konakart/src/com/konakart/bl/ILSOrderIntegrationMgr.java	2015-05-05 20:36:00 UTC (rev 1311)
+++ branches/1.6/addons/konakart/src/com/konakart/bl/ILSOrderIntegrationMgr.java	2015-05-05 20:44:37 UTC (rev 1312)
@@ -141,6 +141,9 @@
 		   Class<?> engineClass = Class.forName("com.konakartadmin.bl.KKAdmin");
 	        KKAdminIf eng = (KKAdminIf) engineClass.newInstance();
 	        String sessionId = eng.login(kkAdminID, kkAdminPassword);
+if (sessionId == null) {
+System.out.println("************  kkAdmin credentials in ils.properties not valid for: " + kkAdminID);
+}
 		    customer = eng.getCustomerForId(sessionId, order.getCustomerId());
 System.out.println("************  Purchase for Customer: " + customer.getEmailAddr());
 	    	

Modified: branches/1.6/webapp/admin_profilemanagement.jsp
===================================================================
--- branches/1.6/webapp/admin_profilemanagement.jsp	2015-05-05 20:36:00 UTC (rev 1311)
+++ branches/1.6/webapp/admin_profilemanagement.jsp	2015-05-05 20:44:37 UTC (rev 1312)
@@ -516,7 +516,7 @@
         }
 %>
                             <tr>
-                              <td><input id="profck<%=j%>" type="checkbox" name="profid" value="<%=up.getUserProfileID()%>"></td>
+                              <td><input id="profck<%=j-begin%>" type="checkbox" name="profid" value="<%=up.getUserProfileID()%>"></td>
 <%
 if (!hiddenCols.contains("USERPRLNAME")) {
 %>

Modified: branches/1.6/webapp/pagingfooter.jsp
===================================================================
--- branches/1.6/webapp/pagingfooter.jsp	2015-05-05 20:36:00 UTC (rev 1311)
+++ branches/1.6/webapp/pagingfooter.jsp	2015-05-05 20:44:37 UTC (rev 1312)
@@ -48,9 +48,10 @@
       </div>
         <form action="<%= baseURL %>" style="width:200px;float:right;">
           <div align="right">Page Number:
-            <input style="vertical-align: middle;" name="pageNum" size="3" type="text"/>
+            <input style="vertical-align: middle;" id="pageNumUser" name="pageNumUser" size="3" type="text"/>
+            <input id="pageNum" name="pageNum" type="hidden"/>
             &nbsp;
-            <input style="vertical-align: middle;" name="image2" type="image" value="Go" src="images/go_btn.gif" class="goBtn"/>
+            <input style="vertical-align: middle;" onclick="document.getElementById('pageNum').value = document.getElementById('pageNumUser').value - 1; return true;" name="image2" type="image" value="Go" src="images/go_btn.gif" class="goBtn"/>
           </div>
       </form></td>
     </tr>