diff --git a/src/app/frontend/views/index.php b/src/app/frontend/views/index.php
index 315fa0d..119e076 100644
--- a/src/app/frontend/views/index.php
+++ b/src/app/frontend/views/index.php
@@ -2,6 +2,9 @@
+
+
+
= !empty( $meta_title ) ? $meta_title : \config::get( 'global#title' ) ?>
= !empty( $meta_link_next ) ? $meta_link_next : '' ?>
@@ -103,11 +106,7 @@ $page_title = isset( $page_title ) && !empty( $page_title ) ? $page_title : '';
-
-
-
-
-
+
@@ -166,6 +165,53 @@ $page_title = isset( $page_title ) && !empty( $page_title ) ? $page_title : '';
+
+
+
diff --git a/src/app/frontend/views/partial/popupCart.php b/src/app/frontend/views/partial/popupCart.php
index 27f5ca6..4ff6aa6 100644
--- a/src/app/frontend/views/partial/popupCart.php
+++ b/src/app/frontend/views/partial/popupCart.php
@@ -1,31 +1,33 @@
-
+
diff --git a/www/dist/js/cart.js b/www/dist/js/cart.js
index 7b36a10..06b3b71 100644
--- a/www/dist/js/cart.js
+++ b/www/dist/js/cart.js
@@ -1,354 +1,365 @@
-$('[data-toggle="popover"]').popover();
-
-calculateFirmTotal();
-
-calculateFirmRemain();
-
-var $order = $('#order');
-
-var $preorder = $('#preorder');
-
-var delOrderItem = function (item_id) {
- $.ajax({
- url: '/basket/delete_item',
- data: {
- 'item_id': item_id
- },
- type: "POST",
- dataType: 'json',
- success: function () {
- },
- error: function (e) {
- console.error(e);
- }
- });
-};
-
-var delPreOrderItem = function (item_id) {
- $.ajax({
- url: '/dealer/delete_preorder_item',
- data: {
- 'item_id': item_id
- },
- type: "POST",
- dataType: 'json',
- success: function () {
- },
- error: function (e) {
- console.error(e);
- }
- });
-};
-
-var addOrderItem = function (item_id, count_items) {
- $.ajax({
- url: '/basket/add_item',
- data: {
- 'item_id': item_id,
- 'count_items': count_items
- },
- type: "POST",
- success: function () {
- },
- error: function (e) {
- console.error(e);
- }
- });
-};
-
-$('body, .popup_window').on('click', '.delete_but', function (e) {
- e.preventDefault();
- var $table_parent = $(this).parent().parent().parent();
- var $item = $(this).parent().parent();
- if ($item.attr('data-status') == 'order')
- delOrderItem($item.attr('data-id'));
- else
- delPreOrderItem($item.attr('data-id'));
- $item.remove();
- calculateTotalPrice($table_parent);
- calculateFirmTotal();
- calculateFirmRemain();
-});
-
-
-$('body, .popup_window').on('click', ".minus_button", function (e) {
- e.preventDefault();
- var $item = $(this).parents('.table_line');
- var $item_num = $(this).parent().find(".item_num");
- var a = $item_num.val();
- if (a != 1) {
- $item_num.val(--a);
- change_count_basket($item.data('id'), a);
- calculateSumPrice($item_num);
- calculateFirmTotal();
- calculateFirmRemain();
- }
-});
-
-$('body, .popup_window').on('click', ".plus_button", function (e) {
- e.preventDefault();
- var $item = $(this).parents('.table_line');
- var $item_num = $(this).parent().find(".item_num");
- var a = $item_num.val();
- $item_num.val(++a);
- change_count_basket($item.data('id'), a);
- calculateSumPrice($item_num);
- calculateFirmTotal();
- calculateFirmRemain();
-
-});
-
-$('body, .popup_window').on('change', '.item_num', function (e) {
- e.preventDefault();
- var $item = $(this).parents('.table_line');
- var a = $(this).val();
- change_count_basket($item.data('id'), a);
- calculateSumPrice($(this));
- calculateFirmTotal();
- calculateFirmRemain();
-});
-
-$(".last_order").click(function () {
- if ($(this).find("span").hasClass("arrow_down")) {
- $(this).find("span").removeClass("arrow_down").addClass("arrow_up");
- $(".last_order_block").removeClass("hidden");
- }
- else {
- $(this).find("span").removeClass("arrow_up").addClass("arrow_down");
- $(".last_order_block").addClass("hidden");
- }
-});
-
-$("#checkbox_all").change(function () {
- if ($(this).prop('checked')) {
- $('.single_checkbox').prop('checked', true);
- } else {
- $('.single_checkbox').prop('checked', false);
- }
-});
-
-$('.product_price').click(function (e) {
- e.preventDefault();
- $('.product_price').removeClass('activepr');
- $(this).addClass('activepr');
- var action_id = $(this).attr('data-id');
- getActionDiscount(action_id);
- calculateFirmRemain();
-});
-
-$('#add_to_order').click(function (e) {
- e.preventDefault();
- $('input[name]:checked').each(function () {
- var $item = $(this).parent().parent().detach();
- delPreOrderItem($item.attr('data-id'));
- addOrderItem($item.attr('data-id'), $item.find('.item_num').val());
- $item.find('.nopdrgt').removeClass('nopdrgt pdglt15');
- $item.find('input[type=checkbox]').parent().remove();
- $item.find('.count1').removeClass('count1');
- $item.attr('data-status', 'order');
-
- var $last = $('.table_line').last();
- $last.before($item);
- });
- calculateTotalPrice($order);
- calculateTotalPrice($preorder);
- calculateFirmTotal();
- calculateFirmRemain();
-});
-
-
-function getActionDiscount(action_id) {
- $.ajax({
- url: '/ajax/action_discount/' + action_id,
- dataType: 'html',
- success: function (data) {
- $('.actions').empty();
- $('.actions').html(data);
- },
- error: function (e) {
- console.error(e.data);
- }
- });
-}
-
-function calculateSumPrice($item_num) {
- var $table_line = $item_num.parents(".table_line");
- var price_per_unit = $table_line.find('.price_per_unit span').text();
- var sum = parseFloat(price_per_unit * $item_num.val()).toFixed(2);
- $table_line.find('.sum_price span').text(sum);
- calculateTotalPrice($table_line.parent());
-}
-
-function calculateTotalPrice($parent) {
- var sums = $parent.find('.sum_price span').get();
- var total = 0;
- $.each(sums, function (k, v) {
- total += +v.textContent;
- });
- //for reusability
- var $total_price = $parent.find('#total_price span').length ? $parent.find('#total_price span') : $('#total_price span');
- $total_price.text(total.toFixed(2));
-}
-
-function calculateFirmTotal() {
- var $table_lines = $('#order .table_line');
- var firm_sum = 0;
- $.each($table_lines, function (index, val) {
- if ($(val).attr('data-firm') == 'true') {
- firm_sum += +$(val).find('.sum_price span').text();
- }
- });
- $('#firm_total').find('span').text(firm_sum.toFixed(2));
-}
-
-function calculateFirmRemain() {
- var total = +$('#firm_total').find('span').text();
- var activepr = $('.activepr').find('span').text();
- var remain = activepr - total;
- if (remain < 0)
- remain = 0;
- $('#firm_remain').find('span').text(remain);
-}
-
-$('.popup_window').on('click', '.basket_element_prepack .group_sizes', function(event){
- event.preventDefault();
- if(!$(this).hasClass('active')) {
- var $packing_block = $(this).parent();
- var $element = $packing_block.parent();
- var $prev = $packing_block.find('.group_sizes.active');
- $prev.removeClass('active');
- $(this).addClass('active');
- var item_id = $(this).data('item_id');
- $.ajax({
- url: '/change_with_size',
- dataType: 'json',
- method: 'POST',
- data :
- {
- 'item_id' : item_id
- },
- success: function(data){
- var $item_num = $element.find('.item_num');
- delOrderItem($prev.data('item_id'));
- add_to_basket(item_id, $item_num.val());
- $element.find('.price_per_unit span').text(data['price']);
- calculateSumPrice($item_num);
- },
- error: function(e){
- console.error(e);
- }
- });
- }
-});
-
-
-//popup window
-var getCartItems = function() {
- $.ajax({
- url: '/basket/get_cart_items',
- dataType: 'json',
-
- success: function (data) {
-
- var html = '';
- for (var i = 0; i < data['items'].length; i++) {
-
- var cover = data['items'][i].cover;
- html += ''
- + '
' + data['items'][i].title
- + '
'
- + '
'
- + '
';
- for(var j = 0; j < data['items'][i]['group_sizes'].length; j++) {
- var size = data['items'][i]['group_sizes'][j]['size'];
- html += '
'
- + ''
- + '' + data['items'][i]['group_sizes'][j]['size'] + ' '
- +' ';
- if(data['items'][i]['group_sizes'][j+1] === undefined || size === data['items'][i]['group_sizes'][j+1]['size'])
- break;
- }
- html += '
'
- + '
' + data['items'][i].price + ' грн. '
- + '
'
- + '
'
- + '
'
- + '
'
- + '
'
- + '
' + data['items'][i].total_price + ' грн. '
- + '
'
- + '
';
- }
-
- $('.summary_price .sum').text(data.total_price);
- $('.basket_block_content').html(html);
- $(".popup").animate({opacity: "show", display: "block"}, 300);
- $(".popup_window").animate({marginTop: "5%", width: "1000px"}, 120);
-
- },
-
- error: function (err) {
- document.write(err.responseText);
- }
- });
-};
-
-var popup = function () {
-
- function closePopup() {
- $(".popup_window").animate({marginTop: "0.6in", width: "500px"}, 120);
- $(".popup").animate({opacity: "hide", display: "none"}, 300);
- }
- $(".cont_shop_but, .popup_close_button").click(function (e) {
- e.preventDefault();
- closePopup();
- });
-
- $('.popup').click(function() {
- closePopup();
- });
-
- $('.popup_window').click(function(e) {
- e.stopPropagation();
- });
-
- $(document).on('click', '.buy', function (e) {
- e.preventDefault();
- var $parent = $(this).parents('.product, .item_content');
- var group_id = $(this).data('group_id');
- var item_id = $parent.find('.active').data('item_id');
- var count_items = $parent.find('input').val();
-
- $.ajax({
- url : '/ajax/get_item_group',
- method: 'POST',
- dataType: 'json',
- data: {
- 'group_id': group_id,
- 'item_id' : item_id
- },
- success: function(item) {
- console.log('item_id ' + item['id']);
- add_to_basket(item['id'], count_items || 1, getCartItems);
- },
- error: function(error) {
- console.error(error);
- document.write(error.responseText);
- }
- });
-
- });
-
- $('#help').click(function(e){
- e.preventDefault();
- videoConfirm(function(){});
- });
-
-};
-
-popup();
+$('[data-toggle="popover"]').popover();
+
+calculateFirmTotal();
+
+calculateFirmRemain();
+
+var $order = $('#order');
+
+var $preorder = $('#preorder');
+
+var delOrderItem = function (item_id) {
+ $.ajax({
+ url: '/basket/delete_item',
+ data: {
+ 'item_id': item_id
+ },
+ type: "POST",
+ dataType: 'json',
+ success: function () {
+ },
+ error: function (e) {
+ console.error(e);
+ }
+ });
+};
+
+var delPreOrderItem = function (item_id) {
+ $.ajax({
+ url: '/dealer/delete_preorder_item',
+ data: {
+ 'item_id': item_id
+ },
+ type: "POST",
+ dataType: 'json',
+ success: function () {
+ },
+ error: function (e) {
+ console.error(e);
+ }
+ });
+};
+
+var addOrderItem = function (item_id, count_items) {
+ $.ajax({
+ url: '/basket/add_item',
+ data: {
+ 'item_id': item_id,
+ 'count_items': count_items
+ },
+ type: "POST",
+ success: function () {
+ },
+ error: function (e) {
+ console.error(e);
+ }
+ });
+};
+
+$('body, .popup_window').on('click', '.delete_but', function (e) {
+ e.preventDefault();
+ var $table_parent = $(this).parent().parent().parent();
+ var $item = $(this).parent().parent();
+ if ($item.attr('data-status') == 'order')
+ delOrderItem($item.attr('data-id'));
+ else
+ delPreOrderItem($item.attr('data-id'));
+ $item.remove();
+ calculateTotalPrice($table_parent);
+ calculateFirmTotal();
+ calculateFirmRemain();
+});
+
+
+$('body, .popup_window').on('click', ".minus_button", function (e) {
+ e.preventDefault();
+ var $item = $(this).parents('.table_line');
+ var $item_num = $(this).parent().find(".item_num");
+ var a = $item_num.val();
+ if (a != 1) {
+ $item_num.val(--a);
+ change_count_basket($item.data('id'), a);
+ calculateSumPrice($item_num);
+ calculateFirmTotal();
+ calculateFirmRemain();
+ }
+});
+
+$('body, .popup_window').on('click', ".plus_button", function (e) {
+ e.preventDefault();
+ var $item = $(this).parents('.table_line');
+ var $item_num = $(this).parent().find(".item_num");
+ var a = $item_num.val();
+ $item_num.val(++a);
+ change_count_basket($item.data('id'), a);
+ calculateSumPrice($item_num);
+ calculateFirmTotal();
+ calculateFirmRemain();
+
+});
+
+$('body, .popup_window').on('change', '.item_num', function (e) {
+ e.preventDefault();
+ var $item = $(this).parents('.table_line');
+ var a = $(this).val();
+ change_count_basket($item.data('id'), a);
+ calculateSumPrice($(this));
+ calculateFirmTotal();
+ calculateFirmRemain();
+});
+
+$(".last_order").click(function () {
+ if ($(this).find("span").hasClass("arrow_down")) {
+ $(this).find("span").removeClass("arrow_down").addClass("arrow_up");
+ $(".last_order_block").removeClass("hidden");
+ }
+ else {
+ $(this).find("span").removeClass("arrow_up").addClass("arrow_down");
+ $(".last_order_block").addClass("hidden");
+ }
+});
+
+$("#checkbox_all").change(function () {
+ if ($(this).prop('checked')) {
+ $('.single_checkbox').prop('checked', true);
+ } else {
+ $('.single_checkbox').prop('checked', false);
+ }
+});
+
+$('.product_price').click(function (e) {
+ e.preventDefault();
+ $('.product_price').removeClass('activepr');
+ $(this).addClass('activepr');
+ var action_id = $(this).attr('data-id');
+ getActionDiscount(action_id);
+ calculateFirmRemain();
+});
+
+$('#add_to_order').click(function (e) {
+ e.preventDefault();
+ $('input[name]:checked').each(function () {
+ var $item = $(this).parent().parent().detach();
+ delPreOrderItem($item.attr('data-id'));
+ addOrderItem($item.attr('data-id'), $item.find('.item_num').val());
+ $item.find('.nopdrgt').removeClass('nopdrgt pdglt15');
+ $item.find('input[type=checkbox]').parent().remove();
+ $item.find('.count1').removeClass('count1');
+ $item.attr('data-status', 'order');
+
+ var $last = $('.table_line').last();
+ $last.before($item);
+ });
+ calculateTotalPrice($order);
+ calculateTotalPrice($preorder);
+ calculateFirmTotal();
+ calculateFirmRemain();
+});
+
+
+function getActionDiscount(action_id) {
+ $.ajax({
+ url: '/ajax/action_discount/' + action_id,
+ dataType: 'html',
+ success: function (data) {
+ $('.actions').empty();
+ $('.actions').html(data);
+ },
+ error: function (e) {
+ console.error(e.data);
+ }
+ });
+}
+
+function calculateSumPrice($item_num) {
+ var $table_line = $item_num.parents(".table_line");
+ var price_per_unit = $table_line.find('.price_per_unit span').text();
+ var sum = parseFloat(price_per_unit * $item_num.val()).toFixed(2);
+ $table_line.find('.sum_price span').text(sum);
+ calculateTotalPrice($table_line.parent());
+}
+
+function calculateTotalPrice($parent) {
+ var sums = $parent.find('.sum_price span').get();
+ var total = 0;
+ $.each(sums, function (k, v) {
+ total += +v.textContent;
+ });
+ //for reusability
+ var $total_price = $parent.find('#total_price span').length ? $parent.find('#total_price span') : $('#total_price span');
+ $total_price.text(total.toFixed(2));
+}
+
+function calculateFirmTotal() {
+ var $table_lines = $('#order .table_line');
+ var firm_sum = 0;
+ $.each($table_lines, function (index, val) {
+ if ($(val).attr('data-firm') == 'true') {
+ firm_sum += +$(val).find('.sum_price span').text();
+ }
+ });
+ $('#firm_total').find('span').text(firm_sum.toFixed(2));
+}
+
+function calculateFirmRemain() {
+ var total = +$('#firm_total').find('span').text();
+ var activepr = $('.activepr').find('span').text();
+ var remain = activepr - total;
+ if (remain < 0)
+ remain = 0;
+ $('#firm_remain').find('span').text(remain);
+}
+
+$('.popup_window').on('click', '.basket_element_prepack .group_sizes', function(event){
+ event.preventDefault();
+ if(!$(this).hasClass('active')) {
+ var $packing_block = $(this).parent();
+ var $element = $packing_block.parent();
+ var $prev = $packing_block.find('.group_sizes.active');
+ $prev.removeClass('active');
+ $(this).addClass('active');
+ var item_id = $(this).data('item_id');
+ $.ajax({
+ url: '/change_with_size',
+ dataType: 'json',
+ method: 'POST',
+ data :
+ {
+ 'item_id' : item_id
+ },
+ success: function(data){
+ var $item_num = $element.find('.item_num');
+ delOrderItem($prev.data('item_id'));
+ add_to_basket(item_id, $item_num.val());
+ $element.find('.price_per_unit span').text(data['price']);
+ calculateSumPrice($item_num);
+ },
+ error: function(e){
+ console.error(e);
+ }
+ });
+ }
+});
+
+
+//popup window
+var getCartItems = function() {
+ $.ajax({
+ url: '/basket/get_cart_items',
+ dataType: 'json',
+
+ success: function (data) {
+
+ var html = '';
+ for (var i = 0; i < data['items'].length; i++) {
+
+ var cover = data['items'][i].cover;
+ html += ''
+ + '
' + data['items'][i].title
+ + '
'
+ + '
'
+ + '
';
+ for(var j = 0; j < data['items'][i]['group_sizes'].length; j++) {
+ var size = data['items'][i]['group_sizes'][j]['size'];
+ html += '
'
+ + ''
+ + '' + data['items'][i]['group_sizes'][j]['size'] + ' '
+ +' ';
+ if(data['items'][i]['group_sizes'][j+1] === undefined || size === data['items'][i]['group_sizes'][j+1]['size'])
+ break;
+ }
+ html += '
'
+ + '
' + data['items'][i].price + ' грн. '
+ + '
'
+ + '
'
+ + '
'
+ + '
'
+ + '
'
+ + '
' + data['items'][i].total_price + ' грн. '
+ + '
'
+ + '
';
+ }
+ var html_mobile = '';
+ for (var i = 0; i < data['items'].length; i++) {
+ var cover = data['items'][i].cover;
+ html_mobile += '' + '
' + '
' + data['items'][i].title + '
' + '
' + '
' + data['items'][i].price + ' грн. ' + '
' + '
' + '
' + '
' + '
' + '
' + data['items'][i].total_price + ' грн. ' + '
' + '
';
+ for (var j = 0; j < data['items'][i]['group_sizes'].length; j++) {
+ var size = data['items'][i]['group_sizes'][j]['size'];
+ html_mobile += '
' + '' + '' + data['items'][i]['group_sizes'][j]['size'] + ' ' + ' ';
+ if (data['items'][i]['group_sizes'][j + 1] === undefined || size === data['items'][i]['group_sizes'][j + 1]['size']) break;
+ }
+ html_mobile += '
' + '
';
+ }
+ $('.summary_price .sum').text(data.total_price);
+ $('.basket_block_content').html(html);
+ $('.basket_block_content_html_mobile').html(html_mobile);
+ $(".popup").animate({opacity: "show", display: "block"}, 300);
+ $(".popup_window").animate({marginTop: "5%", width: "1000px"}, 120);
+
+ },
+
+ error: function (err) {
+ document.write(err.responseText);
+ }
+ });
+};
+
+var popup = function () {
+
+ function closePopup() {
+ $(".popup_window").animate({marginTop: "0.6in", width: "500px"}, 120);
+ $(".popup").animate({opacity: "hide", display: "none"}, 300);
+ }
+ $(".cont_shop_but, .popup_close_button").click(function (e) {
+ e.preventDefault();
+ closePopup();
+ });
+
+ $('.popup').click(function() {
+ closePopup();
+ });
+
+ $('.popup_window').click(function(e) {
+ e.stopPropagation();
+ });
+
+ $(document).on('click', '.buy', function (e) {
+ e.preventDefault();
+ var $parent = $(this).parents('.product, .item_content');
+ var group_id = $(this).data('group_id');
+ var item_id = $parent.find('.active').data('item_id');
+ var count_items = $parent.find('input').val();
+
+ $.ajax({
+ url : '/ajax/get_item_group',
+ method: 'POST',
+ dataType: 'json',
+ data: {
+ 'group_id': group_id,
+ 'item_id' : item_id
+ },
+ success: function(item) {
+ console.log('item_id ' + item['id']);
+ add_to_basket(item['id'], count_items || 1, getCartItems);
+ },
+ error: function(error) {
+ console.error(error);
+ document.write(error.responseText);
+ }
+ });
+
+ });
+
+ $('#help').click(function(e){
+ e.preventDefault();
+ videoConfirm(function(){});
+ });
+
+};
+
+popup();
diff --git a/www/images/art_web_logo.png b/www/images/art_web_logo.png
index a1633d5..663f8c3 100644
Binary files a/www/images/art_web_logo.png and b/www/images/art_web_logo.png differ
diff --git a/www/images/asd_ua_01.png b/www/images/asd_ua_01.png
index 02b1edd..e9868e4 100644
Binary files a/www/images/asd_ua_01.png and b/www/images/asd_ua_01.png differ
diff --git a/www/images/check.png b/www/images/check.png
index 40945ad..cc931ec 100644
Binary files a/www/images/check.png and b/www/images/check.png differ
diff --git a/www/images/content_arrow_left.png b/www/images/content_arrow_left.png
index b46a869..cdc365e 100644
Binary files a/www/images/content_arrow_left.png and b/www/images/content_arrow_left.png differ
diff --git a/www/images/content_arrow_right.png b/www/images/content_arrow_right.png
index 58ca331..42cf133 100644
Binary files a/www/images/content_arrow_right.png and b/www/images/content_arrow_right.png differ
diff --git a/www/images/logo.png b/www/images/logo.png
index d043a87..8e5651e 100644
Binary files a/www/images/logo.png and b/www/images/logo.png differ
diff --git a/www/images/new.png b/www/images/new.png
index f4b555d..201a21c 100644
Binary files a/www/images/new.png and b/www/images/new.png differ
diff --git a/www/images/shadow.png b/www/images/shadow.png
index afeb8e1..9131a1c 100644
Binary files a/www/images/shadow.png and b/www/images/shadow.png differ
diff --git a/www/images/up.png b/www/images/up.png
index a9f00dd..0ca18cb 100644
Binary files a/www/images/up.png and b/www/images/up.png differ
diff --git a/www/images/video_play.png b/www/images/video_play.png
index b800f7c..fa54a2b 100644
Binary files a/www/images/video_play.png and b/www/images/video_play.png differ
--
libgit2 0.21.4