-
-
-
-
-
-
-
-
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
-
-
-
-
-
-
-
-
- display:none;
-
-
-
-
-
-
-
-
-
-
-
- display:none;
-
-
-
-
-
-
-
-
-
-
-
cop_product_wrap --hide
-
cop_product_wrap --last-visible
-
cop_product_wrap --last
-
cop_product_wrap --hide --last-hidden
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- x
-
+
+
+
+
+
+
+
+ display:none;
+
+
+
+
+
+
+
+ display:none;
+
+
+
+
+
+
+
+
+
+
cop_product_wrap --hide
+
cop_product_wrap --last-visible
+
cop_product_wrap --last
+
cop_product_wrap --hide --last-hidden
+
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
+
-
+
+
@@ -1038,138 +1008,156 @@
+
+
+
+
+
+
+
+
+
+
+
+
-
-
+
+
+
+
+
-
+
-
-
-
-
-
+
+
+
+
+
-
\ No newline at end of file
diff --git a/mapy/oneMap.js b/mapy/oneMap.js
index d530b86..e779825 100644
--- a/mapy/oneMap.js
+++ b/mapy/oneMap.js
@@ -37,7 +37,7 @@ const deliveryPickupPoints = [];
let finpostjs = false;
// Funkcja inicjująca mapę
function loadMap() {
- var htmlContent = `
+ const htmlContent = `
@@ -113,10 +113,12 @@ function loadMap() {
document.querySelector('.asideContainer_pickup').innerHTML = '';
}
+
+
// Funkcja obsługująca dostawy z mapą
function createEventsInpost(ITEM_ID) {
- var ITEM_FOR_MAP = '#item_' + ITEM_ID;
- var oscItem = document.querySelector(ITEM_FOR_MAP).closest('.osc_item');
+ const ITEM_FOR_MAP = '#item_' + ITEM_ID;
+ const oscItem = document.querySelector(ITEM_FOR_MAP).closest('.osc_item');
document.querySelector(ITEM_FOR_MAP).addEventListener('click', function (e) {
const deliveryValue = ITEM_FOR_MAP.slice(1);
@@ -129,18 +131,9 @@ function loadMap() {
// Jesli nie ma informacji potrzebnej do mapy, zapisz wiadomosc do errora
let errorMessage = "";
- if(!clientStreet){
- errorMessage += `${
}
`;
- addErrorMessage(document.getElementById("client_street"),
)
- }
- if(!clientZipCode){
- errorMessage += `${
}
`;
- addErrorMessage(document.getElementById("client_zipcode"),
)
- }
- if(!clientCity){
- errorMessage += `${
}`;
- addErrorMessage(document.getElementById("client_city"),
)
- }
+ if(!clientStreet) errorMessage += addAddressErrorForMap("street");
+ if(!clientZipCode) errorMessage += addAddressErrorForMap("zipcode");
+ if(!clientCity) errorMessage += addAddressErrorForMap("city");
// Zablokuj wybranie mapy jak nie ma adresu
if(errorMessage !== ""){
@@ -170,7 +163,6 @@ function loadMap() {
if(!suggestions) return;
else suggestions.remove();
});
- htmlContent = '';
}
// Wstaw adres klienta
@@ -249,6 +241,17 @@ function getAddressInfo(query){
};
return document.getElementById(`client_${query}`).value;
}
+// Wiadomość errora, gdyby niebyło informacji adresowych przy otwieraniu mapy
+const addressErrorMessagesForMap = {
+ "street": `${
}`,
+ "zipcode": `${
}`,
+ "city": `${
}`,
+}
+function addAddressErrorForMap(query){
+ addErrorMessage(document.getElementById(`client_${query}`), addressErrorMessagesForMap[query]);
+ return `${addressErrorMessagesForMap[query]}
`;
+}
+
// Utworzenie informacji o punkcie odbioru
function createPickuppointInfo(selectedPoint, deliveryPointId, name, streetText, cityText, zipcodeText, courierId){
// Pokazanie elementu fselectedPoint
@@ -298,10 +301,10 @@ function toggleMapList(e){
e.target.dataset.show = ifList ? "map" : "list";
}
+
//////////////////////////////////////////////////////////////////////////
// DANE KLIENTA
-
-document.getElementById("cop_seection1").addEventListener("click", (e) => {
+document.getElementById("bm-oscop-section1").addEventListener("click", (e) => {
// Pokazanie się okna od logowania
if(e.target.classList.contains("get_signin")) showSigninModal();
@@ -314,11 +317,11 @@ document.getElementById("cop_seection1").addEventListener("click", (e) => {
}
// Ukrycie/Pokazanie hasła
- if(e.target.id === "toggle_password") return togglePassword(e.target);
+ if(e.target.id === "toggle-password") return togglePassword(e.target);
// Sprawdzenie czy kliknięcie było na firmę, czy na osobę prywatną
- if(e.target.id === "client_type1") return document.querySelectorAll("#cop_seection1 .firm-group").forEach(el => el.classList.add("--fade-in"));
- if(e.target.id === "client_type2") return document.querySelectorAll("#cop_seection1 .firm-group").forEach(el => el.classList.remove("--fade-in"));
+ if(e.target.id === "client_type1") return document.querySelectorAll("#bm-oscop-section1 .firm-group").forEach(el => el.classList.add("--fade-in"));
+ if(e.target.id === "client_type2") return document.querySelectorAll("#bm-oscop-section1 .firm-group").forEach(el => el.classList.remove("--fade-in"));
// Sprawdzenie czy dostawa na inny adres czy nie
if(e.target.id === "deliver_to_billingaddr"){
@@ -360,24 +363,24 @@ function togglePassword(el){
// Pokaż popup logowania
function showSigninModal(){
app_shop.fn.signinModal = new Modal({
- element: $("#signin-form-ajax"),
+ element: $("#signin-form"),
classList: "--fade-in-modal",
afterShow: ()=>{
disablePageScroll();
- document.querySelector(".signin_login_input").addEventListener("keydown", logInOnEnter);
- document.querySelector(".signin_pass_input").addEventListener("keydown", logInOnEnter);
+ document.querySelector(".signin-form__login").addEventListener("keydown", logInOnEnter);
+ document.querySelector(".signin-form__pass").addEventListener("keydown", logInOnEnter);
},
beforeClose: ()=>{
enablePageScroll();
- document.querySelector(".signin_login_input").removeEventListener("keydown", logInOnEnter);
- document.querySelector(".signin_pass_input").removeEventListener("keydown", logInOnEnter);
+ document.querySelector(".signin-form__login").removeEventListener("keydown", logInOnEnter);
+ document.querySelector(".signin-form__pass").removeEventListener("keydown", logInOnEnter);
},
});
}
// Pokaż(true)/Schowaj(false) formularz dostawy na inny adres
function showDeliveryForm(style){
- const deliveryWrapper = document.querySelector(".ajax_cop #client_new_additional .delivery_box.cn_wrapper");
+ const deliveryWrapper = document.querySelector(".bm-oscop__container #client_new_additional .delivery_box.cn_wrapper");
if((style && deliveryWrapper.classList.contains("--more")) || (!style && !deliveryWrapper.classList.contains("--more"))) return;
// Formularz dostawy na inny adres
@@ -452,15 +455,15 @@ const SIGNIN = (signinInput) => JSON.stringify({
});
function logInOnEnter(e){
- if(e.key==="Enter") logInToAccount(false)
+ if(e.key === "Enter") logInToAccount(false)
}
-const signinForm = document.querySelector(".signin-form_box_text form");
+const signinForm = document.querySelector(".signin-form__container form");
if(signinForm) signinForm.addEventListener("submit", logInToAccount);
async function logInToAccount(event){
if(event) event.preventDefault();
- const login = document.querySelector(".signin_login_input").value;
- const password = document.querySelector(".signin_pass_input").value;
+ const login = document.querySelector(".signin-form__login").value;
+ const password = document.querySelector(".signin-form__pass").value;
const loginStatus = await fetchData({
data: SIGNIN(`
login: "${login.replace(/"/g, '\\"')}",
@@ -497,7 +500,7 @@ function getClientNew(){
success: function (e, a) {
app_shop.fn.load(
"place-order.php",
- [["#cop_seection1", "#cop_seection1"]],
+ [["#bm-oscop-section1", "#bm-oscop-section1"]],
function () {
history.go(-1);
},
@@ -643,8 +646,8 @@ function handleShowSigninModalFromEmailModal(e){
showSigninModal();
}
-// EventListener zmian w kontenerze cop_seection1
-document.getElementById("cop_seection1").addEventListener("change", (e) => {
+// EventListener zmian w kontenerze bm-oscop-section1
+document.getElementById("bm-oscop-section1").addEventListener("change", (e) => {
const validateRequestId = ["client_zipcode", "delivery_zipcode", "client_nip", "client_email"];
const notEmptyFieldsId = ["client_firstname", "client_lastname", "client_city", "delivery_firstname", "delivery_lastname", "delivery_city", "client_firm"];
@@ -662,17 +665,13 @@ const notEmptyFieldsId = ["client_firstname", "client_lastname", "client_city",
// Walidacja ulicy i numeru domu
if(e.target.id === "client_street" || e.target.id === "delivery_street") validateStreet(e.target);
-
// Walidacja numeru telefonu
if(e.target.id === "client_phone" || e.target.id === "delivery_phone") validatePhone(e.target);
-
// Walidacja loginu i hasła rejestracji
if(e.target.classList.contains("register__login")) testLogin();
if(e.target.classList.contains("register__password")) testPassword();
-
// Walidacja imienia nazwiska miasta i firmy(wymagające po prostu nie bycia pustym)
if(notEmptyFieldsId.includes(e.target.id)) validateNotEmpty(e.target);
-
// Sprawdzenie czy firma w dostawie na inny adres została wpisana
if(e.target.id === "delivery_additional"){
if(e.target.value.length > 0) addSuccess(e.target);
@@ -818,7 +817,7 @@ function getNewPaymentsAndDeliveries(data = null) {
throwAjaxError(a);
app_shop.fn.ajaxLoadSite(0);
},
- success: function (e) {
+ success: async function (e) {
let prepaidMarkup = "";
// Stworzenie markupa dla metod dostaw
@@ -834,13 +833,12 @@ function getNewPaymentsAndDeliveries(data = null) {
// Dane do zaznaczenia płatności i dostawy jeśli wcześniej na tej przeglądarce(localStorage) było już zamówienie
const prevOrderInfo = JSON.parse(localStorage.getItem("prevOrderInfo"));
- console.log(prevOrderInfo);
// Wstawienie metod dostaw na strone
const deliveryMarkup = `
${prepaidMarkup}
${dvpMarkup}
`;
const previousDeliveries = document.getElementById("osc_order1");
if(previousDeliveries) previousDeliveries.remove();
- document.querySelector(".ajax_cop .step2_sub").insertAdjacentHTML("beforeend",deliveryMarkup);
+ document.getElementById("bm-oscop-deliveries").insertAdjacentHTML("beforeend",deliveryMarkup);
// Stworzenie metod płatności
let prepaidsMethodMarkup = "";
@@ -878,7 +876,7 @@ const checkedPayment = paymentValue === method.id;
ifPaymentCard = true;
}
else{
- prepaidsMethodMarkup += markup;
+ prepaidsMethodMarkup += markup;
// Okienko vouchera
if(method.id === 2){
prepaidsMethodMarkup += `
@@ -904,8 +902,8 @@ const checkedPayment = paymentValue === method.id;
}
}
});
- prepaidsTransferMarkup +="
";
- prepaidsCardMarkup +="
";
+ prepaidsTransferMarkup += "
";
+ prepaidsCardMarkup += "
";
// Dołączenie metody płatność przy odbiorze
if(e.dvp.length) prepaidsMethodMarkup += `
@@ -922,16 +920,22 @@ const checkedPayment = paymentValue === method.id;
// Wstawienie metod płatności na stronę
const previousPayments = document.getElementById("osc_prepaids_method");
if(previousPayments) previousPayments.remove();
- document.querySelector(".ajax_cop #checkout_step3_1 .step3_sub").insertAdjacentHTML("beforeend", `
${ifPaymentTransfer ? prepaidsTransferMarkup : ""}${ifPaymentCard ? prepaidsCardMarkup : ""}${prepaidsMethodMarkup}
`);
+ document.getElementById("bm-oscop-payments").insertAdjacentHTML("beforeend", `
${ifPaymentTransfer ? prepaidsTransferMarkup : ""}${ifPaymentCard ? prepaidsCardMarkup : ""}${prepaidsMethodMarkup}
`);
// Wstawienie błędu jeśli metody płatności są puste
const currentPayments = document.getElementById("osc_prepaids_method");
if(document.getElementById("osc_prepaids_method").innerHTML === "") currentPayments.insertAdjacentHTML("beforeend",'");
+
+
+ // Przygotowanie informacji o dostawie do obliczenia daty dostawy
+ const deliveryDateInfo = {deliveryVal: null, delivery: null, pickuppoint: null};
+ const firstInput = document.querySelector("#osc_order1 input");
+ if(firstInput) changeDeliveryInfoObject(deliveryDateInfo, firstInput);
// Wstawienie pickuppoint jeśli edycja i istnieje
if(data?.pickupData !== undefined && data?.pickupData !== null){
- const selectedShipping = document.querySelector(`#cop_seection2 input#${deliveryId}`);
- checkPrevPickupPoint(
+ const selectedShipping = document.querySelector(`#bm-oscop-section2 input#${deliveryId}`);
+ const pointExists = await checkPrevPickupPoint(
selectedShipping.parentElement.querySelector(".fselectedPoint"),
data.pickupData.id,
data.pickupData.name,
@@ -939,12 +943,13 @@ const checkedPayment = paymentValue === method.id;
data.pickupData.address.city,
data.pickupData.address.postcode,
data.deliveryMethodId
- ).then(pointExists=>{
+ )
// Odznaczenie punktu jeśli punkt odbioru nie istnieje(Wcześniej był zaznaczony przy edycji)
if(!pointExists) selectedShipping.checked = false;
- });
+ else changeDeliveryInfoObject(deliveryDateInfo, selectedShipping);
}// Sprawdzenie czy użytkownik ma zapisane poprzednio użyte metody w przeglądarce(tylko przy pierwszym załadowaniu strony)
else if(firstTimeLoadPage && prevOrderInfo && prevOrderInfo?.prevCountry === document.getElementById("client_region").value){
+// POPRZEDNIa PŁATNOSC
const prevPaymentMethod = prevOrderInfo.prevPaymentMethod;
// Zaznaczenie metod płatności które nie tworzą popupa
@@ -956,7 +961,7 @@ const checkedPayment = paymentValue === method.id;
cloneElement(document.getElementById(paymentMethodId));
}
- // Poprzednia dostawa
+ // POPRZEDNIA DOSTAWA
const prevDeliveryMethod = prevOrderInfo.prevDeliveryMethod;
const prevDeliveryInput = document.querySelector(`input#${prevDeliveryMethod.id}`);
@@ -964,7 +969,7 @@ const checkedPayment = paymentValue === method.id;
if(prevDeliveryInput){
// Sprawdzenie czy dostawa miała punkt odbioru
if(prevDeliveryMethod.fselectedPoint){
- checkPrevPickupPoint(
+ const pointExists = await checkPrevPickupPoint(
prevDeliveryInput.parentElement.querySelector(".fselectedPoint"),
prevDeliveryMethod.fselectedPoint.deliveryPointId,
prevDeliveryMethod.fselectedPoint.name,
@@ -972,12 +977,12 @@ const checkedPayment = paymentValue === method.id;
prevDeliveryMethod.fselectedPoint.city,
prevDeliveryMethod.fselectedPoint.zipcode,
prevDeliveryMethod.fselectedPoint.courierId
- ).then(pointExists=>{
+ )
if(pointExists) prevDeliveryInput.checked = true;
-});
}else{
prevDeliveryInput.checked = true;
}
+changeDeliveryInfoObject(deliveryDateInfo, prevDeliveryInput);
}
}
@@ -986,16 +991,17 @@ const checkedPayment = paymentValue === method.id;
if(paymentValue && checkedPayment && (checkedPayment.dataset.group === "card" || checkedPayment.dataset.group === "transfer")){
cloneElement(checkedPayment);
}
+
// Przeładowanie mapy
loadMap();
+
+ // Zmiana daty dostawy i pokazanych opcji dostawy
+ if(deliveryDateInfo.deliveryVal && deliveryDateInfo.delivery && deliveryDateInfo.pickuppoint) calculateDeliveryDate(deliveryDateInfo.deliveryVal, deliveryDateInfo.delivery, deliveryDateInfo.pickuppoint);
+
// Przeliczenie kosztu dostawy
calculateBasketCost();
- // Zmiana daty dostawy i pokazanych opcji dostawy
- const firstInput = document.getElementById("osc_order1 input");
- if(firstInput) deliveryDate(firstInput.value, firstInput.dataset.delivery, firstInput.dataset.pickuppoint);
- calculateBasketCost();
+
app_shop.fn.ajaxLoadSite(0);
-
firstTimeLoadPage = false;
},
});
@@ -1104,10 +1110,10 @@ function checkPrevShipping(){
// Przeliczenie kosztu i czasu dostawy i zapisanie nowej metody dostawy
function changeCurrentShippingInfo(shippingMethod){
calculateBasketCost();
- deliveryDate(shippingMethod.value, shippingMethod.dataset.delivery, shippingMethod.dataset.pickuppoint);
+ calculateDeliveryDate(shippingMethod.value, shippingMethod.dataset.delivery, shippingMethod.dataset.pickuppoint);
app_shop.vars.checkedShipping = shippingMethod.value;
}
-document.getElementById("cop_seection2").addEventListener("click", e => {
+document.getElementById("bm-oscop-section2").addEventListener("click", e => {
// Kliknięcie na dostawe
if(e.target.name === "shipping"){
// Wyczyszczenie wszystkich zaznaczonych punktów odbioru
@@ -1183,7 +1189,7 @@ function removePrevClone(){
const prevClone = document.querySelector(".osc_item-clone");
if(!prevClone) return;
const cloneGroupName = prevClone.querySelector("input").dataset.group;
- document.getElementById(`payitem_${cloneGroupName}`).closest(".osc_item").style.display="flex";
+ document.getElementById(`payitem_${cloneGroupName}`).closest(".osc_item").style.display="grid";
prevClone.remove();
}
@@ -1244,7 +1250,7 @@ function changeDeliveryOptions(){
if(document.getElementById("payitem_cash") && document.getElementById("payitem_cash").checked) changePrepaidDvp("none", "block");
else changePrepaidDvp("block", "none");
- document.querySelectorAll("#checkout_step2_1 input").forEach((el) => el.checked = false);
+ document.querySelectorAll("#bm-oscop-deliveries input").forEach((el) => el.checked = false);
app_shop.vars.checkedShipping = "";
calculateBasketCost();
}
@@ -1319,10 +1325,11 @@ function calculateBasketCost() {
const deliveryCostEl = document.querySelector("#order2_shipping_value .operation_value");
const productsPointsEl = document.querySelector("#order2_products_points .operation_value");
const summaryPointsEl = document.getElementById("summary-points");
+ const attatchedSummaryPointsEl = document.getElementById("attatched-points");
// Przygotowanie informacji o metodzie dostawy i platnosci
const orderInfo = {
- delivery: document.querySelector('.ajax_cop input[name="shipping"]:checked') ? document.querySelector('.ajax_cop input[name="shipping"]:checked').value : "0-1",
- payform_id: document.querySelector('.ajax_cop input[name="payform_id"]:checked') ? document.querySelector('.ajax_cop input[name="payform_id"]:checked').value : "cash"
+ delivery: document.querySelector('.bm-oscop__container input[name="shipping"]:checked') ? document.querySelector('.bm-oscop__container input[name="shipping"]:checked').value : "0-1",
+ payform_id: document.querySelector('.bm-oscop__container input[name="payform_id"]:checked') ? document.querySelector('.bm-oscop__container input[name="payform_id"]:checked').value : "cash"
}
xhrs && 4 != xhrs.readyState && 0 != xhrs.readyState && xhrs.abort(),
xhrs = $.ajax({
@@ -1358,13 +1365,17 @@ const summaryPointsEl = document.getElementById("summary-points");
productsPointsEl.parentElement.style.display = "flex";
summaryPointsEl.innerHTML = `+ ${t.products_worth_at_points} ${
}.`;
summaryPointsEl.style.display = "block";
+ attatchedSummaryPointsEl.innerHTML = `+ ${t.products_worth_at_points} ${
}.`;
+ attatchedSummaryPointsEl.style.display = "block";
}else {
productsPointsEl.parentElement.style.display = "none";
summaryPointsEl.style.display = "none";
+ attatchedSummaryPointsEl.style.display = "none";
}
// Cena całkowita
document.getElementById("summary-cost").innerHTML = formatPrice(t.total_to_pay, t.currency_sign) + "
" + ";
+ document.getElementById("attatched-cost").innerHTML = formatPrice(t.total_to_pay, t.currency_sign);
},
});
};
@@ -1382,25 +1393,48 @@ function formatPrice(price, currencySign) {
};
// Funkcja od ustalenia daty dostawy
-function deliveryDate(deliveryVal, delivery, pickuppoint) {
+function calculateDeliveryDate(deliveryVal, delivery, pickuppoint) {
const deliveryMessageEl = document.querySelector("#order2_shiptime span:not(.operation_value)");
+ const attatchedMessageEl = document.querySelector("#attatched-shiptime span:not(.operation_value)");
const deliveryDateEl = document.querySelector("#order2_shiptime .operation_value");
+ const attatchedDateEl = document.querySelector("#attatched-shiptime .operation_value");
const date = delivery.split("#");
// Wybranie nazwy zaleznie czy dostawa jest do twojego mieszkania czy nie
- if(deliveryVal === "0-0" || deliveryVal === "0-1" || pickuppoint === "y") deliveryMessageEl.innerHTML = `${
}:`;
- else deliveryMessageEl.innerHTML = `${
}:`;
+ if(deliveryVal === "0-0" || deliveryVal === "0-1" || pickuppoint === "y"){
+ deliveryMessageEl.innerHTML = `${
}:`;
+ attatchedMessageEl.innerHTML = `${
}:`;
+ }
+ else{
+ deliveryMessageEl.innerHTML = `${
}:`;
+ attatchedMessageEl.innerHTML = `${
}:`;
+ }
- if(date[4]>0) deliveryDateEl.innerHTML = `${
} ` + parseInt(date[5]) + ` ${
} `;
+ if(date[4]>0) {
+ deliveryDateEl.innerHTML = `${
} ` + parseInt(date[5]) + ` ${
} `;
+ attatchedDateEl.innerHTML = `${
} ` + parseInt(date[5]) + ` ${
} `;
+ }
else{
- if(parseInt(date[5]) === 0) deliveryDateEl.innerHTML =
;
- else deliveryDateEl.innerHTML = orderTxt[`shipping${parseInt(date[3])}`];
+ if(parseInt(date[5]) === 0){
+ deliveryDateEl.innerHTML =
;
+ attatchedDateEl.innerHTML =
;
+ }
+ else{
+ deliveryDateEl.innerHTML = orderTxt[`shipping${parseInt(date[3])}`];
+ attatchedDateEl.innerHTML = orderTxt[`shipping${parseInt(date[3])}`];
+ }
}
};
+// Zmiana informacji o dostawie
+function changeDeliveryInfoObject(deliveryObject, deliveryElement){
+ deliveryObject.deliveryVal = deliveryElement.value;
+ deliveryObject.delivery = deliveryElement.dataset.delivery;
+ deliveryObject.pickuppoint = deliveryElement.dataset.pickuppoint;
+}
// Obsługa klilnięć na elementy w podsumowaniu
-document.getElementById("cop_seection3").addEventListener("click", (e) => {
-const productsContainer = document.getElementById("checkout_step3_3");
+document.getElementById("bm-oscop-section3").addEventListener("click", (e) => {
+ const productsContainer = document.querySelector(".summary__container");
// Kliknięcie na przyciski "Pokaż pozozostałe produkty" i "Zwiń listę"
const togggleProducts = e.target.closest(".order_products_action");
@@ -1412,40 +1446,98 @@ const productsContainer = document.getElementById("checkout_step3_3");
productsContainer.classList.add("--more");
togggleProducts.querySelector("span").innerHTML = `${
}`;
}
+ checkIfShowAttatched();
+ return;
}
// Kliknięcie na checkbox(nie zaznacz wszystkie i nie kod rabatowy)
- if(e.target.type === "checkbox" && e.target.id !== "checkall-terms" && e.target.id !== "rebate_option"){
+ if(e.target.type === "checkbox" && e.target.id !== "checkall-terms" && e.target.id !== "rebate-option"){
+ document.querySelector(".bm-oscop__attatched-checkbox").classList.remove("--error");
+
const checkboxAllTerms = document.getElementById("checkall-terms");
- if(e.target.checked === false) checkboxAllTerms.checked = false;
+ const attatchedcheckboxAllTerms = document.getElementById("attatched-checkall-terms");
+ if(e.target.checked === false) {
+ checkboxAllTerms.checked = false;
+ attatchedcheckboxAllTerms.checked = false;
+ // usuniecie bledu jesli jest na przyczepionym przycisku zakupowym
+ document.querySelector(".bm-oscop__attatched-checkbox").classList.remove("--error");
+ }
else{
const termsInputs = document.querySelectorAll(".order2_terms_wrapper input:not(#checkall-terms)");
let checkedCount = 0;
termsInputs.forEach(el => el.checked === true ? checkedCount++ : "");
- if(checkedCount === termsInputs.length) checkboxAllTerms.checked = true;
+ if(checkedCount === termsInputs.length) {
+ checkboxAllTerms.checked = true;
+ attatchedcheckboxAllTerms.checked = true;
}
+ }
+ return;
}
// Kliknięcie na przycisk "Zaznacz wszystkie"
- if(e.target.id === "checkall-terms"){
- const termsInputs = document.querySelectorAll(".order2_terms_wrapper input:not(#checkall-terms)");
- let checkAll = false;
-
- termsInputs.forEach(el => el.checked === false ? checkAll = true : "");
- termsInputs.forEach(function (el) {
- if(checkAll) el.checked = true;
- else el.checked = false;
- });
- return;
- }
+ if(e.target.id === "checkall-terms") return toggleAllTerms();
// Usuń error na regulaminie
if(e.target.id === "order2_terms_conditions" || e.target.id === "order2_cancel"){
e.target.parentElement.querySelector("span").classList.remove("text-danger");
e.target.parentElement.querySelector("a").classList.remove("text-danger");
}
-})
+});
+function toggleAllTerms(){
+removeErrorOnTerms();
+ const termsInputs = document.querySelectorAll(".order2_terms_wrapper input:not(#checkall-terms)");
+ let checkAll = false;
+
+ termsInputs.forEach(el => el.checked === false ? checkAll = true : "");
+ termsInputs.forEach(function (el) {
+ el.checked = checkAll;
+ });
+
+ document.getElementById("checkall-terms").checked = checkAll;
+ document.getElementById("attatched-checkall-terms").checked = checkAll;
+}
+
+function removeErrorOnTerms(){
+ document.querySelector(".bm-oscop__attatched-checkbox").classList.remove("--error");
+ document.querySelector(".order2_terms_conditions span").classList.remove("text-danger");
+ document.querySelector(".order2_terms_conditions a").classList.remove("text-danger");
+ document.querySelector(".order2_cancel span").classList.remove("text-danger");
+ document.querySelector(".order2_cancel a").classList.remove("text-danger");
+}
+
+// PRZYCISK ZAKUPU PRZYTWIERDZONY NA DÓŁ STRONY
+function checkIfShowAttatched(){
+ const attatchedEl = document.querySelector("#attatched-summary .bm-oscop__attatched-container");
+ const summaryCheckAllPos = document.getElementById("checkall-terms").getBoundingClientRect();
+ // Sprawdzenie czy pokazać przytwierdzony przycisk do zakupu
+
+ if(summaryCheckAllPos.top >= window.innerHeight - attatchedEl.offsetHeight){
+ attatchedEl.style.opacity = "1";
+ attatchedEl.closest("#attatched-summary").style.zIndex = "30";
+ }
+ else{
+ attatchedEl.style.opacity = "0";
+ attatchedEl.closest("#attatched-summary").style.zIndex = "-1";
+ }
+
+ // Sprawdzenie czy pokazywać cenę
+ const summaryEl = document.querySelector(".order2_summary");
+
+ // Przeliczana wysokość elementu przytwierdzonego przycisku zakupu na wypadek gdyby cena miała display: none
+ const attatchedElHeight = attatchedEl.querySelector(".bm-oscop__attatched-price").style.display === "none" ? (summaryEl.offsetHeight + attatchedEl.offsetHeight) : attatchedEl.offsetHeight
+
+ if(summaryEl.getBoundingClientRect().top >= window.innerHeight - attatchedElHeight){
+ attatchedEl.querySelector(".bm-oscop__attatched-price").style.display = "block";
+ }else{
+ attatchedEl.querySelector(".bm-oscop__attatched-price").style.display = "none";
+ }
+}
+
+window.addEventListener("scroll", e=>{
+ checkIfShowAttatched()
+});
+document.getElementById("attatched-checkall-terms").addEventListener("click", toggleAllTerms);
////////////////////////////////////////////////////////////////////////////////
// KOD RABATOWY (funkcje)
@@ -1475,7 +1567,7 @@ const DEACTIVATE_REBATE_CODE = () => JSON.stringify({
})
// Aktywacja kodu rabatowego
-const rebateCode = document.getElementById("rebate_code");
+const rebateCode = document.getElementById("rebate-code");
async function updateCode(){
if(rebateCode.value.trim() === ""){
addError(rebateCode);
@@ -1546,7 +1638,7 @@ const activeCodeEl = document.getElementById("active-code");
// Zmień wartości
activeCodeEl.innerHTML = show ? rebateCode.value : "";
showInput = error ? true : false;
- document.getElementById("rebate_option").checked = error ? true : false;
+ document.getElementById("rebate-option").checked = error ? true : false;
if(!error) rebateCode.value = "";
else activeCodeEl.innerHTML = "";
}
@@ -1555,7 +1647,7 @@ const activeCodeEl = document.getElementById("active-code");
let showInput = false;
document.querySelector(".rebate").addEventListener("click", (e) => {
// Rozwinięcie opcji rabatowej
- if(e.target.id === "rebate_option" || e.target.classList.contains("rebate__active_change")){
+ if(e.target.id === "rebate-option" || e.target.classList.contains("rebate__active-change")){
showInput = !showInput;
if(showInput) rebateCodeContainer.classList.add("--fade-in");
else rebateCodeContainer.classList.remove("--fade-in");
@@ -1563,7 +1655,7 @@ document.querySelector(".rebate").addEventListener("click", (e) => {
// Kliknięcie na zrealizuj i dezaktywuj
if(e.target.className.includes("rebate__code-realize")) updateCode();
- if(e.target.classList.contains("rebate__active_remove")) removeCode();
+ if(e.target.classList.contains("rebate__active-remove")) removeCode();
});
@@ -1617,19 +1709,23 @@ async function validateFormInputs(query){
}
// Obsługa złożenia zamówienia
-document.querySelector(".order2_button_order").addEventListener("click", async () => {
+document.querySelectorAll(".order2_button_order").forEach(btnEl=>{
+ btnEl.addEventListener("click", handleBuyOnClick);
+})
+
+async function handleBuyOnClick(){
const termsConditionsInput = document.getElementById("order2_terms_conditions");
const cancelConditionsInput = document.getElementById("order2_cancel");
try {
app_shop.fn.ajaxLoadSite(1);
app_shop.vars.validation = 1;
// Sprawdzenie pól formularza
- const x = await validateAllInputs();
- if(x === false) app_shop.vars.validation = 0;
+ const allInputsCorrectlyValidated = await validateAllInputs();
+ if(allInputsCorrectlyValidated === false) app_shop.vars.validation = 0;
// Znalezienie obecnie zaznaczonej metody dostawy i płatności
- const deliveryMethod = document.querySelector(".ajax_cop [name=shipping]:checked");
- const paymentMethod = document.querySelector(".ajax_cop [name=payform_id]:checked");
+ const deliveryMethod = document.querySelector(".bm-oscop__container [name=shipping]:checked");
+ const paymentMethod = document.querySelector(".bm-oscop__container [name=payform_id]:checked");
// Sprawdzenie czy użytkownik zaakceptował regulamin
if(!termsConditionsInput.checked || !cancelConditionsInput.checked){
@@ -1665,25 +1761,29 @@ const cancelConditionsInput = document.getElementById("order2_cancel");
let alertMessage = "";
// Element sprawdzający czy regulamin jest zaznaczony
- let termsAndConditions = termsConditionsInput.checked && cancelConditionsInput.checked;
- if(!termsAndConditions) alertMessage += `${
} ${
}!
`;
+ const termsAndConditions = termsConditionsInput.checked && cancelConditionsInput.checked;
+ if(!termsAndConditions){
+ document.querySelector(".bm-oscop__attatched-checkbox").classList.add("--error");
+ alertMessage += `${
} ${
}!
`;
+ }
+ // Sprawdź metodę płatności i dostawy(scrollowanie do formularza ważniejsze)
+ if(!document.querySelector(`input[name="shipping"]:checked`)){
+ scrolledToElement = errorEl || document.querySelector("#bm-oscop-deliveries h2");
+ alertMessage += `${
}
`;
+ }
+ if(!document.querySelector(`input[name="payform_id"]:checked`)){
+ scrolledToElement = errorEl || document.querySelector("#bm-oscop-payments h2");
+ alertMessage += `${
}
`;
+ }
// Błąd w formularzu
if(errorEl){
scrolledToElement = errorEl;
- alertMessage += `${
}
`;
- }// Sprawdź metodę płatności i dostawy(scrollowanie do formularza ważniejsze)
- if(!document.querySelector(`input[name="payform_id"]:checked`)){
- scrolledToElement = errorEl || document.querySelector("#checkout_step3_1 h2");
- alertMessage += `${
}
`;
- }
- if(!document.querySelector(`input[name="shipping"]:checked`)){
- scrolledToElement = errorEl || document.querySelector("#checkout_step2_1 h2");
- alertMessage += `${
}`;
-
+ alertMessage += `${
}`;
}
// Jeśli użytkownik zatwierdził regulamin, przescrolluj do elementu z błędem
- if(termsAndConditions) scrollToHeight(scrolledToElement);
+ if(scrolledToElement) scrollToHeight(scrolledToElement);
+
// Pokaż error i przerwij składanie zamówienia
Alertek.show_alert(alertMessage);
@@ -1702,13 +1802,15 @@ const cancelConditionsInput = document.getElementById("order2_cancel");
console.log(e);
alert("blad");
}
-});
+}
+
// Przescrolluj do
function scrollToHeight(scrollToEl){
let yOffset = -45;
if(app_shop.vars.view === 1) yOffset = -100;
if(app_shop.vars.view === 2) yOffset = -75;
const y = scrollToEl.getBoundingClientRect().top + window.pageYOffset + yOffset;
+
window.scrollTo({top: y, behavior: 'smooth'});
}
@@ -1724,7 +1826,7 @@ function createOrder(deliveryMethod, paymentMethod){
// Weź dane klienta
const email = document.getElementById("client_email").value;
const phone = document.getElementById("client_phone").value;
- const clientType = document.querySelector('.ajax_cop [name="client_type"]:checked').value;
+ const clientType = document.querySelector('.bm-oscop__container [name="client_type"]:checked').value;
const firmname = clientType === "firm" ? document.getElementById("client_firm").value : "";
const nip = clientType === "firm" ? document.getElementById("client_nip").value : "";
let firstname = document.getElementById("client_firstname").value;
@@ -1757,7 +1859,7 @@ function createOrder(deliveryMethod, paymentMethod){
else rebateCode = "";
let voucherCode;
- if(document.querySelector(".ajax_cop #payitem_2") && document.querySelector(".ajax_cop #payitem_2").checked) voucherCode = document.querySelector(".ajax_cop #order_voucher_id").value;
+ if(document.querySelector(".bm-oscop__container #payitem_2") && document.querySelector(".bm-oscop__container #payitem_2").checked) voucherCode = document.querySelector(".bm-oscop__container #order_voucher_id").value;
// Jeśli zalogowany użytkownik jest firmą i nie ma imienia i nazwiska
if (clientType.disabled && clientType.value === "firm") {
@@ -1770,8 +1872,8 @@ function createOrder(deliveryMethod, paymentMethod){
lastname = lastname.replace(/[&\/\\#,+()$~%.'":*?<>{}!@~`^_]/g, "");
// Dodatkowe informacje (uwagi, faktura, punkt odbioru)
- const shopRemarks = document.getElementById("shop_remarks").checked ? document.querySelector(".ajax_cop [name=remarks]").value : "";
- const deliveryRemarks = document.getElementById("courier_remarks").checked ? document.querySelector(".ajax_cop [name=deliverer_remarks]").value : "";
+ const shopRemarks = document.getElementById("shop_remarks").checked ? document.querySelector(".bm-oscop__container [name=remarks]").value : "";
+ const deliveryRemarks = document.getElementById("courier_remarks").checked ? document.querySelector(".bm-oscop__container [name=deliverer_remarks]").value : "";
const invoiceOption = document.querySelector("input[name=invoice]:checked").value;
const pickuppoint = document.querySelector("#osc_order1 input:checked").dataset.pickuppoint === "y" ? document.querySelector("#osc_order1 input:checked").parentElement.querySelector("label [name=pickup_point]").value : "";
@@ -1847,7 +1949,7 @@ function createOrder(deliveryMethod, paymentMethod){
}
function checkNewsletter(logged, regular){
- if(document.querySelector(`.ajax_cop [name=${logged}]`)) return document.querySelector(`.ajax_cop [name=${logged}]`).value ? 1 : 0;
+ if(document.querySelector(`.bm-oscop__container [name=${logged}]`)) return document.querySelector(`.bm-oscop__container [name=${logged}]`).value ? 1 : 0;
else if(document.querySelector(regular)) return document.querySelector(regular).checked ? 1 : 0;
else return 0;
}
@@ -2015,13 +2117,13 @@ function enablePageScroll(){
app_shop.fn.load = function(_url,target,callback,paramets) {
if(app_shop.vars.xhr && app_shop.vars.xhr.readystate != 4) app_shop.vars.xhr.abort();
$(target).addClass('load-content');
- for(var i=0; target.length > i ; i++) $(target[i][0]).addClass('load-content');
+ for(let i=0; target.length > i ; i++) $(target[i][0]).addClass('load-content');
app_shop.vars.xhr = $.ajax({
url: _url+paramets,
timeout: 16000,
success: function(data,textStatus) {
- for(var i=0; target.length > i ; i++) $(target[i][0]).removeClass('load-content').html($(data).find(target[i][1]).html());
+ for(let i=0; target.length > i ; i++) $(target[i][0]).removeClass('load-content').html($(data).find(target[i][1]).html());
app_shop.fn.change_url(_url);
app_shop.fn.evalJSFromHtml(data);
if(callback) callback();
@@ -2036,12 +2138,7 @@ function throwAjaxError(e) {
-1 !== $.inArray(e, ["nocontent", "error", "timeout", "abort", "parsererror"]) && (console.log("Error:" + e), Alertek.show_alert( "Błąd podczas logowania, proszę spróbować ponownie" + " (" + e + ": " + $.now() + ")"), $.cookie("off_opc", !0));
};
async function fetchData(options = {}) {
- const {
- data,
- link,
- linkParameter = '',
- alert = true
- } = options;
+ const {data,link,linkParameter = '',alert = true} = options;
if (!data) return false;
try {
const response = await fetch(`${link || app_shop.urls.graphql || '/graphql/v1/'}${linkParameter}`, {
@@ -2074,7 +2171,7 @@ function initOSCOP(){
// Element z numerem edycji jeśli jest
const editNumber = document.getElementById("edit-number");
-if(document.querySelector(".ajax_cop").childElementCount && !editNumber) changeRegion(null);
+ if(document.querySelector(".bm-oscop__container").childElementCount && !editNumber) changeRegion(null);
// Jeśli edycja zamówienia uzupełnij dane (niewiadomo jak z voucherem bo go się nie da edytować)
if(editNumber){
@@ -2158,7 +2255,6 @@ if(editNumber){
// Pobranie danych o edytowanym zamówieniu
async function getEditData(){
-
const data = await fetchData({
data: ORDER_DETAILS(`OrderDetailsInput: {
orderNumber: ${editNumber.value},
@@ -2194,7 +2290,7 @@ if(editNumber){
if(differentDelivery){
// Pokazanie formularza dodatkowej dostawy
document.getElementById("deliver_to_billingaddr").checked = true;
- document.querySelector(".ajax_cop #client_new_additional .delivery_box.cn_wrapper").classList.add("--more");
+ document.querySelector(".bm-oscop__container #client_new_additional .delivery_box.cn_wrapper").classList.add("--more");
document.querySelector(".delivery__address-list-button").classList.add("--fade-in");
fillInput(document.getElementById("delivery_firstname"), orderDetails.client.deliveryData.firstname);
@@ -2234,5 +2330,8 @@ if(editNumber){
input.parentElement.classList.add("--success", "has-success");
}
}
+
+ // Sprawdzenie czy schować przyczepiony przycisk od zakupu
+ checkIfShowAttatched()
}
initOSCOP();
\ No newline at end of file
diff --git a/script.js b/script.js
index ee716c0..1241c08 100644
--- a/script.js
+++ b/script.js
@@ -12,4 +12,7 @@ if(window.location.pathname.includes("return.html") && window.location.search.in
}
// Przekierowanie ze strony order1 na OSCOP
-if(window.location.pathname.includes("order1.html") || window.location.pathname.includes("order1.php")) window.location = "/place-order.php";
\ No newline at end of file
+if(window.location.pathname.includes("order1.html") || window.location.pathname.includes("order1.php")){
+ app_shop.fn.ajaxLoadSite(1);// W starszych szablonach nie działa i trzeba zakomentować
+ window.location = "/place-order.php";
+}
\ No newline at end of file
diff --git a/style.css b/style.css
index e513c78..44770e2 100644
--- a/style.css
+++ b/style.css
@@ -1,3 +1,7 @@
+.order_process:not(.--place-order-page) #ajaxLoadSite_cover{
+ opacity: 1!important;
+}
+// Zmiana wylacznie na stronie
.--place-order-page{
#modal_placeholder{
display: none;
@@ -12,41 +16,6 @@
label:has(input:disabled){
cursor: default;
}
- // Strzalki po prawej
- .--arrow-input{
- display: none;
- }
- .--arrow-label{
- position: relative;
- width: 100%;
- }
- .--arrow-label, .rebate__active{
- padding: 0.9rem 1rem 0 1.9rem;
- }
- .--arrow-label::after{
- content: "\F107";
- font-family: FontAwesome;
- transition: all 0.25s;
- position: absolute;
- right: 1.2rem;
- }
- .--arrow-input:checked + .--arrow-label::after{
- transform: rotate(180deg);
- }
- // Przycisk
- .bm-oscop__btn{
- border: none;
- background-color: @less_iaicolorscheme_button_large_color!important;
- color: @less_iaicolorscheme_background_color!important;
- border-radius: 8px;
- text-decoration: none!important;
- cursor: pointer;
- transition: all 0.25s;
- text-align: center;
- }
- .bm-oscop__btn:hover{
- background-color: @less_iaicolorscheme_background_text_color!important;
- }
// Error
.has-feedback.--error .form-control{
border-color: @less_iaicolorscheme_danger_color;
@@ -54,29 +23,22 @@
.has-feedback.--error.has-error .f-label{
color: @less_iaicolorscheme_danger_color;
}
- // Zmiana fontsize na 16px na desktop
- .order__voucher_headlines strong, .order__voucher_button, #signin-form-ajax .signin_button, .delivery__address-list-firstname, .delivery__address-list-lastname, .osc_item-modal h2, .propose_title, #e-invoice_dialog .btn, #checkout_step2_2 h3, #summary-points, #fbs_z02_wrapper .big_label, .propose_main .button_password_recover, .rebate__title{
- font-size: 1.6rem!important;
+ //////////////////////////////////////////////////////////////////
+ // MODAL
+ .modal__wrapper{
+ max-height: 80vh!important;
+ padding: 2rem 3rem!important;
}
- // Zmiana fontsize na 14px na desktop
- .rebate_option label, .order2_terms_checkall, .register_client_checkbox, .firm-form, #delivery_box_switcher label, #FBS_faktura, #checkout_step3_1 .name, .client_type-text, .headerText{
- font-size: 1.4rem!important;
+ .modal__wrapper:has(.delivery__address-list-container), .modal__wrapper:has(.osc_item-modal){
+ max-width: 580px!important;
}
- // Zmiana fontsize na 13px na desktop
- .cop_product_wrap, .order_pay_wrapper, .order2_shiptime, .signin_header, .delivery_date, #checkout_step2_2 .step3_sub.cop_box_sub span, .delivery__address-list-street, .delivery__address-list-city, .delivery__address-list-zipcode, .delivery__address-list-phone, .delivery__address-country_name, .propose_text, .propose_json_mail, .control-label, .register__hide-password::before, .f-label, #locationField .btn, .rebate__active-options button{
- font-size: 1.3rem!important;
+ .modal__wrapper:has(#signin-form), .modal__wrapper:has(#e-invoice_dialog), .modal__wrapper:has(.order__voucher_container){
+ max-width: 500px!important;
}
- // Zmiana fontsize na 12px na desktop
- .comment, .delivery_date, #checkout_step2_1 .name, a.go__shopping, .order_products_action span, .needed-text, #fbs_z02_close::before, .pickup_point_sub div, .mapTooltipAdress, #cop_seection2 #checkout_step2_2 h3 span, .osc_item-modal span, #e-invoice_dialog p, .e-invoice_dialog, .cn_propose_desc, #mail_propose_signin, #mail_propose_close, .order__voucher_info{
- font-size: 1.2rem!important;
- }
- // Zmiana grubości czcionki na 700
- #delivery_box_switcher label, #FBS_faktura > span, .client_type-text, #signin-form-ajax .signin_button, .delivery__address-list-firstname, .delivery__address-list-lastname, .propose_title, .button_password_recover, .client_type-text, .voucher-value, #active-code, .order2_terms_checkall, .order2_button_order, #fbs_z02_close, #locationField .btn, .btn.map_dir,.fbs02_btn, .register__option label, #e-invoice_dialog font, #e-invoice_dialog .btn, .rebate label, .--points{
- font-weight: 700;
- }
- // Zmiana margin bottom na 0
- #signin-form-ajax .f-group, .propose_main div:has(#mail_propose_close), #e-invoice_dialog .big_label, #cop_seection1 .form-group:last-child, .register__form, .register__item:last-of-type, #client_contact_info{
- margin-bottom: 0!important;
+ #content {
+ #signin-form, .delivery__address-list-container{
+ display: none;
+ }
}
// Transition
.--hide{
@@ -115,134 +77,8 @@
display: flex!important;
animation: fade-in .2s;
}
- //////////////////////////////////////////////////////////////////
- // MODAL
- .modal__wrapper{
- max-height: 80vh!important;
- padding: 2rem 3rem!important;
- }
- .modal__wrapper:has(.delivery__address-list-container), .modal__wrapper:has(.osc_item-modal){
- max-width: 580px!important;
- }
- .modal__wrapper:has(#signin-form-ajax), .modal__wrapper:has(#e-invoice_dialog), .modal__wrapper:has(.order__voucher_container){
- max-width: 500px!important;
- }
- #content {
- #signin-form-ajax, .delivery__address-list-container{
- display: none;
- }
- }
- // Modal vouchera
- .order__voucher_container {
- .order__voucher_headlines{
- display: flex;
- flex-direction: column;
- gap: 0.5rem;
- margin-bottom: 1.5rem;
- }
- .order__voucher_group {
- margin-bottom: 2rem!important;
- }
- .order__voucher_button{
- width: 100%;
- padding: 1.4rem 0;
- margin-bottom: 1.2rem!important;
- }
- .order__voucher_status{
- top: -5px!important;
- }
- }
- // Modal logowania
- #signin-form-ajax .signin_button{
- width: 100%;
- margin-bottom: 1rem;
- padding: 1.4rem 0;
- }
- // Modal listy adresów
- .delivery__address-list-container{
- h2{
- padding-left: 1rem;
- font-size: 1.8rem;
- }
- > span{
- padding-left: 1rem ;
- }
- .delivery__address-list{
- margin-top: 2rem;
- list-style: none;
- display: grid;
- grid-template-columns: 1fr 1fr;
- gap: 2rem;
- li{
- padding: 1.5rem 2rem;
- cursor: pointer;
- border-radius: 10px;
- border: 1px solid #ccc;
- transition: all 0.25s;
- .delivery__address-list-firstname{
- margin-right: 0.5rem;
- }
- .delivery__address-list-additional{
- display: block;
- }
- .delivery__address-list-street, .delivery__address-list-city, .delivery__address-list-zipcode, .delivery__address-list-phone, .delivery__address-country_name{
- color: #999;
- }
- .delivery__address-list-street{
- display: block;
- }
- .delivery__address-list-city{
- margin-right: 1rem;
- }
- .delivery__address-list-phone{
- display: block;
- }
- }
- li:hover{
- border: 1px solid #555;
- }
- .--active-address{
- box-shadow: 0 0 0 1px @less_iaicolorscheme_background_active_color;
- border: 1px solid @less_iaicolorscheme_background_active_color;
- .delivery__address-list-firstname, .delivery__address-list-lastname{
- color: @less_iaicolorscheme_background_active_color;
- }
- }
- }
- }
- // MODAL BANKU I KARTY
- .osc_item-modal .payments-container{
- margin-top: 2rem;
- display: grid;
- grid-template-columns: repeat(3,1fr);
- gap: 2rem;
- .osc_item:has(input[type="radio"]:checked){
- border: 1px solid @less_iaicolorscheme_background_active_color;
- box-shadow: 0 0 0 1px @less_iaicolorscheme_background_active_color;
- }
- .osc_item{
- cursor: pointer;
- border-radius: 8px;
- padding: 2.5rem;
- border: 1px solid #D8D8D8;
- height: 182px;
- input{
- display: none;
- }
- .name{
- text-align: center;
- }
- .photo{
- display: flex;
- justify-content: center;
- padding-bottom: 1.5rem;
- }
- .comment{
- display: none;
- }
- }
- }
- // MODAL POWTORKI EMAILA
+
+ // MODAL POWTORKI EMAILA
.propose_main{
padding: 0 1rem;
.propose_title{
@@ -282,6 +118,7 @@
padding: 1.4rem 4rem;
}
}
+
//////////////////////////////////////////////////////////////////////
// Inputy
input[type="text"], input[type="email"], input[type="password"], input[type="tel"], select{
@@ -338,17 +175,259 @@
color: #000;
content: "*";
}
+
+ // Zmiana fontsize na 16px na desktop
+ #e-invoice_dialog .btn{
+ font-size: 1.6rem!important;
+ }
+ // Zmiana fontsize na 14px na desktop
+ #FBS_faktura, .headerText{
+ font-size: 1.4rem!important;
+ }
+ // Zmiana fontsize na 13px na desktop
+ .propose_json_mail, .control-label, .f-label{
+ font-size: 1.3rem!important;
+ }
+ // Zmiana fontsize na 12px na desktop
+ .comment, .mapTooltipAdress, #e-invoice_dialog p, .e-invoice_dialog, .cn_propose_desc{
+ font-size: 1.2rem!important;
+ }
+ // Zmiana grubości czcionki na 700
+ #FBS_faktura > span, .button_password_recover, #e-invoice_dialog font, #e-invoice_dialog .btn, .--points{
+ font-weight: 700;
+ }
+ // Zmiana margin bottom na 0
+ #e-invoice_dialog .big_label{
+ margin-bottom: 0!important;
+ }
+
+ @media(max-width: 978px){
+ .form-control-feedback{
+ right: 15px!important;
+ }
+ .zipcode_wrapper{
+ padding-right: 0!important;
+ }
+ }
+ @media(max-width: 757px){
+ .form-control-feedback{
+ line-height: 51px;
+ }
+ .--hide{
+ margin-bottom: 0!important;
+ }
+ input[type="text"], input[type="email"], input[type="password"], input[type="tel"], select{
+ height: 45px!important;
+ }
+ .f-group{
+ .f-label{
+ top: 15px!important;
+ }
+ .f-control.focused + .f-label, .f-control:focus + .f-label{
+ transform: scale(0.95) translateY(-23px) !important;
+ }
+ }
+ .has-error .form-control-feedback, .has-success .form-control-feedback{
+ line-height: 44px;
+ }
+ // Modal elektroniczna faktura mobile
+ .modal__wrapper:has(#e-invoice_dialog){
+ padding: 2.4rem!important;
+ }
+ #e-invoice_dialog{
+ .big_label{
+ padding-bottom: 2.4rem;
+ }
+ .e-invoice_dialog{
+ margin-bottom: 1.2rem;
+ }
+ }
+ .--hide-map-el{
+ display: none!important;
+ }
+ }
+}
+
+
+ // Strzalki po prawej
+ .bm-oscop__arrow-input{
+ display: none;
+ }
+ .bm-oscop__arrow-label{
+ position: relative;
+ width: 100%;
+ }
+ .bm-oscop__arrow-label, .rebate__active{
+ padding: 0.9rem 1rem 0.9rem 1.9rem;
+ }
+ .bm-oscop__arrow-label::after{
+ content: "\F107";
+ font-family: FontAwesome;
+ transition: all 0.25s;
+ position: absolute;
+ right: 1.2rem;
+ }
+ .bm-oscop__arrow-input:checked + .bm-oscop__arrow-label::after{
+ transform: rotate(180deg);
+ }
+ // Przycisk
+ .bm-oscop__btn{
+ border: none;
+ background-color: @less_iaicolorscheme_button_large_color!important;
+ color: @less_iaicolorscheme_background_color!important;
+ border-radius: 8px;
+ text-decoration: none!important;
+ cursor: pointer;
+ transition: all 0.25s;
+ text-align: center;
+ }
+ .bm-oscop__btn:hover{
+ background-color: @less_iaicolorscheme_background_text_color!important;
+ }
+
+ // Zmiana fontsize na 16px na desktop
+ .order__voucher_headlines strong, .order__voucher_button, #signin-form .signin-form__button, .delivery__address-list-name, .osc_item-modal h2, .propose_title, #bm-oscop-remarks h3, #summary-points, #fbs_z02_wrapper .big_label, .propose_main .button_password_recover, .rebate__title{
+ font-size: 1.6rem!important;
+ }
+ // Zmiana fontsize na 14px na desktop
+ .order2_terms_checkall, .register_client_checkbox, .firm-form, #delivery_box_switcher label, #bm-oscop-payments .name, .client_type-text{
+ font-size: 1.4rem!important;
+ }
+ // Zmiana fontsize na 13px na desktop
+ .cop_product_wrap, .order_pay_wrapper, .order2_shiptime, .signin_header, .delivery_date, .remarks__container span, .delivery__address-list-street, .delivery__address-list-city, .delivery__address-list-zipcode, .delivery__address-list-phone, .delivery__address-country_name, .propose_text, .register__hide-password::before, #locationField .btn, .rebate__active-options button{
+ font-size: 1.3rem!important;
+ }
+ // Zmiana fontsize na 12px na desktop
+ .delivery_date, #bm-oscop-deliveries .name, .bm-oscop__go-shopping, .order_products_action span, .needed-text, #fbs_z02_close::before, .pickup_point_sub div, #bm-oscop-section2 #checkout_step2_2 h3 span, .osc_item-modal span, #mail_propose_signin, #mail_propose_close, .order__voucher_info{
+ font-size: 1.2rem!important;
+ }
+ // Zmiana grubości czcionki na 700
+ #delivery_box_switcher label, .client_type-text, #signin-form .signin-form__button, .delivery__address-list-name, .propose_title, .client_type-text, .voucher-value, #active-code, .order2_terms_checkall, .order2_button_order, #fbs_z02_close, #locationField .btn, .btn.map_dir, .fbs02_btn, .register__option label, .rebate label{
+ font-weight: 700;
+ }
+ // Zmiana margin bottom na 0
+ #signin-form .f-group, .propose_main div:has(#mail_propose_close), #bm-oscop-section1 .form-group:last-child, .register__form, .register__item:last-of-type, #client-contact-info{
+ margin-bottom: 0!important;
+ }
+
+ // Modal vouchera
+ .order__voucher_container {
+ .order__voucher_headlines{
+ display: flex;
+ flex-direction: column;
+ gap: 0.5rem;
+ margin-bottom: 1.5rem;
+ }
+ .order__voucher_group {
+ margin-bottom: 2rem!important;
+ }
+ .order__voucher_button{
+ width: 100%;
+ padding: 1.4rem 0;
+ margin-bottom: 1.2rem!important;
+ }
+ .order__voucher_status{
+ top: -5px!important;
+ }
+ }
+ // Modal logowania
+ #signin-form{
+ h2{
+ padding-bottom: 1.5rem;
+ }
+ .signin-form__container div{
+ margin-bottom: 1rem;
+ }
+ .signin-form__button{
+ width: 100%;
+ margin-bottom: 1rem;
+ padding: 1.4rem 0;
+ }
+ }
+ // Modal listy adresów
+ .delivery__address-list-container{
+ h2{
+ padding-left: 1rem;
+ font-size: 1.8rem;
+ }
+ > span{
+ padding-left: 1rem;
+ }
+ .delivery__address-list{
+ margin-top: 2rem;
+ list-style: none;
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ gap: 2rem;
+ li{
+ padding: 1.5rem 2rem;
+ cursor: pointer;
+ border-radius: 10px;
+ border: 1px solid #ccc;
+ transition: all 0.25s;
+ text-overflow: ellipsis;
+ overflow: hidden;
+ span{
+ overflow: hidden;
+ }
+ }
+ li:hover{
+ border: 1px solid #555;
+ }
+ }
+ .delivery__address-list-street, .delivery__address-list-location, .delivery__address-list-phone, .delivery__address-country_name{
+ color: #999;
+ }
+
+ .--active-address{
+ box-shadow: 0 0 0 1px @less_iaicolorscheme_background_active_color;
+ border: 1px solid @less_iaicolorscheme_background_active_color;
+ .delivery__address-list-name{
+ color: @less_iaicolorscheme_background_active_color;
+ }
+ }
+ }
+ // MODAL BANKU I KARTY
+ .osc_item-modal .payments-container{
+ margin-top: 2rem;
+ display: grid;
+ grid-template-columns: repeat(3,1fr);
+ gap: 2rem;
+ .osc_item:has(input[type="radio"]:checked){
+ border: 1px solid @less_iaicolorscheme_background_active_color;
+ box-shadow: 0 0 0 1px @less_iaicolorscheme_background_active_color;
+ }
+ .osc_item{
+ cursor: pointer;
+ border-radius: 8px;
+ padding: 2.5rem;
+ border: 1px solid #D8D8D8;
+ height: 182px;
+ input, .comment{
+ display: none;
+ }
+ .name{
+ text-align: center;
+ }
+ .photo{
+ display: flex;
+ justify-content: center;
+ padding-bottom: 1.5rem;
+ }
+ }
+ }
+
// Kontynuuj zakupy
- a.go__shopping{
+ .bm-oscop__go-shopping{
margin-bottom: 4rem;
display: inline-block;
}
- a.go__shopping::before {
+ .bm-oscop__go-shopping::before {
content: "\F104";
font-family: FontAwesome;
}
// Ułożenie strony
- .ajax_cop{
+ .bm-oscop__container{
display: grid!important;
grid-template-columns: 5fr 3.5fr;
margin: 0 auto;
@@ -363,23 +442,25 @@
font-weight: 800;
}
}
- .form_data{
+
+ .bm-oscop__form-data{
display: flex;
flex-direction: column;
gap: 2rem;
}
+
// Sekcja dane klienta
- #cop_seection1{
+ #client-contact-info.--logged{
+ padding-bottom: 3rem;
+ }
+ #bm-oscop-section1{
margin-bottom: 2rem;
- #client_contact_info.--logged{
- padding-bottom: 3rem;
- }
.has-feedback.f-feedback:not(.--success):not(.has-sucess):not(.--error):not(.has-error) span.form-control-feedback:after{
content: "*";
color: #333;
font-size: 1.5rem;
}
- .change_oscop_data{
+ .change_oscop_data, .firm-group{
display: none;
}
.change_oscop{
@@ -400,9 +481,6 @@
align-items: center;
height: 38px;
}
- .firm-group{
- display: none;
- }
.zipcode_wrapper .form-control-feedback {
right: 15px;
}
@@ -416,7 +494,7 @@
padding-right: 0!important;
}
.row {
- margin: 0 0px 0 -10px;
+ margin: 0 0 0 -10px;
}
// Kraj
.form-group.--region{
@@ -432,17 +510,15 @@
z-index: 2;
padding: 0 0.5rem;
}
+ select, div:has(select){
+ position: relative;
+ z-index: 1;
+ }
select{
background-color: rgba(255, 255, 255, 0);
-webkit-appearance: none;
-moz-appearance: none;
appearance: none;
- position: relative;
- z-index: 1;
- }
- div:has(select){
- z-index: 1;
- position: relative;
}
div:has(select)::after{
z-index: 0;
@@ -501,20 +577,15 @@
.register{
padding: 2rem 0 3rem 0;
margin-bottom: 1rem;
- .register__option{
+ .register__option, .register__option label{
display: flex;
align-items: center;
gap: 0.5rem;
- label{
- display: flex;
- gap: 0.5rem;
- align-items: center;
- span{
- font-size: 1rem;
- font-weight: 400!important;
- color: @less_iaicolorscheme_gray_color;
- }
- }
+ }
+ .register__option span{
+ font-size: 1rem;
+ font-weight: 400!important;
+ color: @less_iaicolorscheme_gray_color;
}
.register__form{
display: none;
@@ -526,7 +597,7 @@
width: 100%;
padding: 6px 20px 6px 20px;
}
- #toggle_password{
+ #toggle-password{
position: absolute;
right: 1.5rem;
cursor: pointer;
@@ -536,10 +607,10 @@
height: 36px;
background: #fff;
}
- #toggle_password:hover{
+ #toggle-password:hover{
color: @less_iaicolorscheme_background_active_color;
}
- #toggle_password::before{
+ #toggle-password::before{
font-family: FontAwesome;
font-size: 1rem;
margin-right: 0.5rem;
@@ -565,21 +636,21 @@
border: none!important;
background: @less_iaicolorscheme_background_color!important;
}
- #delivery_box_switcher{
- display: flex;
- justify-content: space-between;
- .control-label{
- padding-top: 1rem;
- grid-column: span 2;
- input{
- margin-right: 0.5rem;
- }
- }
- .delivery__address-list-button{
- padding: 1rem 3rem;
- display: none;
+ }
+ #delivery_box_switcher{
+ display: flex;
+ justify-content: space-between;
+ .control-label{
+ padding-top: 1rem;
+ grid-column: span 2;
+ input{
+ margin-right: 0.5rem;
}
}
+ .delivery__address-list-button{
+ padding: 1rem 3rem;
+ display: none;
+ }
}
.order2_terms_wrapper_sub label{
padding: 0.2rem 1.8rem;
@@ -595,7 +666,13 @@
}
}
// Sekcja dostawa i płatności
- #cop_seection2{
+ #bm-oscop-payments .osc_item{
+ grid-template-columns: 13px 70px 150px 1fr;
+ }
+ #bm-oscop-deliveries .osc_item{
+ grid-template-columns: 13px 70px 1fr auto;
+ }
+ #bm-oscop-section2{
.osc_item {
gap: 1.2rem;
margin-bottom: 2rem;
@@ -628,12 +705,6 @@
.osc_item:hover{
border: 1px solid #555;
}
- #checkout_step3_1 .osc_item{
- grid-template-columns: 13px 70px 150px 1fr;
- }
- #checkout_step2_1 .osc_item{
- grid-template-columns: 13px 70px 1fr auto;
- }
.osc_item:has(input[type="radio"]:checked){
border: 1px solid @less_iaicolorscheme_background_active_color;
box-shadow: 0 0 0 1px @less_iaicolorscheme_background_active_color;
@@ -657,53 +728,53 @@
gap: 2rem;
}
}
- #checkout_step2_2{
- .step3_sub.cop_box_sub{
- display: grid;
- grid-template-columns: 1fr 1fr;
- gap: 2rem;
- align-items: flex-start;
- div{
- display: flex;
- flex-direction: column;
- padding-bottom: 0.9rem;
- border-radius: 8px;
- border: 1px solid #ccc;
- textarea{
- transition: all 0.25s;
- height: 0;
- padding: 0;
- opacity: 0;
- margin: 0 1rem;
- }
- input[type="checkbox"]:checked ~ textarea{
- height: 38px;
- padding: 1rem;
- opacity: 1;
- margin: 1rem 1rem 0 1rem;
- }
+ .remarks__container{
+ display: grid;
+ grid-template-columns: 1fr 1fr;
+ gap: 2rem;
+ align-items: flex-start;
+ div{
+ display: flex;
+ flex-direction: column;
+ // padding-bottom: 0.9rem;
+ border-radius: 8px;
+ border: 1px solid #ccc;
+ textarea{
+ transition: all 0.25s;
+ height: 0;
+ padding: 0;
+ opacity: 0;
+ margin: 0 1rem;
+ }
+ input[type="checkbox"]:checked ~ textarea{
+ height: 38px;
+ padding: 1rem;
+ opacity: 1;
+ margin: 0 1rem 1rem 1rem;
}
- }
- h3{
- color: #000;
- margin-bottom: 2rem;
- margin-top: 4rem;
- }
- h3 i{
- color: @less_iaicolorscheme_background_active_color;
- margin-right: 1rem;
- }
- h3 span{
- margin-left: 1rem;
- font-weight: 400;
}
}
.osc_item-modal{
display: none;
}
}
+ #bm-oscop-remarks{
+ h3{
+ color: #000;
+ margin-bottom: 2rem;
+ margin-top: 4rem;
+ }
+ i{
+ color: @less_iaicolorscheme_background_active_color;
+ margin-right: 1rem;
+ }
+ span{
+ margin-left: 1rem;
+ font-weight: 400;
+ }
+ }
// Sekcja podsumowanie
- #cop_seection3{
+ #bm-oscop-section3{
position: sticky;
top: 10px;
align-self: flex-start;
@@ -716,86 +787,89 @@
.--more .--last-visible{
border-bottom: 1px solid #bbb!important;
}
- #checkout_step3_3{
- h2{
- border-bottom: 1px solid #000;
- }
- .cop_product_wrap{
- display: grid;
- grid-template-columns: 90px 1fr;
- align-items: center;
- gap: 1rem;
- border-bottom: 1px solid #bbb;
- padding: 1rem 0;
- &:first-of-type{
- border-bottom: 1px solid #bbb;
- }
- &.--last{
- border-bottom: 1px solid #000;
- }
- }
- .--last-visible, .--last-hidden{
- border-bottom: none;
- }
- .cop_product_wrap_r, .cop_icon{
- display: flex;
- align-items: center;
- }
- .cop_product_wrap_r {
- justify-content: space-between;
- gap: 1rem;
- }
- .cop_icon{
- justify-content: center;
- overflow: hidden;
- height: 90px;
- width: 90px;
- border-radius: 10px;
- background: #fff;
- }
- .cop_icon-img{
- transition: all 0.25s;
- }
- .cop_icon-img:hover{
- transform: scale(1.1);
- }
- .cop_price{
- min-width: 60px;
- text-align: right;
- }
- .order_products_action{
- text-align: center;
- cursor: pointer;
- position: relative;
- height: 18px;
- span{
- background-color: @less_iaicolorscheme_gray_lighter_color;
- padding: 0 1rem;
- transition: all 0.25s;
- position: relative;
- z-index: 2;
- }
- span:hover{
- font-weight: 600;
- font-size: 1.3rem!important;
- }
- }
- .order_products_action::before{
- content: "";
- height: 1px;
- width: 100%;
- background: #000;
- display: inline-block;
- position: absolute;
- left: 0;
- top: 50%;
- z-index: 1;
+ h2{
+ border-bottom: 1px solid #000;
+ }
+ .summary__products{
+ @media(min-width: 980px){
+ max-height: 443px;
+ overflow-y: auto;
+ .less_scrollbar();
}
}
- #checkout_step3_3.--more{
- .--hide{
- padding: 1rem 0!important;
+ .cop_product_wrap{
+ display: grid;
+ grid-template-columns: 90px 1fr;
+ align-items: center;
+ gap: 1rem;
+ border-bottom: 1px solid #bbb;
+ padding: 1rem 0;
+ &:first-of-type{
+ border-bottom: 1px solid #bbb;
}
+ &.--last{
+ border-bottom: 1px solid #000;
+ }
+ }
+ .--last-visible, .--last-hidden{
+ border-bottom: none;
+ }
+ .cop_product_wrap_r, .cop_icon{
+ display: flex;
+ align-items: center;
+ }
+ .cop_product_wrap_r {
+ justify-content: space-between;
+ gap: 1rem;
+ }
+ .cop_icon{
+ justify-content: center;
+ overflow: hidden;
+ height: 90px;
+ width: 90px;
+ border-radius: 10px;
+ background: #fff;
+ }
+ .cop_icon-img{
+ transition: all 0.25s;
+ }
+ .cop_icon-img:hover{
+ transform: scale(1.1);
+ }
+ .cop_price{
+ min-width: 60px;
+ text-align: right;
+ }
+ .order_products_action{
+ text-align: center;
+ cursor: pointer;
+ position: relative;
+ height: 18px;
+ span{
+ background-color: @less_iaicolorscheme_gray_lighter_color;
+ padding: 0 1rem;
+ transition: all 0.25s;
+ position: relative;
+ z-index: 2;
+ }
+ span:hover{
+ font-weight: 600;
+ font-size: 1.3rem!important;
+ }
+ }
+ .order_products_action::before{
+ content: "";
+ height: 1px;
+ width: 100%;
+ background: #000;
+ display: inline-block;
+ position: absolute;
+ left: 0;
+ top: 50%;
+ z-index: 1;
+ }
+ .--more .--hide{
+ padding: 1rem 0!important;
}
.order_pay_wrapper, .order2_summary{
border-bottom: 1px solid #000;
@@ -804,16 +878,9 @@
gap: 0.5rem;
padding: 1rem 0;
}
- #order2_summaryprice{
- font-size: 2.2rem;
- font-weight: 800;
- }
.--points{
color: @less_iaicolorscheme_background_active_color;
}
- #summary-points{
- text-align: center;
- }
.order_pay_wrapper div, .order2_summary div{
display: flex;
justify-content: space-between;
@@ -856,12 +923,9 @@
}
.rebate{
margin-bottom: 2rem;
- }
- .rebate{
- padding-bottom: 0.9rem;
border: 1px solid #ccc;
border-radius: 8px;
- .rebate__options, .rebate__code{
+ .rebate__options{
display: flex;
align-items: center;
}
@@ -870,7 +934,7 @@
.rebate__code-container{
display: grid;
grid-template-columns: 5fr 3fr;
- padding: 2rem 1rem 0 1rem;
+ padding: 1.1rem 1rem 0.9rem 1rem;
> div{
position: relative;
margin-right: 2rem;
@@ -880,7 +944,7 @@
margin-top: 1rem;
}
}
- #rebate_code{
+ #rebate-code{
margin: 0!important;
display: inline-block;
}
@@ -910,9 +974,6 @@
text-decoration: underline;
margin-bottom: 1rem;
}
- #FBS_faktura{
- display: none;
- }
input{
margin: 0.5rem 0.8rem 0.5rem 0;
}
@@ -930,32 +991,20 @@
}
}
@media(max-width: 978px){
- .ajax_cop{
+ .bm-oscop__container{
grid-template-columns: 1fr!important;
padding: 0 2rem;
.row{
gap: 2rem;
}
}
- .form-control-feedback{
- right: 15px!important;
- }
- .zipcode_wrapper{
- padding-right: 0!important;
- }
}
@media(max-width: 757px){
- .form-control-feedback{
- line-height: 51px;
- }
.order__voucher_container .order__voucher_status{
top: -1px!important;
}
- .--hide{
- margin-bottom: 0!important;
- }
- .rebate__active, .--arrow-label{
- padding: 1.4rem 1rem 0.5rem 1.9rem;
+ .rebate__active, .bm-oscop__arrow-label{
+ padding: 1.4rem 1rem 1.4rem 1.9rem;
}
.modal__wrapper:has(.osc_item-modal){
padding: 2.4rem!important;
@@ -975,22 +1024,11 @@
font-size: 1.3rem!important;
}
// Zmiana fontsize na 14px mobile
- .bm-oscop__btn, .cop_product_wrap_r .cop_product_name, .rebate__options, .order2_terms_wrapper_sub.newsletter, .propose_text, .propose_json_mail, .button_password_recover, #cop_seection2 #checkout_step2_2 h3, .rebate__title{
+ .bm-oscop__btn, .cop_product_wrap_r .cop_product_name, .rebate__options, .order2_terms_wrapper_sub.newsletter, .propose_text, .propose_json_mail, .button_password_recover, #bm-oscop-section2 #bm-oscop-remarks h3, .rebate__title{
font-size: 1.4rem!important;
}
- input[type="text"], input[type="email"], input[type="password"], input[type="tel"], select{
- height: 45px!important;
- }
- .f-group{
- .f-label{
- top: 15px!important;
- }
- .f-control.focused + .f-label, .f-control:focus + .f-label{
- transform: scale(0.95) translateY(-23px) !important;
- }
- }
- .has-error .form-control-feedback, .has-success .form-control-feedback{
- line-height: 44px;
+ #delivery_box_switcher label, #FBS_faktura > span, #bm-oscop-payments .osc_item .name{
+ font-size: 1.6rem!important;
}
.bm-oscop__btn{
padding: 1.4rem 0;
@@ -998,22 +1036,19 @@
min-height: 45px;
font-weight: 700;
}
- .ajax_cop{
+ .bm-oscop__container{
padding: 0 0.5rem;
+ h2{
+ font-size: 2.4rem;
+ }
}
- .ajax_cop h2{
- font-size: 2.4rem;
- }
- #delivery_box_switcher label, #FBS_faktura > span, #checkout_step3_1 .osc_item .name{
- font-size: 1.6rem!important;
- }
- .go__shopping{
+ .bm-oscop__go-shopping{
margin-bottom: 2rem;
}
- #checkout_step3_1 .osc_item .name{
+ #bm-oscop-payments .osc_item .name{
font-weight: 700;
}
- #cop_seection1{
+ #bm-oscop-section1{
margin-bottom: 0.4rem;
.client_biling_data div{
margin: 1rem 0;
@@ -1022,9 +1057,9 @@
.register{
padding-top: 1.6rem;
padding-bottom: 1.4rem;
- #toggle_password{
- height: 43px!important;
- }
+ }
+ #toggle-password{
+ height: 43px!important;
}
.client_new_social{
gap: 1.6rem!important;
@@ -1053,12 +1088,12 @@
.zipcode_wrapper .f-label, .city_wrapper .f-label{
left: 2.8rem!important;
}
- #delivery_box_switcher{
- flex-direction: column;
- gap: 1.2rem;
- }
}
- .delivery_box.--more .form-group, .client_box .form-group, #client_contact_info .form-group{
+ #delivery_box_switcher{
+ flex-direction: column;
+ gap: 1.2rem;
+ }
+ .delivery_box.--more .form-group, .client_box .form-group, #client-contact-info .form-group{
margin-bottom: 1.2rem!important;
}
#client_form{
@@ -1067,7 +1102,7 @@
.osc_item-modal .payments-container{
grid-template-columns: 47% 47%;
}
- #cop_seection2{
+ #bm-oscop-section2{
.osc_item{
margin: 1rem 0;
column-gap: 1.2rem;
@@ -1098,12 +1133,12 @@
gap: 0.5rem;
}
}
- #checkout_step2_1 .osc_item{
+ #bm-oscop-deliveries .osc_item{
.delivery_date, .fselectedPoint{
border-top: 1px solid #EFEFEF;
}
}
- #checkout_step2_2 .step3_sub.cop_box_sub{
+ .remarks__container{
gap: 2.5rem;
grid-template-columns: 1fr;
div input[type="checkbox"]:checked ~ textarea{
@@ -1111,11 +1146,11 @@
}
}
}
- #cop_seection3{
+ #bm-oscop-section3{
img{
max-width: 100%!important;
}
- #checkout_step3_3 .cop_product_wrap_r{
+ .cop_product_wrap_r{
flex-direction: column;
align-items: flex-start;
gap: 0.8rem;
@@ -1124,9 +1159,6 @@
padding-top: 0.8rem;
}
}
- #order2_summaryprice{
- font-size: 2rem!important;
- }
.rebate .rebate__code-container{
gap: 1.2rem;
grid-template-columns: 1fr!important;
@@ -1151,21 +1183,6 @@
font-size: 1.6rem!important;
}
}
- // Modal elektroniczna faktura mobile
- .modal__wrapper:has(#e-invoice_dialog){
- padding: 2.4rem!important;
- }
- #e-invoice_dialog{
- .big_label{
- padding-bottom: 2.4rem;
- }
- .e-invoice_dialog{
- margin-bottom: 1.2rem;
- }
- }
- .--hide-map-el{
- display: none!important;
- }
}
@media(max-width: 450px){
.delivery_info{
@@ -1181,7 +1198,7 @@
//////////////////////////////////////////////////////////////////////
// LEAFLET MAP
// Znika powtórzenie
- .leaflet-shadow-pane{
+ .leaflet-marker-shadow, .leaflet-shadow-pane, .asideContainer_pickup > input:not(:checked) + label .fbs02_btn{
display: none;
}
.leafleat-suggestions {
@@ -1230,9 +1247,6 @@
#fbs_z02_close:hover{
color: @less_iaicolorscheme_background_active_color;
}
- .asideContainer_pickup > input:not(:checked) + label .fbs02_btn {
- display: none;
- }
div.asideContainer_pickup {
margin-top: 10px;
.less_scrollbar();
@@ -1244,9 +1258,6 @@
width: 100%;
display: none;
}
- .pickup_sites_errors.show {
- display: block;
- }
.map_button_search {
z-index: 401;
}
@@ -1256,7 +1267,7 @@
display: block;
transform: none;
}
- .pickup_search_here:hover,
+ .pickup_sites_errors.show, .pickup_search_here:hover,
.pickup_search_here_leaflet:hover {
display: block;
}
@@ -1301,9 +1312,6 @@
.leaflet-marker-icon {
background: none;
}
- .leaflet-marker-shadow {
- display: none;
- }
.leafleat-suggestions {
border-top: none;
margin-top: 0!important;
@@ -1364,7 +1372,7 @@
}
}
// ZMIANY W MAPIE
- input:checked + label.pickup_point{
+ #fbs_z02_wrapper input:checked + label.pickup_point{
border-radius: 8px;
}
.mobile-change__btns{
@@ -1507,4 +1515,93 @@
}
}
}
-}
\ No newline at end of file
+ // PRZYCZEPIONY PRZYCISK KUP TERAZ NA DOLE
+ .order_pay_wrapper, .order2_summary{
+ border-bottom: 1px solid #000;
+ display: flex;
+ flex-direction: column;
+ gap: 0.5rem;
+ padding: 1rem 0;
+ }
+ #order2_summaryprice, #attatched-summaryprice{
+ font-size: 2.2rem;
+ font-weight: 800;
+ @media(max-width: 757px){
+ font-size: 2rem!important;
+ }
+ }
+ #summary-points, #attatched-points, .order2_terms_checkall{
+ text-align: center;
+ }
+ .order_pay_wrapper div, .order2_summary div{
+ display: flex;
+ justify-content: space-between;
+ flex-wrap: wrap;
+ }
+ .order2_button_order{
+ display: inline-block!important;
+ width: 100%;
+ padding: 1.4rem;
+ font-size: 2.2rem;
+ }
+ .order2_terms_checkall{
+ display: flex;
+ text-decoration: underline;
+ margin-bottom: 1rem;
+ }
+ .bm-oscop__attatched-zone .--error .order2_terms_checkall{
+ color: @less_iaicolorscheme_danger_color;
+ }
+ #attatched-summary{
+ position: relative;
+ z-index: 30;
+ @media(min-width: 979px){
+ display: none;
+ grid-column: 2 / span 1;
+ };
+ }
+ .bm-oscop__attatched-zone, .bm-oscop__attatched-container{
+ width: 100%;
+ }
+ .bm-oscop__attatched-zone{
+ position: fixed;
+ background: @less_iaicolorscheme_background_color;
+ bottom: 0;
+ max-width: 100vw;
+ left: 0;
+ @media(min-width: 979px){
+ left: auto;
+ max-width: 469px;
+ width: 39%;
+ padding-bottom: 1.5rem;
+ border-radius: 8px 8px 0 0;
+ }
+ }
+ .bm-oscop__attatched-container{
+ background-color: #f2f2f2;
+ border-radius: 8px 8px 0 0;
+ border-top: 2px solid #ddd;
+ padding: 0 4rem 1rem 4rem;
+ @media(min-width: 758px){
+ padding: 0 5.5rem 1rem 5.5rem;
+ }
+ @media(min-width: 979px){
+ padding: 0 2rem 1rem 2rem;
+ border-radius: 8px;
+ grid-column: 2 / span 1;
+ };
+ }
+ .bm-oscop__attatched-price{
+ margin-bottom: 0.5rem;
+ }
+ #attatched-summary .order2_terms_checkall{
+ padding-bottom: 2rem;
+ }
+ .bm-oscop__attatched-checkbox{
+ label{
+ padding-top: 0.5rem;
+ }
+ #attatched-checkall-terms{
+ margin-right: 0.5rem;
+ }
+ }
\ No newline at end of file
diff --git a/wydzielonyScript.js b/wydzielonyScript.js
index f6b0526..44a85d5 100644
--- a/wydzielonyScript.js
+++ b/wydzielonyScript.js
@@ -40,7 +40,7 @@ const deliveryPickupPoints = [];
let finpostjs = false;
// Funkcja inicjująca mapę
function loadMap() {
- var htmlContent = `
+ const htmlContent = `
@@ -116,10 +116,12 @@ function loadMap() {
document.querySelector('.asideContainer_pickup').innerHTML = '';
}
+
+
// Funkcja obsługująca dostawy z mapą
function createEventsInpost(ITEM_ID) {
- var ITEM_FOR_MAP = '#item_' + ITEM_ID;
- var oscItem = document.querySelector(ITEM_FOR_MAP).closest('.osc_item');
+ const ITEM_FOR_MAP = '#item_' + ITEM_ID;
+ const oscItem = document.querySelector(ITEM_FOR_MAP).closest('.osc_item');
document.querySelector(ITEM_FOR_MAP).addEventListener('click', function (e) {
const deliveryValue = ITEM_FOR_MAP.slice(1);
@@ -132,18 +134,9 @@ function loadMap() {
// Jesli nie ma informacji potrzebnej do mapy, zapisz wiadomosc do errora
let errorMessage = "";
- if(!clientStreet){
- errorMessage += `${
}
`;
- addErrorMessage(document.getElementById("client_street"),
)
- }
- if(!clientZipCode){
- errorMessage += `${
}
`;
- addErrorMessage(document.getElementById("client_zipcode"),
)
- }
- if(!clientCity){
- errorMessage += `${
}`;
- addErrorMessage(document.getElementById("client_city"),
)
- }
+ if(!clientStreet) errorMessage += addAddressErrorForMap("street");
+ if(!clientZipCode) errorMessage += addAddressErrorForMap("zipcode");
+ if(!clientCity) errorMessage += addAddressErrorForMap("city");
// Zablokuj wybranie mapy jak nie ma adresu
if(errorMessage !== ""){
@@ -176,7 +169,6 @@ function loadMap() {
if(!suggestions) return;
else suggestions.remove();
});
- htmlContent = '';
}
// Wstaw adres klienta
@@ -245,6 +237,17 @@ function getAddressInfo(query){
};
return document.getElementById(`client_${query}`).value;
}
+// Wiadomość errora, gdyby niebyło informacji adresowych przy otwieraniu mapy
+const addressErrorMessagesForMap = {
+ "street": `${
}`,
+ "zipcode": `${
}`,
+ "city": `${
}`,
+}
+function addAddressErrorForMap(query){
+ addErrorMessage(document.getElementById(`client_${query}`), addressErrorMessagesForMap[query]);
+ return `${addressErrorMessagesForMap[query]}
`;
+}
+
// Utworzenie informacji o punkcie odbioru
function createPickuppointInfo(selectedPoint, deliveryPointId, name, streetText, cityText, zipcodeText, courierId){
// Pokazanie elementu fselectedPoint
@@ -294,10 +297,10 @@ function toggleMapList(e){
e.target.dataset.show = ifList ? "map" : "list";
}
+
//////////////////////////////////////////////////////////////////////////
// DANE KLIENTA
-
-document.getElementById("cop_seection1").addEventListener("click", (e) => {
+document.getElementById("bm-oscop-section1").addEventListener("click", (e) => {
// Pokazanie się okna od logowania
if(e.target.classList.contains("get_signin")) showSigninModal();
@@ -310,11 +313,11 @@ document.getElementById("cop_seection1").addEventListener("click", (e) => {
}
// Ukrycie/Pokazanie hasła
- if(e.target.id === "toggle_password") return togglePassword(e.target);
+ if(e.target.id === "toggle-password") return togglePassword(e.target);
// Sprawdzenie czy kliknięcie było na firmę, czy na osobę prywatną
- if(e.target.id === "client_type1") return document.querySelectorAll("#cop_seection1 .firm-group").forEach(el => el.classList.add("--fade-in"));
- if(e.target.id === "client_type2") return document.querySelectorAll("#cop_seection1 .firm-group").forEach(el => el.classList.remove("--fade-in"));
+ if(e.target.id === "client_type1") return document.querySelectorAll("#bm-oscop-section1 .firm-group").forEach(el => el.classList.add("--fade-in"));
+ if(e.target.id === "client_type2") return document.querySelectorAll("#bm-oscop-section1 .firm-group").forEach(el => el.classList.remove("--fade-in"));
// Sprawdzenie czy dostawa na inny adres czy nie
if(e.target.id === "deliver_to_billingaddr"){
@@ -356,24 +359,24 @@ function togglePassword(el){
// Pokaż popup logowania
function showSigninModal(){
app_shop.fn.signinModal = new Modal({
- element: $("#signin-form-ajax"),
+ element: $("#signin-form"),
classList: "--fade-in-modal",
afterShow: ()=>{
disablePageScroll();
- document.querySelector(".signin_login_input").addEventListener("keydown", logInOnEnter);
- document.querySelector(".signin_pass_input").addEventListener("keydown", logInOnEnter);
+ document.querySelector(".signin-form__login").addEventListener("keydown", logInOnEnter);
+ document.querySelector(".signin-form__pass").addEventListener("keydown", logInOnEnter);
},
beforeClose: ()=>{
enablePageScroll();
- document.querySelector(".signin_login_input").removeEventListener("keydown", logInOnEnter);
- document.querySelector(".signin_pass_input").removeEventListener("keydown", logInOnEnter);
+ document.querySelector(".signin-form__login").removeEventListener("keydown", logInOnEnter);
+ document.querySelector(".signin-form__pass").removeEventListener("keydown", logInOnEnter);
},
});
}
// Pokaż(true)/Schowaj(false) formularz dostawy na inny adres
function showDeliveryForm(style){
- const deliveryWrapper = document.querySelector(".ajax_cop #client_new_additional .delivery_box.cn_wrapper");
+ const deliveryWrapper = document.querySelector(".bm-oscop__container #client_new_additional .delivery_box.cn_wrapper");
if((style && deliveryWrapper.classList.contains("--more")) || (!style && !deliveryWrapper.classList.contains("--more"))) return;
// Formularz dostawy na inny adres
@@ -448,15 +451,15 @@ const SIGNIN = (signinInput) => JSON.stringify({
});
function logInOnEnter(e){
- if(e.key==="Enter") logInToAccount(false)
+ if(e.key === "Enter") logInToAccount(false)
}
-const signinForm = document.querySelector(".signin-form_box_text form");
+const signinForm = document.querySelector(".signin-form__container form");
if(signinForm) signinForm.addEventListener("submit", logInToAccount);
async function logInToAccount(event){
if(event) event.preventDefault();
- const login = document.querySelector(".signin_login_input").value;
- const password = document.querySelector(".signin_pass_input").value;
+ const login = document.querySelector(".signin-form__login").value;
+ const password = document.querySelector(".signin-form__pass").value;
const loginStatus = await fetchData({
data: SIGNIN(`
login: "${login.replace(/"/g, '\\"')}",
@@ -493,7 +496,7 @@ function getClientNew(){
success: function (e, a) {
app_shop.fn.load(
"place-order.php",
- [["#cop_seection1", "#cop_seection1"]],
+ [["#bm-oscop-section1", "#bm-oscop-section1"]],
function () {
history.go(-1);
},
@@ -639,8 +642,8 @@ function handleShowSigninModalFromEmailModal(e){
showSigninModal();
}
-// EventListener zmian w kontenerze cop_seection1
-document.getElementById("cop_seection1").addEventListener("change", (e) => {
+// EventListener zmian w kontenerze bm-oscop-section1
+document.getElementById("bm-oscop-section1").addEventListener("change", (e) => {
const validateRequestId = ["client_zipcode", "delivery_zipcode", "client_nip", "client_email"];
const notEmptyFieldsId = ["client_firstname", "client_lastname", "client_city", "delivery_firstname", "delivery_lastname", "delivery_city", "client_firm"];
@@ -658,17 +661,13 @@ document.getElementById("cop_seection1").addEventListener("change", (e) => {
// Walidacja ulicy i numeru domu
if(e.target.id === "client_street" || e.target.id === "delivery_street") validateStreet(e.target);
-
// Walidacja numeru telefonu
if(e.target.id === "client_phone" || e.target.id === "delivery_phone") validatePhone(e.target);
-
// Walidacja loginu i hasła rejestracji
if(e.target.classList.contains("register__login")) testLogin();
if(e.target.classList.contains("register__password")) testPassword();
-
// Walidacja imienia nazwiska miasta i firmy(wymagające po prostu nie bycia pustym)
if(notEmptyFieldsId.includes(e.target.id)) validateNotEmpty(e.target);
-
// Sprawdzenie czy firma w dostawie na inny adres została wpisana
if(e.target.id === "delivery_additional"){
if(e.target.value.length > 0) addSuccess(e.target);
@@ -830,13 +829,12 @@ function getNewPaymentsAndDeliveries(data = null) {
// Dane do zaznaczenia płatności i dostawy jeśli wcześniej na tej przeglądarce(localStorage) było już zamówienie
const prevOrderInfo = JSON.parse(localStorage.getItem("prevOrderInfo"));
- console.log(prevOrderInfo);
// Wstawienie metod dostaw na strone
const deliveryMarkup = `
${prepaidMarkup}
${dvpMarkup}
`;
const previousDeliveries = document.getElementById("osc_order1");
if(previousDeliveries) previousDeliveries.remove();
- document.querySelector(".ajax_cop .step2_sub").insertAdjacentHTML("beforeend",deliveryMarkup);
+ document.getElementById("bm-oscop-deliveries").insertAdjacentHTML("beforeend",deliveryMarkup);
// Stworzenie metod płatności
let prepaidsMethodMarkup = "";
@@ -874,7 +872,7 @@ function getNewPaymentsAndDeliveries(data = null) {
ifPaymentCard = true;
}
else{
- prepaidsMethodMarkup += markup;
+ prepaidsMethodMarkup += markup;
// Okienko vouchera
if(method.id === 2){
prepaidsMethodMarkup += `
@@ -900,8 +898,8 @@ function getNewPaymentsAndDeliveries(data = null) {
}
}
});
- prepaidsTransferMarkup +="
";
- prepaidsCardMarkup +="