From d737403096717d1f521165d8730aaea43dcd8b67 Mon Sep 17 00:00:00 2001
From: Yarik <yarik.nechyporuk@gmail.com>
Date: Thu, 4 May 2017 16:51:13 +0300
Subject: [PATCH] Basket

---
 backend/views/layouts/main.php                        |  2 +-
 backend/views/layouts/menu_items.php                  |  0
 backend/web/assets/.gitignore                         |  2 ++
 backend/web/js/galleryWidget.js                       |  0
 common/config/bootstrap.php                           |  3 +++
 common/images/13_kkl4mozaMJ8zPlIbqSp_Fn-QoYehLYXV.jpg | Bin 56751 -> 0 bytes
 common/images/3_QotMz-N2qttbYPDIacZFaogulUFKe1FX.jpg  | Bin 56751 -> 0 bytes
 common/images/4_GqOguExNaYGZG64YgbUEmec4xKKAKK8G.jpg  | Bin 77879 -> 0 bytes
 common/images/5_2sVxteui6Xv-mD4vlFCQK0G38FOgqUXO.jpg  | Bin 107701 -> 0 bytes
 common/images/6_nBM9N5_kUsjcCkVpJXuwwfWYnOt3N7Um.jpg  | Bin 78388 -> 0 bytes
 common/images/7_SFsnRpreGcM6YJceVbOeAJeJ5PZpxmmo.jpg  | Bin 65923 -> 0 bytes
 common/models/Newsletter.php                          |  0
 common/models/SearchForm.php                          |  0
 frontend/assets/AppAsset.php                          | 15 +--------------
 frontend/views/category/_product_item.php             |  0
 frontend/views/filter/index.php                       |  0
 frontend/views/layouts/_category_menu.php             |  0
 frontend/views/site/_slider_product.php               |  0
 frontend/views/special/category.php                   |  0
 frontend/views/special/index.php                      |  0
 frontend/web/css/style.css                            |  0
 frontend/web/img/Dell AIO 3263-400x400.jpg            | Bin 36424 -> 0 bytes
 frontend/web/img/cart-icon.png                        | Bin 537 -> 0 bytes
 frontend/web/img/check.png                            | Bin 15272 -> 0 bytes
 frontend/web/img/img1.jpg                             | Bin 82995 -> 0 bytes
 frontend/web/img/img2.jpg                             | Bin 61775 -> 0 bytes
 frontend/web/img/img3.jpg                             | Bin 49575 -> 0 bytes
 frontend/web/img/logo-default.png                     | Bin 49837 -> 0 bytes
 frontend/web/img/logo.gif                             | Bin 1779 -> 0 bytes
 frontend/widgets/LangLink.php                         |  0
 frontend/widgets/views/_langLink.php                  |  0
 initscript                                            |  0
 32 files changed, 7 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 backend/views/layouts/menu_items.php
 create mode 100644 backend/web/assets/.gitignore
 mode change 100644 => 100755 backend/web/js/galleryWidget.js
 mode change 100644 => 100755 common/images/13_kkl4mozaMJ8zPlIbqSp_Fn-QoYehLYXV.jpg
 mode change 100644 => 100755 common/images/3_QotMz-N2qttbYPDIacZFaogulUFKe1FX.jpg
 mode change 100644 => 100755 common/images/4_GqOguExNaYGZG64YgbUEmec4xKKAKK8G.jpg
 mode change 100644 => 100755 common/images/5_2sVxteui6Xv-mD4vlFCQK0G38FOgqUXO.jpg
 mode change 100644 => 100755 common/images/6_nBM9N5_kUsjcCkVpJXuwwfWYnOt3N7Um.jpg
 mode change 100644 => 100755 common/images/7_SFsnRpreGcM6YJceVbOeAJeJ5PZpxmmo.jpg
 mode change 100644 => 100755 common/models/Newsletter.php
 mode change 100644 => 100755 common/models/SearchForm.php
 mode change 100644 => 100755 frontend/views/category/_product_item.php
 mode change 100644 => 100755 frontend/views/filter/index.php
 mode change 100644 => 100755 frontend/views/layouts/_category_menu.php
 mode change 100644 => 100755 frontend/views/site/_slider_product.php
 mode change 100644 => 100755 frontend/views/special/category.php
 mode change 100644 => 100755 frontend/views/special/index.php
 mode change 100644 => 100755 frontend/web/css/style.css
 mode change 100644 => 100755 frontend/web/img/Dell AIO 3263-400x400.jpg
 mode change 100644 => 100755 frontend/web/img/cart-icon.png
 mode change 100644 => 100755 frontend/web/img/check.png
 mode change 100644 => 100755 frontend/web/img/img1.jpg
 mode change 100644 => 100755 frontend/web/img/img2.jpg
 mode change 100644 => 100755 frontend/web/img/img3.jpg
 mode change 100644 => 100755 frontend/web/img/logo-default.png
 mode change 100644 => 100755 frontend/web/img/logo.gif
 mode change 100644 => 100755 frontend/widgets/LangLink.php
 mode change 100644 => 100755 frontend/widgets/views/_langLink.php
 mode change 100644 => 100755 initscript

diff --git a/backend/views/layouts/main.php b/backend/views/layouts/main.php
index cb3cabe..7ea597e 100755
--- a/backend/views/layouts/main.php
+++ b/backend/views/layouts/main.php
@@ -137,7 +137,7 @@
                             
                             <ul class="nav navbar-nav navbar-right">
                                 <li class="">
-                                    <a href="javascript:;" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
+                                  <a href="" class="user-profile dropdown-toggle" data-toggle="dropdown" aria-expanded="false">
                                         <?php
                                             echo Html::img(
                                                 ( empty( $avatar ) ? 'http://placehold.it/128x128' : $avatar )
diff --git a/backend/views/layouts/menu_items.php b/backend/views/layouts/menu_items.php
old mode 100644
new mode 100755
index f91fad9..f91fad9
--- a/backend/views/layouts/menu_items.php
+++ b/backend/views/layouts/menu_items.php
diff --git a/backend/web/assets/.gitignore b/backend/web/assets/.gitignore
new file mode 100644
index 0000000..c96a04f
--- /dev/null
+++ b/backend/web/assets/.gitignore
@@ -0,0 +1,2 @@
+*
+!.gitignore
\ No newline at end of file
diff --git a/backend/web/js/galleryWidget.js b/backend/web/js/galleryWidget.js
old mode 100644
new mode 100755
index 6d47019..6d47019
--- a/backend/web/js/galleryWidget.js
+++ b/backend/web/js/galleryWidget.js
diff --git a/common/config/bootstrap.php b/common/config/bootstrap.php
index b1c9bb0..1ed6b12 100755
--- a/common/config/bootstrap.php
+++ b/common/config/bootstrap.php
@@ -9,4 +9,7 @@
     }
     if (!Yii::getAlias('@artbox/catalog', false)) {
         Yii::setAlias('@artbox/catalog', dirname(dirname(__DIR__)) . '/artweb/artbox-catalog');
+    }
+    if (!Yii::getAlias('@artbox/order', false)) {
+        Yii::setAlias('@artbox/order', dirname(dirname(__DIR__)) . '/artweb/artbox-order');
     }
\ No newline at end of file
diff --git a/common/images/13_kkl4mozaMJ8zPlIbqSp_Fn-QoYehLYXV.jpg b/common/images/13_kkl4mozaMJ8zPlIbqSp_Fn-QoYehLYXV.jpg
old mode 100644
new mode 100755
index ef352f1..ef352f1
Binary files a/common/images/13_kkl4mozaMJ8zPlIbqSp_Fn-QoYehLYXV.jpg and b/common/images/13_kkl4mozaMJ8zPlIbqSp_Fn-QoYehLYXV.jpg differ
diff --git a/common/images/3_QotMz-N2qttbYPDIacZFaogulUFKe1FX.jpg b/common/images/3_QotMz-N2qttbYPDIacZFaogulUFKe1FX.jpg
old mode 100644
new mode 100755
index ef352f1..ef352f1
Binary files a/common/images/3_QotMz-N2qttbYPDIacZFaogulUFKe1FX.jpg and b/common/images/3_QotMz-N2qttbYPDIacZFaogulUFKe1FX.jpg differ
diff --git a/common/images/4_GqOguExNaYGZG64YgbUEmec4xKKAKK8G.jpg b/common/images/4_GqOguExNaYGZG64YgbUEmec4xKKAKK8G.jpg
old mode 100644
new mode 100755
index 82f7b63..82f7b63
Binary files a/common/images/4_GqOguExNaYGZG64YgbUEmec4xKKAKK8G.jpg and b/common/images/4_GqOguExNaYGZG64YgbUEmec4xKKAKK8G.jpg differ
diff --git a/common/images/5_2sVxteui6Xv-mD4vlFCQK0G38FOgqUXO.jpg b/common/images/5_2sVxteui6Xv-mD4vlFCQK0G38FOgqUXO.jpg
old mode 100644
new mode 100755
index ee2e690..ee2e690
Binary files a/common/images/5_2sVxteui6Xv-mD4vlFCQK0G38FOgqUXO.jpg and b/common/images/5_2sVxteui6Xv-mD4vlFCQK0G38FOgqUXO.jpg differ
diff --git a/common/images/6_nBM9N5_kUsjcCkVpJXuwwfWYnOt3N7Um.jpg b/common/images/6_nBM9N5_kUsjcCkVpJXuwwfWYnOt3N7Um.jpg
old mode 100644
new mode 100755
index c5bc640..c5bc640
Binary files a/common/images/6_nBM9N5_kUsjcCkVpJXuwwfWYnOt3N7Um.jpg and b/common/images/6_nBM9N5_kUsjcCkVpJXuwwfWYnOt3N7Um.jpg differ
diff --git a/common/images/7_SFsnRpreGcM6YJceVbOeAJeJ5PZpxmmo.jpg b/common/images/7_SFsnRpreGcM6YJceVbOeAJeJ5PZpxmmo.jpg
old mode 100644
new mode 100755
index 0b0e38a..0b0e38a
Binary files a/common/images/7_SFsnRpreGcM6YJceVbOeAJeJ5PZpxmmo.jpg and b/common/images/7_SFsnRpreGcM6YJceVbOeAJeJ5PZpxmmo.jpg differ
diff --git a/common/models/Newsletter.php b/common/models/Newsletter.php
old mode 100644
new mode 100755
index 60a6b6c..60a6b6c
--- a/common/models/Newsletter.php
+++ b/common/models/Newsletter.php
diff --git a/common/models/SearchForm.php b/common/models/SearchForm.php
old mode 100644
new mode 100755
index 4a38f33..4a38f33
--- a/common/models/SearchForm.php
+++ b/common/models/SearchForm.php
diff --git a/frontend/assets/AppAsset.php b/frontend/assets/AppAsset.php
index 25c2018..697ef92 100755
--- a/frontend/assets/AppAsset.php
+++ b/frontend/assets/AppAsset.php
@@ -12,41 +12,28 @@
         public $basePath = '@webroot';
         public $baseUrl = '@web';
         public $css = [
-            //            'css/site.css', // -
             'css/animate.css',
-            // +
             'css/style.css',
-            // +
             //            'css/style.default.css', // -
             'css/owl.carousel.css',
-            // +
             'css/owl.theme.css',
-            // +
             '//fonts.googleapis.com/css?family=Roboto:400,100,100italic,300,300italic,500,700,800',
-            // +
             'css/custom.css',
-            // +
         ];
         public $js = [
             'js/jquery.cookie.js',
-            // +
             'js/waypoints.min.js',
-            // +
             'js/jquery.counterup.min.js',
-            // +
             'js/jquery.parallax-1.1.3.js',
-            // +
             'js/front.js',
-            // +
             'js/owl.carousel.min.js',
-            // +
             'js/script.js',
-            // -
         ];
         public $depends = [
             'yii\web\YiiAsset',
             'rmrevin\yii\fontawesome\AssetBundle',
             'yii\bootstrap\BootstrapPluginAsset',
+            'artbox\order\assets\BasketAsset',
         ];
     }
     
\ No newline at end of file
diff --git a/frontend/views/category/_product_item.php b/frontend/views/category/_product_item.php
old mode 100644
new mode 100755
index c8dfbee..c8dfbee
--- a/frontend/views/category/_product_item.php
+++ b/frontend/views/category/_product_item.php
diff --git a/frontend/views/filter/index.php b/frontend/views/filter/index.php
old mode 100644
new mode 100755
index b499365..b499365
--- a/frontend/views/filter/index.php
+++ b/frontend/views/filter/index.php
diff --git a/frontend/views/layouts/_category_menu.php b/frontend/views/layouts/_category_menu.php
old mode 100644
new mode 100755
index 200a9a4..200a9a4
--- a/frontend/views/layouts/_category_menu.php
+++ b/frontend/views/layouts/_category_menu.php
diff --git a/frontend/views/site/_slider_product.php b/frontend/views/site/_slider_product.php
old mode 100644
new mode 100755
index 3a193b0..3a193b0
--- a/frontend/views/site/_slider_product.php
+++ b/frontend/views/site/_slider_product.php
diff --git a/frontend/views/special/category.php b/frontend/views/special/category.php
old mode 100644
new mode 100755
index 2464811..2464811
--- a/frontend/views/special/category.php
+++ b/frontend/views/special/category.php
diff --git a/frontend/views/special/index.php b/frontend/views/special/index.php
old mode 100644
new mode 100755
index 687117d..687117d
--- a/frontend/views/special/index.php
+++ b/frontend/views/special/index.php
diff --git a/frontend/web/css/style.css b/frontend/web/css/style.css
old mode 100644
new mode 100755
index 382023e..382023e
--- a/frontend/web/css/style.css
+++ b/frontend/web/css/style.css
diff --git a/frontend/web/img/Dell AIO 3263-400x400.jpg b/frontend/web/img/Dell AIO 3263-400x400.jpg
old mode 100644
new mode 100755
index 3ae3361..3ae3361
Binary files a/frontend/web/img/Dell AIO 3263-400x400.jpg and b/frontend/web/img/Dell AIO 3263-400x400.jpg differ
diff --git a/frontend/web/img/cart-icon.png b/frontend/web/img/cart-icon.png
old mode 100644
new mode 100755
index 7d30835..7d30835
Binary files a/frontend/web/img/cart-icon.png and b/frontend/web/img/cart-icon.png differ
diff --git a/frontend/web/img/check.png b/frontend/web/img/check.png
old mode 100644
new mode 100755
index bb8a9d3..bb8a9d3
Binary files a/frontend/web/img/check.png and b/frontend/web/img/check.png differ
diff --git a/frontend/web/img/img1.jpg b/frontend/web/img/img1.jpg
old mode 100644
new mode 100755
index 73e3159..73e3159
Binary files a/frontend/web/img/img1.jpg and b/frontend/web/img/img1.jpg differ
diff --git a/frontend/web/img/img2.jpg b/frontend/web/img/img2.jpg
old mode 100644
new mode 100755
index 51183b3..51183b3
Binary files a/frontend/web/img/img2.jpg and b/frontend/web/img/img2.jpg differ
diff --git a/frontend/web/img/img3.jpg b/frontend/web/img/img3.jpg
old mode 100644
new mode 100755
index 30b5f2b..30b5f2b
Binary files a/frontend/web/img/img3.jpg and b/frontend/web/img/img3.jpg differ
diff --git a/frontend/web/img/logo-default.png b/frontend/web/img/logo-default.png
old mode 100644
new mode 100755
index 46eb442..46eb442
Binary files a/frontend/web/img/logo-default.png and b/frontend/web/img/logo-default.png differ
diff --git a/frontend/web/img/logo.gif b/frontend/web/img/logo.gif
old mode 100644
new mode 100755
index 4f9b43c..4f9b43c
Binary files a/frontend/web/img/logo.gif and b/frontend/web/img/logo.gif differ
diff --git a/frontend/widgets/LangLink.php b/frontend/widgets/LangLink.php
old mode 100644
new mode 100755
index 920de81..920de81
--- a/frontend/widgets/LangLink.php
+++ b/frontend/widgets/LangLink.php
diff --git a/frontend/widgets/views/_langLink.php b/frontend/widgets/views/_langLink.php
old mode 100644
new mode 100755
index 316d319..316d319
--- a/frontend/widgets/views/_langLink.php
+++ b/frontend/widgets/views/_langLink.php
diff --git a/initscript b/initscript
old mode 100644
new mode 100755
index f48086f..f48086f
--- a/initscript
+++ b/initscript
--
libgit2 0.21.4