From 0bfbd9cabfd883fc0694f9630916497fdc9227ce Mon Sep 17 00:00:00 2001 From: Abhiram Date: Mon, 24 Apr 2023 14:31:15 +0530 Subject: [PATCH] My Account page UI --- dist/Js/main.js | 2 +- dist/Js/myaccount/orderdetails.js | 60 ++++++++++++++++++++++++++- dist/Js/orderDetails/order_summary.js | 4 +- dist/css/main.css | 8 +++- dist/css/style.css | 6 +-- myaccount.html | 26 ++++++------ orderdetails.html | 20 +++++---- 7 files changed, 98 insertions(+), 28 deletions(-) diff --git a/dist/Js/main.js b/dist/Js/main.js index 1c53dc3..6dce82f 100644 --- a/dist/Js/main.js +++ b/dist/Js/main.js @@ -16,7 +16,7 @@ setTimeout(naChanges, 1000); win.on('scroll', function() { var scroll = win.scrollTop(); - if (scroll < 200) { + if (scroll < 100) { header.removeClass('stick'); $(".header-bottom.sticky-bar.stick").removeClass("sticky-bar stick"); let img_src = `./dist/assets/imgs/anwi-logo-2.png`; diff --git a/dist/Js/myaccount/orderdetails.js b/dist/Js/myaccount/orderdetails.js index 7ad8209..6c1aa89 100644 --- a/dist/Js/myaccount/orderdetails.js +++ b/dist/Js/myaccount/orderdetails.js @@ -32,7 +32,65 @@ let port = "https://anwi.bizgaze.app"; order_netTotal = current.nettotal; order_quantity =current.Quantity; order_taxAmount =current.taxamount; - user_order_details+= `
${order_itemTotal}${order_netTotal}${order_taxAmount} ${order_quantity}

ORDER PLACED

${current.OrderDate}

TOTAL

₹${updatedCurent_total}

Delivered TO

${current.OrganizationName}

ORDER NO: ${current.OrderNo}

View order details

Invoice

${current.itemname}
`; + user_order_details+= ` +
+
+
+ ${order_itemTotal} + ${order_netTotal} + ${order_taxAmount} + ${order_quantity} +
+
+

ORDER NO: ${current.OrderNo} +

+
+
+
+
+
+

ORDER PLACED

+

${current.OrderDate}

+
+
+

TOTAL

+

₹${updatedCurent_total}

+
+
+

Delivered TO

+

${current.OrganizationName}

+
+
+
+
+ +
+

View order details

+

Invoice

+
+
+
+
+
+
+ +
+
+
+
+
${current.itemname}
+
+
+ + +
+
+
+
+
+
+
+`; } $(".user_order_details").append(user_order_details); $('.order_details_main_container').click(function(){ diff --git a/dist/Js/orderDetails/order_summary.js b/dist/Js/orderDetails/order_summary.js index 9f56a1f..c8e3875 100644 --- a/dist/Js/orderDetails/order_summary.js +++ b/dist/Js/orderDetails/order_summary.js @@ -25,7 +25,7 @@ let filteredOrders = new_arrr.filter(function(order) { $.each(filteredOrders, function(index, order) { console.log(order.OrderNo) let Delivery_status =order.stageshortcode -let deliverdCard=`
Delivery Status :
Delivered To${order.OrganizationName}
${order.itemname} (${order.Quantity} items)${order.itemtotal}

Return/Exchange window closed on Friday,24 March Why?

`; +let deliverdCard=`
Delivery Status :
Delivered To : ${order.OrganizationName}
${order.itemname} (${order.Quantity} items)${order.itemtotal}

Return/Exchange window closed on Friday,24 March Why?

`; $('.deliverd-card').append(deliverdCard) if(Delivery_status == 'CMD'){ $('.delivery_status').html('Deliverd') @@ -35,7 +35,7 @@ if(Delivery_status == 'APL'){ } }); console.log(filteredOrders) -let summary =`

Order${orderNumber} (${filteredOrders.length} items)

Order placed on ${filteredOrders[0].OrderDate}

`; +let summary =`

Order : ${orderNumber} ( ${filteredOrders.length} items )

Order placed on ${filteredOrders[0].OrderDate}

`; $('.order_tax').html(filteredOrders[0].taxamount) $('.Order_total').html(filteredOrders[0].nettotal) diff --git a/dist/css/main.css b/dist/css/main.css index c6804f1..2b1956c 100644 --- a/dist/css/main.css +++ b/dist/css/main.css @@ -1911,4 +1911,10 @@ background: linear-gradient(75deg, rgb(56 89 118) 51%, rgb(107 18 111) 89%) min-height: 100%; max-height: 100% !important; } - +.user_order_details.rounded.mb-3 .text-info { + color:#0a1322 !important; +} +.text-blue{ + color:#0a1322 !important; + +} diff --git a/dist/css/style.css b/dist/css/style.css index 748d14c..b943bc9 100644 --- a/dist/css/style.css +++ b/dist/css/style.css @@ -6409,9 +6409,9 @@ margin-bottom: 0.5rem !important; } .myaccount-tab-menu a:hover, .myaccount-tab-menu a.active { - background-color: #0A1039; - border-color: #0A1039; - color: #ffffff; + background: linear-gradient(145deg,rgb(27,45,83,0.9),rgb(10,19,34)) !important; + /* border: solid 2px rgb(10,19,34)!important; */ + color: white !important; } .myaccount-tab-menu a i.fa { diff --git a/myaccount.html b/myaccount.html index d3268a3..2e312ae 100644 --- a/myaccount.html +++ b/myaccount.html @@ -41,13 +41,13 @@
-
+