admin: TaxZone2Zone

Author: phasenraum2010

src/main/java/org/woehlke/greenshop/admin/AdminLocationTaxesController.java

@@ -218,6 +218,8 @@ public String taxZone(@PathVariable long taxZoneId, Model model){
             thisZone = zones.iterator().next();
         }
         model.addAttribute("thisZone",thisZone);
+        logger.info("zones: "+zones.toString());
+        logger.info("thisZone: "+thisZone.toString());
         return "admin/taxZone";
     }
 
@@ -234,6 +236,22 @@ public String taxZoneWithZoneId(@PathVariable long taxZoneId, @PathVariable long
         return "admin/taxZone";
     }
 
+    @RequestMapping(value = "/admin/taxZone/{taxZoneId}/insert", method = RequestMethod.GET)
+    public String taxZoneInsertForm(@PathVariable long taxZoneId, Model model){
+        int menuCategory = AdminMenuCategory.LOCATION_TAXES.ordinal();
+        model.addAttribute("menuCategory",menuCategory);
+        TaxZone thisTaxZone = adminService.findTaxZoneById(taxZoneId);
+        model.addAttribute("thisTaxZone",thisTaxZone);
+        List<TaxZone2Zone> zones = adminService.findZonesByTaxZone(thisTaxZone);
+        model.addAttribute("zones",zones);
+        TaxZone2Zone thisZone = null;
+        if(zones.size()>0){
+            thisZone = zones.iterator().next();
+        }
+        model.addAttribute("thisZone",thisZone);
+        return "admin/taxZoneInsertForm";
+    }
+
     @RequestMapping(value = "/admin/taxClasses", method = RequestMethod.GET)
     public String taxClasses(Model model){
         int menuCategory = AdminMenuCategory.LOCATION_TAXES.ordinal();

src/main/webapp/WEB-INF/jsp/admin/admin-tiles.xml

@@ -87,6 +87,18 @@
         <put-attribute name="bodyContent" value="/WEB-INF/jsp/admin/taxZone.jsp" />
     </definition>
 
+    <definition name="admin/taxZoneInsertForm" extends="backend">
+        <put-attribute name="bodyContent" value="/WEB-INF/jsp/admin/taxZoneInsertForm.jsp" />
+    </definition>
+
+    <definition name="admin/taxZoneDeleteForm" extends="backend">
+        <put-attribute name="bodyContent" value="/WEB-INF/jsp/admin/taxZoneDeleteForm.jsp" />
+    </definition>
+
+    <definition name="admin/taxZoneEditForm" extends="backend">
+        <put-attribute name="bodyContent" value="/WEB-INF/jsp/admin/taxZoneEditForm.jsp" />
+    </definition>
+
     <definition name="admin/taxClasses" extends="backend">
         <put-attribute name="bodyContent" value="/WEB-INF/jsp/admin/taxClasses.jsp" />
     </definition>

src/main/webapp/WEB-INF/jsp/admin/taxZone.jsp

@@ -22,14 +22,28 @@
                             <c:if test="${zone.zone.id == thisZone.zone.id}">
                                 <tr id="defaultSelected" class="dataTableRowSelected" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="document.location.href='<c:url value="/admin/taxZone/${thisTaxZone.id}/zone/${zone.id}"/>'">
                                     <td class="dataTableContent">${zone.zoneCountry.name}</td>
-                                    <td class="dataTableContent">${zone.zone.name}</td>
+                                    <c:choose>
+                                        <c:when test="${zone.zone == null}">
+                                            <td class="dataTableContent">All Zones</td>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <td class="dataTableContent"><:out value="${zone.zone.name}"/></td>
+                                        </c:otherwise>
+                                    </c:choose>
                                     <td class="dataTableContent" align="right"><img src="resources/admin/images/icon_arrow_right.gif" border="0" alt="" />&nbsp;</td>
                                 </tr>
                             </c:if>
                             <c:if test="${zone.zone.id != thisZone.zone.id}">
                                 <tr class="dataTableRow" onmouseover="rowOverEffect(this)" onmouseout="rowOutEffect(this)" onclick="document.location.href='<c:url value="/admin/taxZone/${thisTaxZone.id}/zone/${zone.id}"/>'">
                                     <td class="dataTableContent">${zone.zoneCountry.name}</td>
-                                    <td class="dataTableContent">${zone.zone.name}</td>
+                                    <c:choose>
+                                        <c:when test="${zone.zone == null}">
+                                            <td class="dataTableContent">All Zones</td>
+                                        </c:when>
+                                        <c:otherwise>
+                                            <td class="dataTableContent"><:out value="${zone.zone.name}"/></td>
+                                        </c:otherwise>
+                                    </c:choose>
                                     <td class="dataTableContent" align="right"><a href="<c:url value="/admin/taxZone/${thisTaxZone.id}/zone/${zone.zone.id}"/>"><img src="resources/admin/images/icon_info.gif" border="0" alt="Info" title="Info" /></a>&nbsp;</td>
                                 </tr>
                             </c:if>
@@ -43,15 +57,15 @@
                             </table></td>
                         </tr>
                         <tr>
-                            <td class="smallText" align="right" colspan="3"><span class="tdbLink"><a id="tdb1" href="<c:url value="/admin/taxZones/${thisTaxZone.id}"/>">Back</a></span><script type="text/javascript">$("#tdb1").button({icons:{primary:"ui-icon-triangle-1-w"}}).addClass("ui-priority-secondary").parent().removeClass("tdbLink");</script><span class="tdbLink"><a id="tdb2" href="http://shadowfax/oscommerce2/admin/geo_zones.php?zpage=1&zID=2&action=list&spage=1&sID=2&saction=new&osCAdminID=r9ji9b4276mi3itiavgakf9lb5">Insert</a></span><script type="text/javascript">$("#tdb2").button({icons:{primary:"ui-icon-plus"}}).addClass("ui-priority-secondary").parent().removeClass("tdbLink");</script></td>
+                            <td class="smallText" align="right" colspan="3"><span class="tdbLink"><a id="tdb1" href="<c:url value="/admin/taxZones/${thisTaxZone.id}"/>">Back</a></span><script type="text/javascript">$("#tdb1").button({icons:{primary:"ui-icon-triangle-1-w"}}).addClass("ui-priority-secondary").parent().removeClass("tdbLink");</script><span class="tdbLink"><a id="tdb2" href="<c:url value="/admin/taxZone/${thisTaxZone.id}/insert"/>">Insert</a></span><script type="text/javascript">$("#tdb2").button({icons:{primary:"ui-icon-plus"}}).addClass("ui-priority-secondary").parent().removeClass("tdbLink");</script></td>
                         </tr>
                     </table>
                 </td>
                 <c:if test="${zones.size() > 0}">
                 <td width="25%" valign="top">
                     <table border="0" width="100%" cellspacing="0" cellpadding="2">
                         <tr class="infoBoxHeading">
-                            <td class="infoBoxHeading"><strong>${thisZone.zone.name}</strong></td>
+                            <td class="infoBoxHeading"><strong>${thisZone.zoneCountry.name}</strong></td>
                         </tr>
                     </table>
                     <table border="0" width="100%" cellspacing="0" cellpadding="2">

src/main/webapp/WEB-INF/jsp/admin/taxZoneDeleteForm.jsp

@@ -0,0 +1,2 @@
+<%@ include file="/WEB-INF/layout/taglibs.jsp"%>
+<h1>Delete</h1>

src/main/webapp/WEB-INF/jsp/admin/taxZoneEditForm.jsp

@@ -0,0 +1,2 @@
+<%@ include file="/WEB-INF/layout/taglibs.jsp"%>
+<h1>Edit</h1>

src/main/webapp/WEB-INF/jsp/admin/taxZoneInsertForm.jsp

@@ -0,0 +1,2 @@
+<%@ include file="/WEB-INF/layout/taglibs.jsp"%>
+<h1>Insert</h1>