Корзина
-
-
+
+
+
Корзина
+
-
-
+
+
+
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/views/product/index.php b/mirzaev/skillparts/system/views/product/index.php
index 34faee6..5e10402 100644
--- a/mirzaev/skillparts/system/views/product/index.php
+++ b/mirzaev/skillparts/system/views/product/index.php
@@ -8,123 +8,121 @@ use app\models\Product;
?>
-
+
-
+
+
Артикул
-
+
+
+
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/views/notification/panel.php b/mirzaev/skillparts/system/views/notification/panel.php
index 99968d2..149f4bf 100644
--- a/mirzaev/skillparts/system/views/notification/panel.php
+++ b/mirzaev/skillparts/system/views/notification/panel.php
@@ -1,7 +1,7 @@
Уведомлений нет
+
Описание
-
+
\ No newline at end of file
+
Количество
-
+
+ HTML;
+ }
+ } else {
echo <<
-
Доставка
-
- Стоимость
+
+
+ Стоимость
+
+
+
+ $supply->catn
+
+
+ $supply->desc
+
+
+ $supply->amnt
+
+
+ $supply->time
+
+
+ $supply->cost
+
+
-
-
-
- $supply->catn
-
-
- $supply->desc
-
-
- $supply->amnt
-
-
- $supply->time
-
-
- $supply->cost
+
+
-
+
HTML;
}
?>
+ Корзина пуста
Уведомлений нет
HTML; return; diff --git a/mirzaev/skillparts/system/views/orders/index.php b/mirzaev/skillparts/system/views/orders/index.php new file mode 100644 index 0000000..b551427 --- /dev/null +++ b/mirzaev/skillparts/system/views/orders/index.php @@ -0,0 +1,63 @@ + + +
+
+
+ HTML;
+ }
+ ?>
+ Заказы
+
+
+ HTML;
+ }
+ } else {
+ echo <<
+
+
+
+
+
+
+
+ Статус
+
+
+ Время
+
+
+
+
+
+ {$account_edge_order[0]['type']}
+
+
+ $date
+
+
+ Заказов нет
+
+
+
+
+
+
-
-
-
-
HTML;
}
diff --git a/mirzaev/skillparts/system/web/css/main.css b/mirzaev/skillparts/system/web/css/main.css
index 1364e33..b904d1f 100644
--- a/mirzaev/skillparts/system/web/css/main.css
+++ b/mirzaev/skillparts/system/web/css/main.css
@@ -104,13 +104,13 @@ main {
.button_red {
color : #eee;
- background-color: #ab1212;
+ background-color: #c40000;
transition : 0s;
}
.button_red:hover {
color : #fff;
- background-color: #b52424;
+ background-color: #d81313;
transition : 0s;
}
diff --git a/mirzaev/skillparts/system/web/css/notification.css b/mirzaev/skillparts/system/web/css/notification.css
index 53a8e3f..1f08f2b 100644
--- a/mirzaev/skillparts/system/web/css/notification.css
+++ b/mirzaev/skillparts/system/web/css/notification.css
@@ -15,5 +15,13 @@
#notification_button_panel {
z-index: 2500;
- min-width: 250px;
-}
\ No newline at end of file
+ min-width: 300px;
+}
+
+#notification_button_panel :first-child {
+ margin-top: 0 !important;
+}
+
+#notification_button_panel :last-child {
+ margin-bottom: 0 !important;
+}
diff --git a/mirzaev/skillparts/system/web/css/pages/cart.css b/mirzaev/skillparts/system/web/css/pages/cart.css
index 1a6c510..9ebea79 100644
--- a/mirzaev/skillparts/system/web/css/pages/cart.css
+++ b/mirzaev/skillparts/system/web/css/pages/cart.css
@@ -3,9 +3,14 @@
}
#page_cart article .list .row:nth-child(2n+1) {
- background-color: #f5f2fa;
+ background-color: #f7f6f9;
}
#page_cart article .list .row:first-child {
- background-color: #edeaf2;
+ background-color: #dbdde3;
+}
+
+#page_cart .cart_field_cost span {
+ font-weight: bold;
+ font-size: larger;
}
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/web/css/pages/orders.css b/mirzaev/skillparts/system/web/css/pages/orders.css
new file mode 100644
index 0000000..b1c4a90
--- /dev/null
+++ b/mirzaev/skillparts/system/web/css/pages/orders.css
@@ -0,0 +1,16 @@
+#page_orders article {
+ background-color: #fff;
+}
+
+#page_orders article .list .row:nth-child(2n+1) {
+ background-color: #f7f6f9;
+}
+
+#page_orders article .list .row:first-child {
+ background-color: #dbdde3;
+}
+
+#page_orders .cart_field_cost span {
+ font-weight: bold;
+ font-size: larger;
+}
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/web/js/cart.js b/mirzaev/skillparts/system/web/js/cart.js
index fe4d0b1..a74b9ee 100644
--- a/mirzaev/skillparts/system/web/js/cart.js
+++ b/mirzaev/skillparts/system/web/js/cart.js
@@ -17,6 +17,111 @@ function cart_write(catn, amount = 1) {
return false;
}
+function cart_delete() {
+ $.ajax({
+ url: '/order/delete',
+ type: 'post',
+ dataType: 'json',
+ data: {
+ '_csrf': yii.getCsrfToken()
+ },
+ success: cart_success,
+ error: cart_error
+ });
+
+ return false;
+}
+
+function cart_pay() {
+ $.ajax({
+ url: '/order/pay',
+ type: 'post',
+ dataType: 'json',
+ data: {
+ '_csrf': yii.getCsrfToken()
+ },
+ success: cart_success,
+ error: cart_error
+ });
+
+ return false;
+}
+
+function cart_list_checkbox(target) {
+
+ // Инициализация
+ let elements = document.getElementsByClassName('cart_list_target');
+ let reg = /^\w+_([^_]*)$/;
+ let catn = reg.exec(target.id)[1];
+
+ if (catn === 'all') {
+ if (target.checked === true) {
+ for ($i = 0; $i < elements.length; $i++) {
+ elements[$i].getElementsByTagName('input')[0].checked = true;
+ }
+
+ target.checked = true;
+ } else {
+ for ($i = 0; $i < elements.length; $i++) {
+ elements[$i].getElementsByTagName('input')[0].checked = false;
+ }
+
+ target.checked = false;
+ }
+
+ return false;
+ }
+}
+
+function cart_list_delete(dropdown) {
+ // Инициализация
+ let elements = document.getElementsByClassName('cart_list_target');
+ let reg = /^\w+_([^_]*)$/;
+ let targets = [];
+
+ for ($i = 0; $i < elements.length; $i++) {
+ let checkbox = elements[$i].getElementsByTagName('input')[0];
+
+ if (checkbox.checked === true) {
+ targets.push(reg.exec(checkbox.id)[1]);
+ }
+ }
+
+ $.ajax({
+ url: '/order/delete',
+ type: 'post',
+ dataType: 'json',
+ data: {
+ '_csrf': yii.getCsrfToken(),
+ 'targets': targets
+ },
+ success: cart_success,
+ error: cart_error
+ });
+
+ document.getElementById('cart_list_action').value = 'none';
+
+ // Подсчитывание стоимости
+ cart_cost_calculate();
+
+ return false;
+}
+
+function cart_cost_calculate() {
+ let elements = document.getElementsByClassName('cart_list_target');
+ let reg = /^([0-9]*)\s*\w*/;
+ let costs = 0;
+
+ for ($i = 0; $i < elements.length; $i++) {
+ let cost = elements[$i].getElementsByTagName('div')[5];
+
+ costs += +reg.exec(cost.innerText)[1];
+ }
+
+ document.getElementById('cart_cost').innerHTML = costs;
+}
+
+cart_cost_calculate();
function cart_success(data, status) {
// Обработка ответов от удавшихся запросов
diff --git a/mirzaev/skillparts/system/web/js/menu.js b/mirzaev/skillparts/system/web/js/menu.js
index 22df467..f2ef941 100644
--- a/mirzaev/skillparts/system/web/js/menu.js
+++ b/mirzaev/skillparts/system/web/js/menu.js
@@ -49,6 +49,23 @@ function page_cart() {
return false;
};
+function page_orders() {
+ if (document.getElementById('page_orders') === null) {
+ url = '/orders'
+
+ $.ajax({
+ url: url,
+ type: 'post',
+ dataType: 'json',
+ data: { '_csrf': yii.getCsrfToken() },
+ success: menu_success,
+ error: menu_error
+ });
+ }
+
+ return false;
+};
+
function notifications() {
return false;
diff --git a/mirzaev/skillparts/system/web/js/ticker.js b/mirzaev/skillparts/system/web/js/ticker.js
index 9604544..21b81b4 100644
--- a/mirzaev/skillparts/system/web/js/ticker.js
+++ b/mirzaev/skillparts/system/web/js/ticker.js
@@ -3,17 +3,22 @@ function tickerInit(target) {
target = $('.ticker');
}
- if (target.length > 0) {
- target.bxSlider({
- ticker: true,
- speed: 80000
- });
+ target.bxSlider({
+ ticker: true,
+ speed: 80000
+ });
- // Добавить ещё логотипов под широкие окна
- if ($(window).width() > 1280 && target.getSlideCount() <= 15) {
- tickerInit();
- }
- }
+ // if (target.length > 0) {
+ // target.bxSlider({
+ // ticker: true,
+ // speed: 80000
+ // });
+
+ // // Добавить ещё логотипов под широкие окна
+ // if ($(window).width() > 1280 && target.getSlideCount() <= 15) {
+ // tickerInit();
+ // }
+ // }
};
document.addEventListener('DOMContentLoaded', tickerInit(), true);
\ No newline at end of file
-
+ HTML;
+ } else {
+ $button_cart = <<
+
+
+ HTML;
+ }
+
$supplies_html .= <<
@@ -62,9 +81,7 @@
$price
-
-
-
+ $button_cart
-
\ No newline at end of file
diff --git a/mirzaev/skillparts/system/views/profile/index.php b/mirzaev/skillparts/system/views/profile/index.php
index 8a5d2f4..ebe5edc 100644
--- a/mirzaev/skillparts/system/views/profile/index.php
+++ b/mirzaev/skillparts/system/views/profile/index.php
@@ -56,10 +56,11 @@ use app\models\Supply;
*/
// Инициализация
- isset($model) or $model = yii::$app->user->identity;
- isset($supplies) or $supplies = Supply::searchByAccount(select: 'supply.onec["ЗначенияСвойств"]');
+ $model ?? $model = yii::$app->user->identity;
+ $supplies ?? $supplies = Supply::searchByAccount(select: 'supply.onec["ЗначенияСвойств"]');
$list = [];
+
// Перебор свойств поставок
foreach ($supplies as $supply) {
// Инициализация
@@ -72,7 +73,7 @@ use app\models\Supply;
}
// Генерация
- $list[$id] = $supply['ЗначенияСвойства']['Наименование'];
+ !isset($supply['ЗначенияСвойства']['Наименование']) or $list[$id] = $supply['ЗначенияСвойства']['Наименование'];
}
// Инициализация текущего значения параметра в начале массива
diff --git a/mirzaev/skillparts/system/views/search/index.php b/mirzaev/skillparts/system/views/search/index.php
index 2011aae..2005eb9 100644
--- a/mirzaev/skillparts/system/views/search/index.php
+++ b/mirzaev/skillparts/system/views/search/index.php
@@ -39,17 +39,36 @@
// Инициализация артикула
$catn = $supply['catn'] ?? $supply['onec']['Артикул'];
- // Инициализация количества
- $amount = $supply['amnt'] ?? $supply['onec']['Количество'];
+ // Инициализация цены
+ $price_raw = $supply['prce'] ?? $supply['onec']['Цены']['Цена']['ЦенаЗаЕдиницу'];
+ $price = $price_raw . ' ' . $supply['onec']['Цены']['Цена']['Валюта'];
- if (empty($amount) || $amount < 1) {
+ // Инициализация количества
+ $amount_raw = $amount = $supply['amnt'] ?? $supply['onec']['Количество'];
+
+ if (empty($amount_raw) || $amount_raw < 1) {
$amount = 'Под заказ';
} else {
$amount .= ' шт';
}
- // Инициализация цена
- $price = $supply['prce'] ?? $supply['onec']['Цены']['Цена']['ЦенаЗаЕдиницу'] . ' ' . $supply['onec']['Цены']['Цена']['Валюта'];
+
+ if ($amount_raw < 1 || $price_raw < 1) {
+ // Нет в наличии или цена 0 рублей
+
+ $button_cart = <<
+
+
- $image) {
- // Перебор изображений
+
+
+
+
+
+
-
-
+
+
-
+
HTML;
- // Деинициализация
- $checked = '';
- }
- ?>
-
-
+ $image) {
+ // Перебор изображений
- // Инициализация
- $name = $image['name'] ?? 'Без названия';
- $h150 = $image['h150'] ?? '/img/covers/h150/product.png';
+ // Инициализация
+ $name = $image['name'] ?? 'Без названия';
+ $h150 = $image['h150'] ?? '/img/covers/h150/product.png';
- // Генерация предпросмотра изображения
- echo <<
HTML;
- }
- ?>
-
-
+
-
+ // Деинициализация
+ $checked = '';
+ }
+ ?>
-
-
- Название товара
- -
-
- 'form_product_cart',
- 'action' => false,
- 'fieldConfig' => [
- 'template' => '{input}',
- ],
- 'options' => [
- 'onsubmit' => 'return false;',
- 'class' => 'row mt-auto'
- ]
- ]);
-
- // Просто для теста
- $model = new Product();
- ?>
-
- - ОЕМ-номера можно сюда добавить с возможностью перехода - -
-
- 'cartWrite', 'onclick' => 'product_cart_write(this.parentElement);', 'class' => 'col-10 btn button_blue button_clean py-2 px-5']) ?>
- field($model, 'amount', ['options' => ['class' => 'col h-100 m-0 form-group']])->textInput(['value' => '1', 'class' => 'form-control h-100 rounded-0 text-center button_clean']); ?>
-
-
-
-
-
-
- - Хабаровск: - в наличии -
-- Доставим: завтра -
-
-
- Время для повышения релевантности в поисковиках
- +
+
+
+
+ Название товара
+ +
+
+ 'form_product_cart',
+ 'action' => false,
+ 'fieldConfig' => [
+ 'template' => '{input}',
+ ],
+ 'options' => [
+ 'onsubmit' => 'return false;',
+ 'class' => 'row mt-auto'
+ ]
+ ]);
+
+ // Просто для теста
+ $model = new Product();
+ ?>
+
+ + ОЕМ-номера можно сюда добавить с возможностью перехода + +
+
+ 'cartWrite', 'onclick' => 'product_cart_write(this.parentElement);', 'class' => 'col-10 btn button_blue button_clean py-2 px-5']) ?>
+ field($model, 'amount', ['options' => ['class' => 'col h-100 m-0 form-group']])->textInput(['value' => '1', 'class' => 'form-control h-100 rounded-0 text-center button_clean']); ?>
+
+
+
+
+
+
+ Хабаровск: + в наличии +
++ Доставим: завтра +
+
+
+ Время для повышения релевантности в поисковиках
+ +