@@ -102,17 +102,17 @@ let port = SERVERNAME;
-
+
+
@@ -208,45 +208,7 @@
-
+
+
diff --git a/w/index.html b/w/index.html
index f18ad5e..bba1d0c 100644
--- a/w/index.html
+++ b/w/index.html
@@ -101,8 +101,10 @@
+
+
-
+
@@ -127,6 +129,9 @@
+
+
+
@@ -113,10 +113,10 @@ function navINIT() {
-
@@ -296,4 +296,10 @@ function navINIT() {
}
});
}
+
+ setTimeout(()=>{
+ if(width<=600){
+ $('.same-style').find('svg path').attr('fill','#000')
+ }
+ },300)
}
\ No newline at end of file
diff --git a/dist/Js/orderDetails/order_summary.js b/dist/Js/orderDetails/order_summary.js
index 7352497..572e27d 100644
--- a/dist/Js/orderDetails/order_summary.js
+++ b/dist/Js/orderDetails/order_summary.js
@@ -1,57 +1,49 @@
async function order_summary(){
-let current_orderSerialDate =window.localStorage.getItem('orderSerialno');
-// let user_number =window.localStorage.getItem('Userphonenumber');
-let cookieRes = COOKIE_HELPER_ACTIONS.getCookie();
-let { userId} = cookieRes;
-// let userId = '106631380000048';
-let port = SERVERNAME;
-// let port = "http://localhost:3088";
- // let url = `${port}/apis/v4/bizgaze/integrations/products/salesorderdetailsbyphonenumber/phonenumber/${user_number}`;
- let url = `${port}/apis/v4/Bizgaze/integrations/products/salesorderdetailsbyorgid/organizationid/${userId}`;
- const config = {
- url,
- method: "get",
- headers: {
- 'Authorization': `stat ${STAT} `,
- 'Content-Type': 'application/json'
- }
- };
- let res = await axios(config);
- const orderDetailsres = JSON.parse(res.data.result);
- console.log(orderDetailsres);
- let new_arrr = orderDetailsres;
- console.log(new_arrr)
- let orderNumber = localStorage.getItem("orderSerialno");
-let filteredOrders = new_arrr.filter(function(order) {
- return order.OrderNo === orderNumber;
-});
-$.each(filteredOrders, function(index, order) {
- console.log(order.OrderNo)
- let Delivery_status =order.stageshortcode
-let deliverdCard=`![]()
`;
-$('.deliverd-card').append(deliverdCard)
-if(Delivery_status == 'CMD'){
- $('.delivery_status').html('Deliverd')
-}
-if(Delivery_status == 'APL'){
- $('.delivery_status').html('Approval')
-}
-});
-console.log(filteredOrders)
-let summary =``;
-
- $('.order_tax').html(filteredOrders[0].taxamount)
- $('.Order_total').html(filteredOrders[0].nettotal)
- $('.order_price').html(filteredOrders[0].itemtotal)
- $('.order-summary').html(summary);
-$('.back_to_orders').click(function(){
- let Local_keys_update =['Userphonenumber','orderSerialno']
- debugger
- for (key of Local_keys_update) {
- window.localStorage.removeItem(key);
+ let cookieRes = COOKIE_HELPER_ACTIONS.getCookie();
+ let { userId} = cookieRes;
+ // let res = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/Bizgaze/integrations/products/salesorderdetailsbyorgid/organizationid/${userId}`,true);
+ // https://templateserver.bizgaze.com/apis/v4/bizgaze/integrations/products/getordersbyid/organizationid/{organizationid}/orderno/{orderno}
+ let orderno = window.location.hash.split('#')[1];
+ let res = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/bizgaze/integrations/products/getordersbyid/organizationid/${userId}/orderno/${orderno}`);
+ if(res.isError){
+ return;
}
- $(this).attr('href','./myaccount.html')
-})
+ const orderDetailsres = JSON.parse(res.response.result);
+
+ let new_arrr = orderDetailsres;
+ console.log(new_arrr)
+ let orderNumber =window.location.hash.split('#')[1];
+ let filteredOrders = new_arrr.filter(function(order) {
+ return order.OrderNo === orderNumber;
+ });
+
+ for(let i=0;i`;
+
+ $('.Order_details_section .order_tax').html(filteredOrders[0].taxamount)
+ $('.Order_details_section .Order_total').html(filteredOrders[0].nettotal)
+ $('.Order_details_section .order_price').html(filteredOrders[0].assessableamount)
+ $('.Order_details_section .order-summary').html(summary);
+
+ $('.back_to_orders').click(function(){
+ $(this).attr('href','./myaccount.html')
+ });
+
+ function appendItemHTML(order){
+ return `![]()
`;
+ }
}
order_summary()
\ No newline at end of file
diff --git a/dist/Js/productdetails/productdetails.js b/dist/Js/productdetails/productdetails.js
index ca909eb..ac1b419 100644
--- a/dist/Js/productdetails/productdetails.js
+++ b/dist/Js/productdetails/productdetails.js
@@ -25,7 +25,7 @@ function startDetails(){
}
let currentClick = null;
- debugger;
+
if(productId){
loadingActions.addLoader();
updateProductId(productId);
@@ -45,7 +45,7 @@ function startDetails(){
let specification_wrap_action = {
remove(){
- debugger;
+
$('.specification-wrap').addClass('d-none');
},
@@ -125,8 +125,7 @@ function startDetails(){
}
}
- debugger;
-
+
$('.specContainerleft').html(leftHtml)
$('.specContainerRight').html(rightHtml)
@@ -162,7 +161,7 @@ function startDetails(){
$('.optiontaganwi').each(function (i,el){
$(el).click(function (e){
-
+ $('#quantity').val(1)
$(e.target).parent().find('.borderselector').removeClass('borderselector');
$(e.target).addClass('borderselector')
searchComb();
@@ -183,7 +182,7 @@ function startDetails(){
let defaultImg = obj.itemimageurl ? imgServerNameBuild(obj.itemimageurl): `./dist/assets/imgs/nophoto.png`;
console.log(obj.itemimageurl,'obj.itemimageurlobj.itemimageurlobj.itemimageurl');
-debugger;
+
$('.productDetailsMain > img').attr('src',defaultImg);
updateItemId(obj.itemid);
@@ -244,7 +243,7 @@ debugger;
// $('.des_productdes').html(itemtagscombinationRes[i].itemdescription);
updateDetailsByObj(itemtagscombinationRes[i]);
}else{
- debugger;
+
let name = itemtagscombinationRes[i].itemname.split('-')[0];
$('#addtocart').addClass('disabled');
let itemsName = name;
@@ -329,7 +328,7 @@ debugger;
async function getProductDetails(id){
- debugger
+
// let res = await getStatAPIService(`${SERVERNAME}/apis/v4/bizgaze/integrations/products/productattributelist/productid/${id}`);
@@ -412,7 +411,7 @@ debugger;
let val = $(el).html();
valuesSelected.push(val.trim());
});
- debugger;
+
let searchParams = window.location.search.split("&");
let skuId = window.location.hash.split('#')[1].split('=')[1];
// skuId = skuId.split('=')[1]
@@ -437,7 +436,7 @@ debugger;
}
if(isTrue){
- debugger;
+
console.log(itemtagscombinationRes[i],'itemtagscombinationRes[i]');
@@ -447,7 +446,7 @@ debugger;
// $('.productname').html(itemtagscombinationRes[i].itemname);
// $('#skudetailitem').val(itemtagscombinationRes[i].sku)
// $('.price').html(itemtagscombinationRes[i].pricelist)
- // debugger;
+
// appendSpecs(itemtagscombinationRes[i].itemid);
// $('.des_productdes').html(itemtagscombinationRes[i].itemdescription);
diff --git a/dist/Js/products/products.js b/dist/Js/products/products.js
index 33abde6..4249193 100644
--- a/dist/Js/products/products.js
+++ b/dist/Js/products/products.js
@@ -83,9 +83,12 @@ debugger;
return ` `;
diff --git a/dist/Js/shoppingcart/addtocart.js b/dist/Js/shoppingcart/addtocart.js
index 14fa5ac..16b78cc 100644
--- a/dist/Js/shoppingcart/addtocart.js
+++ b/dist/Js/shoppingcart/addtocart.js
@@ -62,7 +62,7 @@ function updateCartQuantity(id,val){
}
function removeCartItem(id){
- debugger;
+
let data = getCartData();
if(!data) return;
@@ -105,7 +105,7 @@ function updateSummaryPriceAdd(){
}
function initAddToCart(){
-debugger;
+
addEventListeners();
function addToCartFun(){
@@ -116,7 +116,7 @@ debugger;
if(!data){
let cartObj = {};
- debugger;
+
cartObj[$('#skudetailitem').val()] = {
name:$('.productname').html(),
@@ -171,34 +171,57 @@ debugger;
}
}
-debugger;
+
setLengthCart();
}
function addEventListeners(){
- $('#addtocart').html('Add to cart')
- $('#addtocart').off().click((e)=>{
- debugger
+ $('#addtocart').html('Add to cart');
+ $('#addtocart').removeAttr('gotocart');
+ $('#addtocart').off('click').click((e)=>{
+
$('.insufficientqty').addClass('d-none');
const qty = parseInt($('#addtocart').data('qty'));
- debugger;
+
if(parseInt($('#quantity').val())>qty){
$('.insufficientqty').removeClass('d-none');
return;
}
- $('#addtocart').off().click(function (el){
- window.location.href = '/shopping-cart.html';
+ // $('#addtocart').off().click(function (el){
+ // window.location.href = '/shopping-cart.html';
- });
+ // });
addToCartFun();
- debugger;
+
toasterHelper('success',"Item added to cart","toast-top-right");
- $('#addtocart').html('Go to cart');
+ // $('#addtocart').html('Go to cart');
+ // debugger;
+ // $('#addtocart').attr('gotocart',1);
});
+ // $('.quantityHTML #quantity').off('change').change(function (e){
+ // let sku = $('#skudetailitem').val();
+ // let data = getCartData();
+ // const qty = parseInt($('#addtocart').data('qty'));
+ // let isCart = $('#addtocart').attr('gotocart');
+ // if(!isCart) return;
+ // if(parseInt($('#quantity').val())>qty){
+ // $('.insufficientqty').removeClass('d-none');
+ // return;
+ // }
+ // if(!data[sku]){
+ // return;
+ // }
+
+ // data[sku].quantity = $('.quantityHTML #quantity').val();
+ // toasterHelper("success","Your item quantity was been updated","toast-top-right")
+ // setCartData(data);
+ // setLengthCart();
+ // })
+
$('.buynow').off('click').click(async (e)=>{
addToCartFun();
const res = await COOKIE_HELPER.validateToken();
@@ -212,7 +235,7 @@ debugger;
}
window.location.href = '/selectdelivery.html';
- });
+ });
}
function addtoCart(data){
diff --git a/dist/Js/shoppingcart/shoppingcart.js b/dist/Js/shoppingcart/shoppingcart.js
index 02e9a5f..afb9f38 100644
--- a/dist/Js/shoppingcart/shoppingcart.js
+++ b/dist/Js/shoppingcart/shoppingcart.js
@@ -1,6 +1,5 @@
shoppingCartInit();
-debugger;
function shoppingCartInit() {
shoppingCartAppend();
diff --git a/dist/Js/utils/helpers.js b/dist/Js/utils/helpers.js
index 4d8a1ea..256f247 100644
--- a/dist/Js/utils/helpers.js
+++ b/dist/Js/utils/helpers.js
@@ -41,6 +41,7 @@ function getCurrencySymbol(value=0) {
function toasterHelper(type,message,align='toast-top-center'){
// toasterOpts()
debugger;
+ toastr.clear()
toasterOpts(align);
Command: toastr[type](message);
diff --git a/dist/Js/warranty.js b/dist/Js/warranty.js
index f809b26..fa90c90 100644
--- a/dist/Js/warranty.js
+++ b/dist/Js/warranty.js
@@ -1,4 +1,5 @@
function wattantyFunction() {
+ setLengthCart();
let order_card = ` `;
$(".user_orders").append(order_card);
$(".add_serialNum").click(function () {
diff --git a/dist/css/style.css b/dist/css/style.css
index b604d9d..7fc0b63 100644
--- a/dist/css/style.css
+++ b/dist/css/style.css
@@ -31778,12 +31778,12 @@ input[type=number]::-webkit-outer-spin-button {
white-space: nowrap;
text-align: center;
line-height: 18px;
- padding: 0 6px;
- height: 18px;
- background: #6a59d3;
+ padding: 0 7px;
+ height: 17px;
+ background: #dc3545;
position: absolute;
border-radius: 50%;
- font-size: 12px;
+ font-size: 10px;
color: #fff;
left: 22px;
top: -8px;
@@ -31816,4 +31816,10 @@ input[type=number]::-webkit-outer-spin-button {
height: 15px;
width: 15px;
margin-top: 4px;
+}
+
+@media (max-width: 768px) {
+ #carouselExampleAutoplaying{
+ padding-top: 3rem;
+ }
}
\ No newline at end of file
diff --git a/orderdetails.html b/orderdetails.html
index 9c767aa..5e92e72 100644
--- a/orderdetails.html
+++ b/orderdetails.html
@@ -171,7 +171,7 @@
Delivery Status :
Delivered To : ${order.OrganizationName}
${order.itemname} (${order.Quantity} items)${order.itemtotal}
Return/Exchange window closed on Friday,24 March Why?
Order : ${orderNumber} ( ${filteredOrders.length} items )
Order placed on ${filteredOrders[0].OrderDate}
Order : ${orderNumber} ( ${filteredOrders.length} items )
Order placed on ${filteredOrders[0].OrderDate}
Delivery Status :
Delivered To : ${order.OrganizationName}
${order.itemname} (${order.Quantity} items)${order.itemtotal}
Return/Exchange window closed on Friday,24 March Why?
+