Handle the checkout page when user has no deilivery address

hardingadonis · Dec 6, 2023 · a815709 · a815709
1 parent 1e12a7b
commit a815709
Show file tree

Hide file tree

Showing 4 changed files with 14 additions and 6 deletions.
diff --git a/src/main/webapp/view/web/add-address.jsp b/src/main/webapp/view/web/add-address.jsp
@@ -81,7 +81,7 @@
 
                                         <div class="my-3 text-center">
                                             <div id="error-message" class="text-danger my-3">${error_msg}</div>
-                                            <button type="submit" class="btn btn-outline-dark">Xác Nhận</button>
+                                            <button type="submit" class="btn btn-outline-dark">Xác nhận</button>
                                         </div>
                                     </form>
                                 </div>

diff --git a/src/main/webapp/view/web/change-password.jsp b/src/main/webapp/view/web/change-password.jsp
@@ -62,7 +62,7 @@
 
                                 <div class="my-3 text-center">
                                     <div id="error-message" class="text-danger my-3">${error_msg}</div>
-                                    <button type="submit" class="btn btn-outline-dark">Xác Nhận</button>
+                                    <button type="submit" class="btn btn-outline-dark">Xác nhận</button>
                                 </div>
                             </form>
                         </div>

diff --git a/src/main/webapp/view/web/checkout.jsp b/src/main/webapp/view/web/checkout.jsp
@@ -53,9 +53,17 @@
                                 </select>
                             </div>
 
-                            <div class="my-4 text-center">
-                                <button type="submit" class="btn btn-outline-dark">Xác Nhận</button>
-                            </div>
+                            <c:if test="${sessionScope.user.address.size() > 0}">
+                                <div class="my-4 text-center">
+                                    <button type="submit" class="btn btn-outline-dark">Xác nhận</button>
+                                </div>
+                            </c:if>
+
+                            <c:if test="${sessionScope.user.address.size() == 0}">
+                                <div class="my-4 text-center">
+                                    <a href="add-address" class="btn btn-outline-dark">Thêm địa chỉ nhận hàng</a>
+                                </div>
+                            </c:if>
                         </div>
                     </form>
                 </div>

diff --git a/src/main/webapp/view/web/profile.jsp b/src/main/webapp/view/web/profile.jsp
@@ -77,7 +77,7 @@
                                 </div>
 
                                 <div class="my-3 text-center">
-                                    <button type="submit" class="btn btn-outline-dark">Xác Nhận</button>
+                                    <button type="submit" class="btn btn-outline-dark">Xác nhận</button>
                                 </div>
                             </form>
                         </div>
-Original file line number
+Diff line change
@@ Expand Up / @@ -77,7 +77,7 @@ @@
                                     </div>
                                     <div class="my-3 text-center">
-                                        <button type="submit" class="btn btn-outline-dark">Xác Nhận</button>
+                                        <button type="submit" class="btn btn-outline-dark">Xác nhận</button>
                                     </div>
                                 </form>
                             </div>
@@ Expand Down @@