diff --git a/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm b/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm index 9666588..9664890 100644 --- a/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm +++ b/plugins/janvince/smallcontactform/components/smallcontactform/scf-form.htm @@ -88,15 +88,17 @@
-

+

- {{'Управляющая компания ТРЦ «Беркарар» - Хозяйственное Общество «Беркарар хызмат»'|_}} + {{'Управляющая компания'|_}}
+ {{'ТРЦ «Беркарар» '|_}}
+ {{'Хозяйственное Общество'|_}}
+ {{'«Беркарар хызмат»'|_}}

@@ -190,7 +192,7 @@

- {{'Торговый центр «Беркарар»'|_}} + {{'Торговый центр «Беркарар»'|_}}

@@ -238,7 +240,7 @@

- {{' Бизнес-центр «Беркарар» “Berkarar”'|_}} + {{' Бизнес-центр «Беркарар» “Berkarar”'|_}}

{{'Адрес: ул. Ататюрка, 81'|_}} diff --git a/themes/berkarar/assets/css/main.css b/themes/berkarar/assets/css/main.css index dcd600a..5efccb1 100644 --- a/themes/berkarar/assets/css/main.css +++ b/themes/berkarar/assets/css/main.css @@ -2602,8 +2602,8 @@ input[type=date]::-webkit-calendar-picker-indicator { position: relative; display: block; padding: 40px 0; - background: -webkit-gradient(linear, left top, right top, from(#000000), color-stop(0.01%, rgba(0, 0, 0, 0.9)), color-stop(80%, rgba(0, 0, 0, 0.4))), url("../images/bg.png") no-repeat center; - background: linear-gradient(90deg, #000000 0%, rgba(0, 0, 0, 0.9) 0.01%, rgba(0, 0, 0, 0.4) 80%), url("../images/bg.png") no-repeat center; + background: -webkit-gradient(linear, left top, right top, from(#000000), color-stop(0.01%, rgba(0, 0, 0, 0.9)), color-stop(80%, rgba(0, 0, 0, 0.4))), url("../images/berkarar_image.jpeg") no-repeat center; + background: linear-gradient(90deg, #000000 0%, rgba(0, 0, 0, 0.9) 0.01%, rgba(0, 0, 0, 0.4) 80%), url("../images/berkarar_image.jpeg") no-repeat center; background-size: cover; min-height: 800px; } @@ -5268,4 +5268,4 @@ input[type=date]::-webkit-calendar-picker-indicator { .bill_item > div p { font-size: 16px; } -} \ No newline at end of file +} diff --git a/themes/berkarar/assets/images/berkarar_image.jpeg b/themes/berkarar/assets/images/berkarar_image.jpeg new file mode 100644 index 0000000..56c7adc Binary files /dev/null and b/themes/berkarar/assets/images/berkarar_image.jpeg differ diff --git a/themes/berkarar/pages/contact.htm b/themes/berkarar/pages/contact.htm index 56ac09e..319aea5 100644 --- a/themes/berkarar/pages/contact.htm +++ b/themes/berkarar/pages/contact.htm @@ -5,6 +5,18 @@ is_hidden = 0 [contactForm] == +

@@ -53,4 +65,4 @@ is_hidden = 0
- \ No newline at end of file + diff --git a/themes/berkarar/pages/home.htm b/themes/berkarar/pages/home.htm index 71ddcfa..ab0fd03 100644 --- a/themes/berkarar/pages/home.htm +++ b/themes/berkarar/pages/home.htm @@ -10,7 +10,7 @@ function onStart(){ $this['movies'] = Tps\Movies\Models\Movie::orderBy('created_at')->limit(15)->get(); - $this['sales'] = Tps\Shops\Models\Sale::all(); + $this['sales'] = Tps\Shops\Models\Sale::orderBy('id', 'desc')->get(); $this['sales_all'] = $this['sales']->slice(0, 6); $this['sales_news'] = $this['sales']->where("type", "news")->slice(0, 6); $this['sales_promo'] = $this['sales']->where("type", "promo")->slice(0, 6); diff --git a/themes/berkarar/pages/sales.htm b/themes/berkarar/pages/sales.htm index 4a129de..ce16e9e 100644 --- a/themes/berkarar/pages/sales.htm +++ b/themes/berkarar/pages/sales.htm @@ -5,7 +5,7 @@ is_hidden = 0 == get(); $this['sales_all'] = $this['sales']; $this['sales_news'] = $this['sales']->where("type", "news"); $this['sales_promo'] = $this['sales']->where("type", "promo"); @@ -39,4 +39,4 @@ function onStart(){ -{% partial 'home/sales' %} \ No newline at end of file +{% partial 'home/sales' %} diff --git a/themes/berkarar/pages/top_category.htm b/themes/berkarar/pages/top_category.htm index 2726e89..35cb65d 100644 --- a/themes/berkarar/pages/top_category.htm +++ b/themes/berkarar/pages/top_category.htm @@ -50,11 +50,15 @@ function onUpdate() $floorID = post('floorID'); + $floorID = strval(intval($floorID) - 1); +//dd($floorID); $data = Tps\Shops\Models\Shop::orderBy('created_at') ->where('floor', $floorID) ->paginate(12) ->appends(['floor' => $floorID]); + +//dd($data); return [ 'home/shop_item' => $this->renderPartial('home/shop_item', ['shops' => $data]), 'home/pagination' => $this->renderPartial('home/pagination', ['result' => $data]) // Update this with the correct data diff --git a/themes/berkarar/partials/home/sales.htm b/themes/berkarar/partials/home/sales.htm index 7eecb72..c686c55 100644 --- a/themes/berkarar/partials/home/sales.htm +++ b/themes/berkarar/partials/home/sales.htm @@ -60,7 +60,7 @@ clock-icon - {{sale.start_date|date('Y-m-d')}} - {{sale.end_date|date('Y-m-d')}} + {{ sale.start_date|date('d.m.Y') }} - {{ sale.end_date|date('d.m.Y') }}

{% endif %}

@@ -140,7 +140,7 @@ clock-icon - {{sale.start_date}} - {{sale.end_date}} + {{ sale.start_date|date('d.m.Y') }} - {{ sale.end_date|date('d.m.Y') }}

{% endif %}

@@ -217,7 +217,7 @@ clock-icon - {{sale.start_date}} - {{sale.end_date}} + {{ sale.start_date|date('d.m.Y') }} - {{ sale.end_date|date('d.m.Y') }}

{% endif %}

@@ -294,7 +294,7 @@ clock-icon - {{sale.start_date}} - {{sale.end_date}} + {{ sale.start_date|date('d.m.Y') }} - {{ sale.end_date|date('d.m.Y') }}

{% endif %}

@@ -417,8 +417,8 @@ var currentPage = 0; var items = document.querySelectorAll("#news .shops_item"); var totalPages = Math.ceil(items.length / itemsPerPage); - var nextButton = document.querySelector("#news .next-button"); - var prevButton = document.querySelector("#news .prev-button"); + var nextButton = document.querySelector("#news_pagination .next-button"); + var prevButton = document.querySelector("#news_pagination .prev-button"); var pageInput = document.querySelector("#news_pagination .input_page"); var paginationBlock = document.querySelector("#news_pagination"); @@ -429,23 +429,23 @@ updatePagination(); - if(prevButton != null){ +// if(prevButton != null){ prevButton.addEventListener("click", function () { if (currentPage > 0) { currentPage--; updatePagination(); } }); - } +// } - if(nextButton != null){ +// if(nextButton != null){ nextButton.addEventListener("click", function () { if (currentPage < totalPages - 1) { currentPage++; updatePagination(); } }); - } +// } @@ -483,8 +483,8 @@ var currentPage = 0; var items = document.querySelectorAll("#discount .shops_item"); var totalPages = Math.ceil(items.length / itemsPerPage); - var nextButton = document.querySelector("#discount .next-button"); - var prevButton = document.querySelector("#discount .prev-button"); + var nextButton = document.querySelector("#discount_pagination .next-button"); + var prevButton = document.querySelector("#discount_pagination .prev-button"); var pageInput = document.querySelector("#discount_pagination .input_page"); var paginationBlock = document.querySelector("#discount_pagination"); @@ -495,23 +495,23 @@ updatePagination(); - if(prevButton != null){ +// if(prevButton != null){ prevButton.addEventListener("click", function () { if (currentPage > 0) { currentPage--; updatePagination(); } }); - } +// } - if(nextButton != null){ +// if(nextButton != null){ nextButton.addEventListener("click", function () { if (currentPage < totalPages - 1) { currentPage++; updatePagination(); } }); - } +// } function updatePagination() { var startIndex = currentPage * itemsPerPage; @@ -546,8 +546,8 @@ var currentPage = 0; var items = document.querySelectorAll("#stocks .shops_item"); var totalPages = Math.ceil(items.length / itemsPerPage); - var nextButton = document.querySelector("#stocks .next-button"); - var prevButton = document.querySelector("#stocks .prev-button"); + var nextButton = document.querySelector("#stocks_pagination .next-button"); + var prevButton = document.querySelector("#stocks_pagination .prev-button"); var pageInput = document.querySelector("#stocks_pagination .input_page"); var paginationBlock = document.querySelector("#stocks_pagination"); @@ -558,23 +558,23 @@ updatePagination(); - if(prevButton != null){ +// if(prevButton != null){ prevButton.addEventListener("click", function () { if (currentPage > 0) { currentPage--; updatePagination(); } }); - } +// } - if(nextButton != null){ +// if(nextButton != null){ nextButton.addEventListener("click", function () { if (currentPage < totalPages - 1) { currentPage++; updatePagination(); } }); - } +// } function updatePagination() { var startIndex = currentPage * itemsPerPage; diff --git a/themes/berkarar/partials/home/sales_home.htm b/themes/berkarar/partials/home/sales_home.htm index ab3a54d..6a066be 100644 --- a/themes/berkarar/partials/home/sales_home.htm +++ b/themes/berkarar/partials/home/sales_home.htm @@ -55,7 +55,7 @@ clock-icon - {{sale.start_date|date('Y-m-d')}} - {{sale.end_date|date('Y-m-d')}} + {{ sale.start_date|date('d.m.Y') }} - {{ sale.end_date|date('d.m.Y') }}

{% endif %}

@@ -101,7 +101,7 @@ clock-icon - {{sale.start_date}} - {{sale.end_date}} + {{ sale.start_date|date('d.m.Y') }} - {{ sale.end_date|date('d.m.Y') }}

{% endif %}

@@ -147,7 +147,7 @@ clock-icon - {{sale.start_date}} - {{sale.end_date}} + {{ sale.start_date|date('d.m.Y') }} - {{ sale.end_date|date('d.m.Y') }}

{% endif %}

@@ -193,7 +193,7 @@ clock-icon - {{sale.start_date}} - {{sale.end_date}} + {{ sale.start_date|date('d.m.Y') }} - {{ sale.end_date|date('d.m.Y') }}

{% endif %}

diff --git a/themes/berkarar/partials/site/footer.htm b/themes/berkarar/partials/site/footer.htm index e3088e9..2f92ba3 100644 --- a/themes/berkarar/partials/site/footer.htm +++ b/themes/berkarar/partials/site/footer.htm @@ -38,7 +38,7 @@ {{'Новости и акции'|_}}
  • - {{'Все магазины'|_}} + {{'Все магазины'|_}}
  • {{'Подробней о нас'|_}} @@ -63,7 +63,7 @@
  • - + @@ -98,7 +98,7 @@

    - + - \ No newline at end of file + diff --git a/themes/berkarar/partials/site/header.htm b/themes/berkarar/partials/site/header.htm index d867ac6..b835f49 100644 --- a/themes/berkarar/partials/site/header.htm +++ b/themes/berkarar/partials/site/header.htm @@ -10,10 +10,14 @@ function onStart(){ $url = $protocol . "://" . $host . $uri; $path = parse_url($url, PHP_URL_PATH); - + //dd($path); + + + // Remove language segments $segmentsToRemove = array("tk", "en", "ru"); foreach ($segmentsToRemove as $segment) { - $path = str_replace("/$segment/", "/", $path); + $pattern = "/\/$segment\//"; + $path = preg_replace($pattern, "/", $path); } $this["pageLink"] = $path; @@ -107,4 +111,4 @@ function onStart(){ - \ No newline at end of file + diff --git a/themes/berkarar/partials/site/navigation.htm b/themes/berkarar/partials/site/navigation.htm index dd9c5e8..53fb349 100644 --- a/themes/berkarar/partials/site/navigation.htm +++ b/themes/berkarar/partials/site/navigation.htm @@ -51,7 +51,7 @@ function onStart(){ {{'Схема ТРЦ'|_}}
    • -
  • + {#
  • {% if user %} @@ -83,7 +83,7 @@ function onStart(){ {{'Вход'|_}} {% endif %} -
    • + #} @@ -236,4 +236,4 @@ function onStart(){ - \ No newline at end of file +