+
@@ -1427,98 +1364,16 @@ CATALOG_TEMPLATE = '''
}
cart = cartsStore.sessions[cartsStore.active];
- updateBadges();
- }
-
- function updateBadges() {
- const count = Object.keys(cartsStore.sessions).length;
if(document.getElementById('cartCountBadge')) {
- document.getElementById('cartCountBadge').innerText = count;
- }
- if(document.getElementById('desktopCartCountBadge')) {
- document.getElementById('desktopCartCountBadge').innerText = count;
+ document.getElementById('cartCountBadge').innerText = Object.keys(cartsStore.sessions).length;
}
}
function saveCartsState() {
const lsKey = `metastore_multi_${envId}_${mode}`;
try { localStorage.setItem(lsKey, JSON.stringify(cartsStore)); } catch(e){}
- updateBadges();
- }
-
- function openCustomItemModal() {
- document.getElementById('customItemModal').style.display = 'flex';
- setTimeout(() => document.getElementById('customItemModal').classList.add('active'), 10);
- }
-
- function closeCustomItemModal() {
- const modal = document.getElementById('customItemModal');
- modal.classList.remove('active');
- setTimeout(() => modal.style.display = 'none', 300);
- }
-
- function resizeImage(file, callback) {
- const reader = new FileReader();
- reader.onload = function(e) {
- const img = new Image();
- img.onload = function() {
- const canvas = document.createElement('canvas');
- const MAX_WIDTH = 400;
- const MAX_HEIGHT = 400;
- let width = img.width;
- let height = img.height;
- if (width > height) {
- if (width > MAX_WIDTH) { height *= MAX_WIDTH / width; width = MAX_WIDTH; }
- } else {
- if (height > MAX_HEIGHT) { width *= MAX_HEIGHT / height; height = MAX_HEIGHT; }
- }
- canvas.width = width;
- canvas.height = height;
- const ctx = canvas.getContext('2d');
- ctx.drawImage(img, 0, 0, width, height);
- callback(canvas.toDataURL('image/jpeg', 0.6));
- }
- img.src = e.target.result;
- }
- reader.readAsDataURL(file);
- }
-
- function addCustomItem() {
- const name = document.getElementById('ciName').value.trim();
- const price = parseFloat(document.getElementById('ciPrice').value);
- const qty = parseInt(document.getElementById('ciQty').value);
- const fileInput = document.getElementById('ciPhoto');
-
- if(!name || isNaN(price) || isNaN(qty) || qty <= 0) {
- alert('Заполните все поля корректно'); return;
- }
-
- const cid = 'custom_' + Date.now();
-
- const finalizeAdd = (url) => {
- cart[cid] = {
- c_key: cid,
- product_id: cid,
- name: name,
- price: price,
- cart_price: price,
- quantity: qty,
- discount: 0,
- is_custom: true,
- custom_photo_url: url
- };
- updateCartUI();
- closeCustomItemModal();
- document.getElementById('ciName').value = '';
- document.getElementById('ciPrice').value = '';
- document.getElementById('ciQty').value = '1';
- fileInput.value = '';
- };
-
- if(fileInput.files && fileInput.files[0]) {
- resizeImage(fileInput.files[0], finalizeAdd);
- } else {
- finalizeAdd('');
+ if(document.getElementById('cartCountBadge')) {
+ document.getElementById('cartCountBadge').innerText = Object.keys(cartsStore.sessions).length;
}
}
@@ -1594,39 +1449,43 @@ CATALOG_TEMPLATE = '''
function renderStories() {
const now = new Date();
- const stories = products.filter(p => {
- if(!p.created_at) return false;
- const d = new Date(p.created_at.replace(' ', 'T'));
- const diffDays = Math.ceil(Math.abs(now - d) / (1000 * 60 * 60 * 24));
- return diffDays <= 2;
+ const newArrivals = products.filter(p => {
+ if (!p.created_at) return false;
+ const parts = p.created_at.split(/[- :]/);
+ if(parts.length !== 6) return false;
+ const pDate = new Date(Date.UTC(parts[0], parts[1]-1, parts[2], parts[3], parts[4], parts[5]));
+ const diffDays = (now - pDate) / (1000 * 3600 * 24);
+ return diffDays >= 0 && diffDays <= 2;
});
-
+
const wrapper = document.getElementById('storiesWrapper');
- if(!wrapper) return;
- if(stories.length === 0) {
+ if(newArrivals.length > 0) {
+ wrapper.style.display = 'flex';
+ wrapper.innerHTML = '';
+ newArrivals.forEach(p => {
+ let photoUrl = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIj48cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSIjZjBmMHcwIi8+PC9zdmc+';
+ if(p.photos && p.photos.length > 0) {
+ photoUrl = `https://huggingface.co/datasets/${repoId}/resolve/main/photos/${p.photos[0]}`;
+ } else if(p.variants && p.variants.length > 0 && p.variants[0].photo) {
+ photoUrl = `https://huggingface.co/datasets/${repoId}/resolve/main/photos/${p.variants[0].photo}`;
+ }
+ wrapper.innerHTML += `
+
+
+ `;
+ });
+ } else {
wrapper.style.display = 'none';
- return;
}
-
- wrapper.style.display = 'flex';
- wrapper.innerHTML = '';
-
- stories.forEach(p => {
- let photoUrl = 'data:image/svg+xml;base64,PHN2ZyB4bWxucz0iaHR0cDovL3d3dy53My5vcmcvMjAwMC9zdmciIHdpZHRoPSIxMDAiIGhlaWdodD0iMTAwIj48cmVjdCB3aWR0aD0iMTAwJSIgaGVpZ2h0PSIxMDAlIiBmaWxsPSIjZjBmMHcwIi8+PC9zdmc+';
- if(p.photos && p.photos.length > 0) photoUrl = `https://huggingface.co/datasets/${repoId}/resolve/main/photos/${p.photos[0]}`;
- else if (p.variants && p.variants.length > 0 && p.variants[0].photo) photoUrl = `https://huggingface.co/datasets/${repoId}/resolve/main/photos/${p.variants[0].photo}`;
-
- const div = document.createElement('div');
- div.className = 'story-item';
- div.onclick = () => openGallery(p.product_id);
- div.innerHTML = `
-
+ 
+
+ ${p.name}
+
-
-
- ${p.name}
- `;
- wrapper.appendChild(div);
- });
+ }
+
+ function openStory(name) {
+ document.getElementById('searchInput').value = name;
+ filterCategories(1);
}
function init() {
@@ -1709,6 +1568,9 @@ CATALOG_TEMPLATE = '''
document.getElementById('backBtn').style.display = 'none';
document.getElementById('pageTitle').innerText = '{{ t("Каталог") }}';
+ const stories = document.getElementById('storiesWrapper');
+ if(stories && stories.innerHTML.trim() !== '') stories.style.display = 'flex';
+
container.innerHTML = '';
const totalPages = Math.ceil(categoriesList.length / itemsPerPage);
@@ -1760,6 +1622,7 @@ CATALOG_TEMPLATE = '''
currentSearchQuery = query;
document.getElementById('categoriesContainer').style.display = 'none';
+ document.getElementById('storiesWrapper').style.display = 'none';
const container = document.getElementById('productsContainer');
container.style.display = 'flex';
document.getElementById('backBtn').style.display = 'block';
@@ -1998,6 +1861,7 @@ CATALOG_TEMPLATE = '''
currentCategory = category;
document.getElementById('categoriesContainer').style.display = 'none';
+ document.getElementById('storiesWrapper').style.display = 'none';
const container = document.getElementById('productsContainer');
container.style.display = 'flex';
document.getElementById('backBtn').style.display = 'block';
@@ -2024,10 +1888,13 @@ CATALOG_TEMPLATE = '''
let cKey = cartKeyOverride !== null ? cartKeyOverride : productId;
if (cart[cKey] && cart[cKey].is_custom) {
- let newQty = exactValue !== null ? parseInt(exactValue) : cart[cKey].quantity + change;
- if (isNaN(newQty) || newQty < 0) newQty = 0;
- cart[cKey].quantity = newQty;
- if (cart[cKey].quantity <= 0) delete cart[cKey];
+ let currentQty = cart[cKey].quantity;
+ let newQty = exactValue !== null ? exactValue : currentQty + change;
+ if (newQty <= 0) {
+ delete cart[cKey];
+ } else {
+ cart[cKey].quantity = newQty;
+ }
updateCartUI();
return;
}
@@ -2037,6 +1904,7 @@ CATALOG_TEMPLATE = '''
if (p.is_available === false && change > 0) return;
let varIdx = -1;
+
if (cKey.includes('___')) {
varIdx = parseInt(cKey.split('___')[1]);
if (p.variants[varIdx] && p.variants[varIdx].is_available === false && change > 0) return;
@@ -2074,7 +1942,7 @@ CATALOG_TEMPLATE = '''
}
vName = p.variants[varIdx].name;
}
- cart[cKey] = { ...p, quantity: 0, cart_price: price, cart_box_price: bPrice, pieces_per_box: pPpb, pieces_per_master_box: pPpmb, variant_name: vName, variant_idx: varIdx, discount: 0, wholesale_tiers: tiers, is_custom: false };
+ cart[cKey] = { ...p, quantity: 0, cart_price: price, cart_box_price: bPrice, pieces_per_box: pPpb, pieces_per_master_box: pPpmb, variant_name: vName, variant_idx: varIdx, discount: 0, wholesale_tiers: tiers };
}
let currentQty = cart[cKey].quantity;
@@ -2174,10 +2042,8 @@ CATALOG_TEMPLATE = '''
if (total > 0 || Object.keys(cart).length > 0) {
cartBar.style.display = 'flex';
document.getElementById('cartTotalSum').innerText = Math.round(total * 100) / 100;
- if(document.getElementById('desktopCartTotalSum')) document.getElementById('desktopCartTotalSum').innerText = Math.round(total * 100) / 100;
} else {
cartBar.style.display = 'none';
- if(document.getElementById('desktopCartTotalSum')) document.getElementById('desktopCartTotalSum').innerText = "0";
closeCartModal();
}
@@ -2199,14 +2065,12 @@ CATALOG_TEMPLATE = '''
const formattedQty = formatQtyText(item.quantity, ppb, ppmb);
const pId = item.product_id;
let moq = (businessType === 'wholesale' && parseInt(item.min_order) > 0) ? parseInt(item.min_order) : 1;
+ if(item.is_custom) moq = 1;
let nameDisplay = item.name;
if (item.variant_name) {
nameDisplay += ` (${item.variant_name})
`;
}
- if (item.is_custom) {
- nameDisplay += ` {{ t('Свой товар') }}
`;
- }
let itemTotal = calculateItemPrice(item);
@@ -2598,6 +2462,80 @@ CATALOG_TEMPLATE = '''
document.getElementById('scannerModal').style.display = 'none';
}
+ function openCustomProductModal() {
+ document.getElementById('cpName').value = '';
+ document.getElementById('cpQty').value = '';
+ document.getElementById('cpPrice').value = '';
+ document.getElementById('cpPhoto').value = '';
+ const modal = document.getElementById('customProductModal');
+ modal.style.display = 'flex';
+ setTimeout(() => modal.classList.add('active'), 10);
+ }
+
+ function closeCustomProductModal() {
+ const modal = document.getElementById('customProductModal');
+ modal.classList.remove('active');
+ setTimeout(() => modal.style.display = 'none', 300);
+ }
+
+ function addCustomProduct() {
+ const name = document.getElementById('cpName').value.trim();
+ const qty = parseInt(document.getElementById('cpQty').value);
+ const price = parseFloat(document.getElementById('cpPrice').value);
+ const photoInput = document.getElementById('cpPhoto');
+
+ if(!name || isNaN(qty) || qty <= 0 || isNaN(price) || price < 0) {
+ alert('Заполните все обязательные поля корректно.');
+ return;
+ }
+
+ const btn = document.getElementById('cpSubmitBtn');
+ btn.innerHTML = ' Добавление...';
+ btn.disabled = true;
+
+ const processAdd = (photoFilename) => {
+ let cKey = 'custom_' + Date.now();
+ cart[cKey] = {
+ c_key: cKey,
+ product_id: cKey,
+ name: name,
+ cart_price: price,
+ cart_box_price: 0,
+ quantity: qty,
+ pieces_per_box: 1,
+ pieces_per_master_box: 1,
+ variant_name: '',
+ variant_idx: -1,
+ discount: 0,
+ wholesale_tiers: [],
+ is_custom: true,
+ photo_custom: photoFilename || ''
+ };
+ updateCartUI();
+ closeCustomProductModal();
+ btn.innerHTML = 'Добавить в накладную';
+ btn.disabled = false;
+ };
+
+ if(photoInput.files.length > 0) {
+ let formData = new FormData();
+ formData.append('photo', photoInput.files[0]);
+ fetch(`/${envId}/api/upload_custom_photo`, {
+ method: 'POST',
+ body: formData
+ })
+ .then(r => r.json())
+ .then(data => {
+ processAdd(data.filename || '');
+ })
+ .catch(() => {
+ processAdd('');
+ });
+ } else {
+ processAdd('');
+ }
+ }
+
init();