From 70412c76fe602507543bd02c4a1afb6ad08a2075 Mon Sep 17 00:00:00 2001
From: Vitaliy <dockdep@gmail.com>
Date: Mon, 11 Jul 2016 14:24:37 +0300
Subject: [PATCH] 29.06.16

---
 .htaccess                                      | 120 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------
 common/modules/product/views/variant/_form.php |  33 +++++++++++++++++++++++++++++++++
 2 files changed, 93 insertions(+), 60 deletions(-)

diff --git a/.htaccess b/.htaccess
index 26e03f9..4fb5ddf 100755
--- a/.htaccess
+++ b/.htaccess
@@ -105,63 +105,63 @@ AddDefaultCharset utf-8
 
 # кеширование в браузере на стороне пользователя
 
-<IfModule mod_expires.c>
- ExpiresActive On
- ExpiresDefault "access 7 days"
- ExpiresByType application/javascript "access plus 1 year"
- ExpiresByType text/javascript "access plus 1 year"
- ExpiresByType text/css "access plus 1 year"
- ExpiresByType text/html "access plus 7 day"
- ExpiresByType text/x-javascript "access 1 year"
- ExpiresByType image/gif "access plus 1 year"
- ExpiresByType image/jpeg "access plus 1 year"
- ExpiresByType image/png "access plus 1 year"
- ExpiresByType image/jpg "access plus 1 year"
- ExpiresByType image/x-icon "access 1 year"
- ExpiresByType application/x-shockwave-flash "access 1 year"
- </IfModule>
-<IfModule mod_deflate.c>
-AddOutputFilterByType DEFLATE text/plain
-AddOutputFilterByType DEFLATE text/html
-AddOutputFilterByType DEFLATE text/xml
-AddOutputFilterByType DEFLATE text/css
-AddOutputFilterByType DEFLATE application/xml
-AddOutputFilterByType DEFLATE application/xhtml+xml
-AddOutputFilterByType DEFLATE application/rss+xml
-AddOutputFilterByType DEFLATE application/javascript
-AddOutputFilterByType DEFLATE application/x-javascript
-BrowserMatch ^Mozilla/4 gzip-only-text/html
-BrowserMatch ^Mozilla/4\.0[678] no-gzip
-BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
-Header append Vary User-Agent
-RewriteEngine On
-AddEncoding gzip .gz
-RewriteCond %{HTTP:Accept-encoding} gzip
-RewriteCond %{REQUEST_FILENAME}.gz -f
-RewriteRule ^(.*)$ $1.gz [QSA,L]
-</IfModule>
-# Cache-Control
-<ifModule mod_headers.c>
-# 30 дней
-    <filesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|swf)$">
-    Header set Cache-Control "max-age=2592000, public"
-    </filesMatch>
-    # 30 дней
-    <filesMatch "\.(css|js)$">
-    Header set Cache-Control "max-age=2592000, public"
-    </filesMatch>
-    # 2 дня
-    <filesMatch "\.(xml|txt)$">
-    Header set Cache-Control "max-age=172800, public, must-revalidate"
-    </filesMatch>
-    # 1 день
-    <filesMatch "\.(html|htm|php)$">
-    Header set Cache-Control "max-age=172800, private, must-revalidate"
-    </filesMatch>
-</ifModule>
-
-#Запрет отдачи HTTP-заголовков Vary браузерам семейства MSIE
-<IfModule mod_setenvif.c>
-BrowserMatch "MSIE" force-no-vary
-BrowserMatch "Mozilla/4.[0-9]{2}" force-no-vary
-</IfModule>
\ No newline at end of file
+#<IfModule mod_expires.c>
+# ExpiresActive On
+# ExpiresDefault "access 7 days"
+# ExpiresByType application/javascript "access plus 1 year"
+# ExpiresByType text/javascript "access plus 1 year"
+# ExpiresByType text/css "access plus 1 year"
+# ExpiresByType text/html "access plus 7 day"
+# ExpiresByType text/x-javascript "access 1 year"
+# ExpiresByType image/gif "access plus 1 year"
+# ExpiresByType image/jpeg "access plus 1 year"
+# ExpiresByType image/png "access plus 1 year"
+# ExpiresByType image/jpg "access plus 1 year"
+# ExpiresByType image/x-icon "access 1 year"
+# ExpiresByType application/x-shockwave-flash "access 1 year"
+# </IfModule>
+#<IfModule mod_deflate.c>
+#AddOutputFilterByType DEFLATE text/plain
+#AddOutputFilterByType DEFLATE text/html
+#AddOutputFilterByType DEFLATE text/xml
+#AddOutputFilterByType DEFLATE text/css
+#AddOutputFilterByType DEFLATE application/xml
+#AddOutputFilterByType DEFLATE application/xhtml+xml
+#AddOutputFilterByType DEFLATE application/rss+xml
+#AddOutputFilterByType DEFLATE application/javascript
+#AddOutputFilterByType DEFLATE application/x-javascript
+#BrowserMatch ^Mozilla/4 gzip-only-text/html
+#BrowserMatch ^Mozilla/4\.0[678] no-gzip
+#BrowserMatch \bMSIE !no-gzip !gzip-only-text/html
+#Header append Vary User-Agent
+#RewriteEngine On
+#AddEncoding gzip .gz
+#RewriteCond %{HTTP:Accept-encoding} gzip
+#RewriteCond %{REQUEST_FILENAME}.gz -f
+#RewriteRule ^(.*)$ $1.gz [QSA,L]
+#</IfModule>
+## Cache-Control
+#<ifModule mod_headers.c>
+## 30 дней
+#    <filesMatch "\.(ico|pdf|flv|jpg|jpeg|png|gif|swf)$">
+#    Header set Cache-Control "max-age=2592000, public"
+#    </filesMatch>
+#    # 30 дней
+#    <filesMatch "\.(css|js)$">
+#    Header set Cache-Control "max-age=2592000, public"
+#    </filesMatch>
+#    # 2 дня
+#    <filesMatch "\.(xml|txt)$">
+#    Header set Cache-Control "max-age=172800, public, must-revalidate"
+#    </filesMatch>
+#    # 1 день
+#    <filesMatch "\.(html|htm|php)$">
+#    Header set Cache-Control "max-age=172800, private, must-revalidate"
+#    </filesMatch>
+#</ifModule>
+#
+##Запрет отдачи HTTP-заголовков Vary браузерам семейства MSIE
+#<IfModule mod_setenvif.c>
+#BrowserMatch "MSIE" force-no-vary
+#BrowserMatch "Mozilla/4.[0-9]{2}" force-no-vary
+#</IfModule>
\ No newline at end of file
diff --git a/common/modules/product/views/variant/_form.php b/common/modules/product/views/variant/_form.php
index d771b83..abcbf05 100644
--- a/common/modules/product/views/variant/_form.php
+++ b/common/modules/product/views/variant/_form.php
@@ -44,6 +44,39 @@ use kartik\select2\Select2;
         ],
     ]); ?>
 
+    <?= $form->field($model, 'variants')->widget(MultipleInput::className(), [
+        'columns' => [
+            [
+                'name'  => '',
+                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
+                'title' => Yii::t('product', 'Name'),
+            ],
+            [
+                'name'  => 'sku',
+                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
+                'title' => Yii::t('product', 'SKU'),
+            ],
+            [
+                'name'  => 'price',
+                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
+                'title' => Yii::t('product', 'Price'),
+            ],
+            [
+                'name'  => 'price_old',
+                'type'  => MultipleInputColumn::TYPE_TEXT_INPUT,
+                'title' => Yii::t('product', 'Old Price'),
+            ],
+            [
+                'name'  => 'product_unit_id',
+                'type'  => MultipleInputColumn::TYPE_DROPDOWN,
+                'title' => Yii::t('product', 'Unit'),
+                'items' => ArrayHelper::map(\common\modules\product\models\ProductUnit::find()->all(), 'product_unit_id', 'name'),
+            ],
+
+        ],
+    ]);
+    ?>
+
     <?= $form->field($model, 'product_unit_id')->dropDownList(
         ArrayHelper::map(\common\modules\product\models\ProductUnit::find()->all(), 'product_unit_id', 'name'),
         [
--
libgit2 0.21.4