Этот коммит содержится в:
2023-04-28 15:43:17 +05:30
родитель 4943d7fc15
Коммит b8d88b9cc5
24 изменённых файлов: 223 добавлений и 93 удалений
поставляемый
+12 -7
Просмотреть файл
@@ -1,10 +1,15 @@
//let SERVERNAME = 'https://anwi.bizgaze.app';
let SERVERNAME = 'http://beta.bizgaze.com';
const STAT = 'b276960fddf84e8cb63de6e32d31529b';
//let SERVERNAME = 'http://beta.bizgaze.com';
let SERVERNAME = 'http://localhost:3088';
//template
const STAT = '8041f78ba55b4847bc4aacaeae9d24ef';
//live
//const STAT = '0c7ef2b000ca431290065753dfda56fe';
function imgServerNameBuild(path){
return `${SERVERNAME}/${path}`;
return `https://appassets.bizgaze.app/${path}`;
}
@@ -54,10 +59,10 @@ async function postAPIService(url,data={}){
url:`${SERVERNAME}/${url}`,
method:'post',
data:data,
headers: {
'Authorization': `Basic b67607dd-283e-478e-b2cf-35736e8bad69`,
'Content-Type': 'application/json'
},
// headers: {
// 'Authorization': `Basic b67607dd-283e-478e-b2cf-35736e8bad69`,
// 'Content-Type': 'application/json'
// },
}
let response = await axios(config);
поставляемый
+2
Просмотреть файл
@@ -107,6 +107,8 @@ function initLogin() {
$('.error_msg').show();
$('.error_msg .error_msg_res').html(`User doesn't exists with the email, <a href="#" class="alert-link register_sectionbtn" id="register_sectionbtn">Sign Up </a>`);
$(".register_sectionbtn").click(function(){
$(".login_section").css("display","none");
$(".register_section").css("display","block");
$(".login_section").find("#User_Email").removeClass("is-invalid");
+4 -4
Просмотреть файл
@@ -19,10 +19,10 @@ template.innerHTML = `
.loader{
transition: all 0.7s ease-in-out;
border:10px solid #ebebeb;
border-bottom-color:#26B8BF;
width: 100px;
height: 100px;
border:5px solid #ebebeb;
border-bottom-color:black;
width: 20px;
height: 20px;
border-radius:50%;
-webkit-font-smoothing: antialiased !important;
margin:30px 0px;
поставляемый
+6 -6
Просмотреть файл
@@ -12,7 +12,7 @@ async function addressDetails() {
console.log(cookieRes);
const { errorMsg, isError, response } =
await API_SERVICES_ACTIONS.getAPIService(
`apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}`
`apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}`
);
let res = JSON.parse(response.result);
debugger;
@@ -138,7 +138,7 @@ async function addressDetails() {
});
async function getCountryStateCurrency() {
const countryRes = await API_SERVICES_ACTIONS.getAPIService(
"apis/v4/bizgaze/integrations/products/getcountry"
"apis/v4/bizgaze/integrations/anwiauth/getcountry"
);
if (countryRes.isError) {
alert("something went wrong");
@@ -157,7 +157,7 @@ async function addressDetails() {
}
}
const stateRes = await API_SERVICES_ACTIONS.getAPIService(
`apis/v4/bizgaze/integrations/products/getcities/countryid/${countryID}`
`apis/v4/bizgaze/integrations/anwiauth/getcities/countryid/${countryID}`
);
if (stateRes.isError) {
@@ -186,7 +186,7 @@ async function addressDetails() {
});
const currencyRes = await API_SERVICES_ACTIONS.getAPIService(
"apis/v4/bizgaze/integrations/products/getcurrencies"
"apis/v4/bizgaze/integrations/anwiauth/getcurrencies"
);
if (currencyRes.isError) {
@@ -209,7 +209,7 @@ async function addressDetails() {
async function getCountryId() {
const countryRes = await API_SERVICES_ACTIONS.getAPIService(
"apis/v4/bizgaze/integrations/products/getcountry"
"apis/v4/bizgaze/integrations/anwiauth/getcountry"
);
if (countryRes.isError) {
@@ -280,7 +280,7 @@ async function addressDetails() {
let { userId, name } = cookieRes;
const { errorMsg, isError, response } =
await API_SERVICES_ACTIONS.getAPIService(
`apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}`
`apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}`
);
let resAnwi = JSON.parse(response.result);
console.log(resAnwi, "befores");
поставляемый
+2 -2
Просмотреть файл
@@ -5,7 +5,7 @@ function myProfile() {
let cookieRes = COOKIE_HELPER_ACTIONS.getCookie();
console.log(cookieRes);
const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService(
`apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}`
`apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}`
);
let res = JSON.parse(response.result);
debugger;
@@ -134,7 +134,7 @@ function myProfile() {
let { userId, name } = cookieRes;
const { errorMsg, isError, response } =
await API_SERVICES_ACTIONS.getAPIService(
`apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}`
`apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}`
);
let resAnwi = JSON.parse(response.result);
console.log(resAnwi, "previous profilesave");
+1 -1
Просмотреть файл
@@ -21,7 +21,7 @@ $('.warranty_serialNumber_submit').click(async function () {
debugger
let url = `${port}/apis/v4/Bizgaze/integrations/products/warrantyservice/serialno/${serial_no_inp}`;
console.log(url);
const STAT = `05b2f2ca510344968c65e1ebf49a5595`
// const STAT = `05b2f2ca510344968c65e1ebf49a5595`
const config = {
url,
method: "get",
поставляемый
+6 -4
Просмотреть файл
@@ -3,17 +3,19 @@ async function bindOrderDetails() {
// validatesession()
debugger
let cookieRes = COOKIE_HELPER_ACTIONS.getCookie();
let { userId} = cookieRes;
// let userId = '106631380000095';
let port = "https://anwi.bizgaze.app";
let { userId} = cookieRes;
//let userId = '106631380000048';
debugger;
let port = SERVERNAME;
// let port = "http://localhost:3088";
let url = `${port}/apis/v4/Bizgaze/integrations/products/salesorderdetailsbyorgid/organizationid/${userId}`;
// /apis/v4/bizgaze/integrations/products/salesorderdetailsbyorgid/phonenumber/
// https://anwi.bizgaze.app/apis/v4/Bizgaze/integrations/products/salesorderdetailsbyorgid/organizationid/{organizationid}
const config = {
url,
method: "get",
headers: {
'Authorization': `stat 05b2f2ca510344968c65e1ebf49a5595 `,
'Authorization': `stat ${STAT} `,
'Content-Type': 'application/json'
}
};
поставляемый
+6 -3
Просмотреть файл
@@ -1,7 +1,10 @@
navINIT();
function navINIT() {
loadCart();
if(!window.location.href.includes('orderconfirmation')){
loadCart();
}
function loadHelper(src = './dist/js/utils/helpers.js'){
if ($(`script[src="${src}"]`).length > 0) {
return new Promise((resolve) => resolve());
@@ -59,7 +62,7 @@ function navINIT() {
<nav>
<ul class="mb-0 p-0">
<li><a href="./storageproducts.html" class="satoshi_font">STORAGE</a></li>
<li><a href="./ramproducts.html" class="satoshi_font">MEMORIES</a></li>
<li><a href="./ramproducts.html" class="satoshi_font">MEMORY</a></li>
<li><a href="./support.html" class="satoshi_font">SUPPORT</a></li>
<li><a href="./press.html" class="satoshi_font">PRESS</a></li>
<li><a href="./index1.html" class="satoshi_font">COMING SOON</a></li>
@@ -75,7 +78,7 @@ function navINIT() {
</div>
<div class="same-style header-cart">
<a class="cart-active1 position-relative" href="./shopping-cart.html"><i class="fa-solid fa-cart-shopping"></i>
<span class="position-absolute cartnumcount d-none" style="top:-15%;right:-115%">0</span>
<span class="position-absolute cartnumcount d-none" >0</span>
</a>
</div>
</div>
+3 -3
Просмотреть файл
@@ -3,8 +3,8 @@ 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 = '106631380000095';
let port = "https://anwi.bizgaze.app";
// 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}`;
@@ -12,7 +12,7 @@ let port = "https://anwi.bizgaze.app";
url,
method: "get",
headers: {
'Authorization': `stat 05b2f2ca510344968c65e1ebf49a5595 `,
'Authorization': `stat ${STAT} `,
'Content-Type': 'application/json'
}
};
+19 -1
Просмотреть файл
@@ -13,9 +13,21 @@ function startDetails(){
let group = {};
let loadingActions = {
addLoader(){
$('.loadingCall').removeClass('d-none');
$('.mainContanierProduct').addClass('d-none');
},
removeLoader(){
$('.loadingCall').addClass('d-none');
$('.mainContanierProduct').removeClass('d-none');
}
}
let currentClick = null;
debugger;
if(productId){
loadingActions.addLoader();
updateProductId(productId);
getProductDetails(productId);
appendSpecs(productId)
@@ -324,6 +336,7 @@ debugger;
let resData = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/bizgaze/integrations/products/productattributelist/productid/${id}`,true);
if(resData.isError){
loadingActions.removeLoader();
alert(resData.errorMsg.message);
return;
}
@@ -333,7 +346,10 @@ debugger;
res = JSON.parse(res.result);
// console.log(res);
if(!res) return;
if(!res) {
loadingActions.removeLoader();
return;
};
@@ -489,7 +505,9 @@ debugger;
// }
$('#spec-container-details').children().slice(1).find('.specsmallcard').removeClass('specsmallcard');
addeventlisteners();
loadingActions.removeLoader();
return;
// let resTwo = await postStatAPIService(`${SERVERNAME}/apis/v4/bizgaze/integrations/products/itemtagscombination/productid/${id}`);
поставляемый
+23
Просмотреть файл
@@ -80,6 +80,29 @@ debugger;
let gb = tags[tags.length-1];
const [currencySymbol,amount] = getCurrencySymbol(pricelist);
let priceAmt = `${currencySymbol} ${amount}`;
return `<div class="col-lg-4 col-md-6 mb-4 col-md-6 ram_card cursor-pointer">
<div class="card border bg-gray-3 rounded-3 p-1 h-100">
<img src="${img}" alt="${itemname}" class="w-100 h-100"></a>
<div class="card-body">
<h5 class="card-title satoshi_font mb-0">${itemname}</h5>
</div>
<ul class="border-0 d-flex h-100 justify-content-between px-md-3 px-4 list-group-flush p-0 text-secondary" style="list-style: none;">
<li class="border-0 py-0">
<span class="satoshi_font"> <h6>${gb}</h6> <h6>${ramTech}</h6></span>
</li>
<li class="border-0 py-0">
<span class="satoshi_font"><h6>${priceAmt}</h6></span>
</li>
</ul>
<div class="card-body text-center">
<a href="/productdetails.html?productId=${RAM_ID}#itemid=${itemid}" class="btn bg-white font-1-2 px-5 w-100">Details
</a>
</div>
</div>
</div>`;
//abhi anna design
return `
<!--desktop--->
поставляемый
+1 -1
Просмотреть файл
@@ -194,7 +194,7 @@ debugger;
addToCartFun();
debugger;
toasterHelper('success',"Item added to cart");
toasterHelper('success',"Item added to cart","toast-top-right");
$('#addtocart').html('Go to cart');
});
+7 -7
Просмотреть файл
@@ -130,7 +130,7 @@ let Newuser =window.localStorage.getItem('isaccountCreated');
async function appendFormDetails(){
let cookieRes = COOKIE_HELPER_ACTIONS.getCookie();
console.log(cookieRes);
const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}`);
const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}`);
let res = JSON.parse(response.result)[0];
debugger;
const {cityid, lobid,organizationname,addressline,cityname,phonenumber,zipcode,name } =res;
@@ -152,7 +152,7 @@ let Newuser =window.localStorage.getItem('isaccountCreated');
async function getAddressRes() {
let cookieRes = COOKIE_HELPER_ACTIONS.getCookie();
console.log(cookieRes);
const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}`);
const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}`);
let res = JSON.parse(response.result);
console.log(res, 'befores');
@@ -285,7 +285,7 @@ let Newuser =window.localStorage.getItem('isaccountCreated');
let cookieRes = COOKIE_HELPER_ACTIONS.getCookie();
let { userId, name } = cookieRes;
const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/bizgaze/integrations/products/getbillinginfo/contactid/${cookieRes.userId}`);
const { errorMsg, isError, response } = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/bizgaze/integrations/anwiauth/getbillinginfo/contactid/${cookieRes.userId}`);
let resAnwi = JSON.parse(response.result);
console.log(resAnwi, 'befores');
@@ -521,7 +521,7 @@ let Newuser =window.localStorage.getItem('isaccountCreated');
}
async function getCountryId(){
const countryRes = await API_SERVICES_ACTIONS.getAPIService('apis/v4/bizgaze/integrations/products/getcountry');;
const countryRes = await API_SERVICES_ACTIONS.getAPIService('apis/v4/bizgaze/integrations/anwiauth/getcountry');;
if (countryRes.isError) {
alert("something went wrong");
@@ -564,7 +564,7 @@ let Newuser =window.localStorage.getItem('isaccountCreated');
}
async function getCountryStateCurrency() {
const countryRes = await API_SERVICES_ACTIONS.getAPIService('apis/v4/bizgaze/integrations/products/getcountry');;
const countryRes = await API_SERVICES_ACTIONS.getAPIService('apis/v4/bizgaze/integrations/anwiauth/getcountry');;
if (countryRes.isError) {
alert("something went wrong");
@@ -585,7 +585,7 @@ let Newuser =window.localStorage.getItem('isaccountCreated');
}
}
const stateRes = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/bizgaze/integrations/products/getcities/countryid/${countryID}`);
const stateRes = await API_SERVICES_ACTIONS.getAPIService(`apis/v4/bizgaze/integrations/anwiauth/getcities/countryid/${countryID}`);
if (stateRes.isError) {
alert("something went wrong");
@@ -607,7 +607,7 @@ let Newuser =window.localStorage.getItem('isaccountCreated');
const currencyRes = await API_SERVICES_ACTIONS.getAPIService('apis/v4/bizgaze/integrations/products/getcurrencies');
const currencyRes = await API_SERVICES_ACTIONS.getAPIService('apis/v4/bizgaze/integrations/anwiauth/getcurrencies');
if(currencyRes.isError){
alert("something went wrong");
поставляемый
+4 -4
Просмотреть файл
@@ -38,19 +38,19 @@ function getCurrencySymbol(value=0) {
}
}
function toasterHelper(type,message){
function toasterHelper(type,message,align='toast-top-center'){
// toasterOpts()
debugger;
toasterOpts();
toasterOpts(align);
Command: toastr[type](message);
function toasterOpts(){
function toasterOpts(align){
toastr.options = {
"closeButton": true,
"debug": false,
"newestOnTop": true,
"progressBar": true,
"positionClass": "toast-top-center",
"positionClass": align,
"preventDuplicates": true,
"onclick": null,
"showDuration": "300",
поставляемый
+4 -4
Просмотреть файл
@@ -15,11 +15,11 @@ function wattantyFunction() {
$(".error_phonenumber").addClass("d-none");
$("#Add_serial_number_inp").removeClass("border-danger");
$("#Add_phonenumber_inp").removeClass("border-danger");
let port = "https://anwi.bizgaze.app";
let port = SERVERNAME;
debugger;
let url = `${port}/apis/v4/Bizgaze/integrations/products/warrantyservice/serialno/${serial_no_inp}`;
console.log(url);
const STAT = `05b2f2ca510344968c65e1ebf49a5595`;
//const STAT = `05b2f2ca510344968c65e1ebf49a5595`;
const config = {
url,
method: "get",
@@ -80,11 +80,11 @@ function wattantyFunction() {
if (serial_no_inp != "") {
$(".error_serial_num").addClass("d-none");
$("#Add_serial_number_inp").removeClass("border-danger");
let port = "https://anwi.bizgaze.app";
let port = SERVERNAME;
debugger;
let url = `${port}/apis/v4/Bizgaze/integrations/products/warrantyservice/serialno/${serial_no_inp}`;
console.log(url);
const STAT = `05b2f2ca510344968c65e1ebf49a5595`;
// const STAT = `05b2f2ca510344968c65e1ebf49a5595`;
const config = {
url,
method: "get",