--

Karnovsky A
1 parent fe81463c
Showing 24 changed files with 36 additions and 39 deletions Show diff stats
backend/controllers/BrandController.php
backend/views/brand/_form.php
common/components/artboximage/ArtboxImage.php
common/config/main.php
common/modules/product/models/Brand.php
frontend/views/catalog/product_item.php
frontend/web/images/products/1305887984-2604-2605.jpg
frontend/web/images/products/1348483804-512-2445.jpg
frontend/web/images/products/1348484212-3723-3585.jpg
frontend/web/images/products/1348484611-4020-7396.jpg
frontend/web/images/products/1348485104-4555-7650.jpg
frontend/web/images/products/1348487239-495-4299.jpg
frontend/web/images/products/1348487515-4424-1546.jpg
frontend/web/images/products/1348489125-7133-6866.jpg
frontend/web/images/products/1348489542-702-5816.jpg
frontend/web/images/products/1348490194-360-284.jpg
frontend/web/images/products/1348490344-6421-5352.jpg
frontend/web/images/products/1348490519-4780-1400.jpg
frontend/web/images/products/1348492885-9127-2291.jpg
frontend/web/images/products/1366971036-9093-9799.jpg
@@ -98,6 +98,11 @@ class BrandController extends Controller
     {
         $model = $this->findModel($id);
+        var_dump($_POST);
+        print "\n+++++++++++++++++++++++++++++++++++++\n";
+        var_dump($_FILES);
+        exit;
+
         if ($model->load(Yii::$app->request->post()) && $model->save()) {
             return $this->redirect(['view', 'id' => $model->brand_id]);
         } else {
@@ -10,26 +10,15 @@ use yii\widgets\ActiveForm;
 <div class="brand-form">
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin([
+        'options' => ['enctype' => 'multipart/form-data']
+    ]); ?>
     <?= $form->field($model, 'name')->textInput() ?>
     <?= $form->field($model, 'alias')->textInput(['maxlength' => true]) ?>
-    <?= \common\modules\file\widgets\ImageUploader::widget([
-        'model'=> $model,
-        'field'=>'image',
-        'size' => [
-            [
-                'width'=>102,
-                'height'=>57,
-            ]
-        ],
-        'multi'=>false,
-        'gallery' => $model->image,
-        'name' => 'Загрузить изображение'
-    ]);
-    ?>
+    <?= \common\components\artboximage\ArtboxImageHelper::fileinputWidget($model, 'imageUrl');?>
     <?= $form->field($model, 'meta_title')->textInput(['maxlength' => true]) ?>
@@ -28,7 +28,7 @@ class ArtboxImage extends Component {
         'bmp' => 'bmp',
     ];
-    public $uploadUrl = '/admin/artboxfile/action/upload';
+    public $uploadUrl = '@web/artboxfile/action/upload';
     public function load($file = null, $driver = null) {
         if(empty($file) || !realpath($file)) {
@@ -37,7 +37,8 @@ class ArtboxImage extends Component {
         return Image::factory($file, $driver ? $driver : $this->driver);
     }
-    public function fileinputWidget($model, $modelField, $formField = 'fileUpload', $multiple = false, $imageOnly = true) {
+    public function fileinputWidget($model, $modelField = 'file', $formField = 'fileUpload', $multiple = false, $imageOnly = true) {
+        $uploadUrl = Yii::getAlias($this->uploadUrl);
         $options = [
             'multiple' => $multiple,
         ];
@@ -54,7 +55,7 @@ class ArtboxImage extends Component {
                 'overwriteInitial' => !$multiple,
                 'showRemove' => true,
                 'showUpload' => false,
-                'uploadUrl' => $this->uploadUrl,
+                'uploadUrl' => $uploadUrl,
                 'uploadExtraData' => [
                     'fileField' => $modelField,
                     'multiple' => intval($multiple),
@@ -130,8 +130,11 @@ return [
     ],
     'modules' => [
-        'file' => [
-            'class' => 'common\modules\file\Module',
+//        'file' => [
+//            'class' => 'common\modules\file\Module',
+//        ],
+        'artboxfile' => [
+            'class' => 'common\modules\artboxfile\Module',
         ],
         'relation' => [
             'class' => 'common\modules\relation\Module',
@@ -10,7 +10,7 @@ use Yii;
  * This is the model class for table "brand".
  *
  * @property integer $brand_id
- * @property string $remote_id
+
  * @property integer $brand_name_id
  * @property string $alias
  * @property string $image
@@ -67,7 +67,6 @@ class Brand extends \yii\db\ActiveRecord
             [['alias', 'name'], 'string', 'max' => 250],
             [['image', 'meta_title'], 'string', 'max' => 255],
             [['meta_robots'], 'string', 'max' => 50],
-            [['remote_id'], 'string', 'max' => 25],
             [['imageUpload'], 'safe'],
             [['imageUpload'], 'file', 'extensions' => 'jpg, gif, png'],
 //            [['brand_name_id'], 'exist', 'skipOnError' => true, 'targetClass' => BrandName::className(), 'targetAttribute' => ['brand_name_id' => 'brand_name_id']],
@@ -90,7 +89,6 @@ class Brand extends \yii\db\ActiveRecord
             'meta_desc' => Yii::t('product', 'Meta Desc'),
             'meta_robots' => Yii::t('product', 'Meta Robots'),
             'seo_text' => Yii::t('product', 'Seo Text'),
-            'remote_id' => Yii::t('product', '1C brand name'),
         ];
     }
@@ -5,17 +5,23 @@ use yii\helpers\Url;
 <li class="item">
     <div class="boxitem">
         <div class="pixbox">
-            <a href="<?= Url::to([
-                'catalog/product',
-                'product' => $product])
-            ?>">
-                <?php if (empty($product->image)) :?>
-                    <img src="/img/no_photo.png">
-                <?php else :?>
-                    <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->image->imageUrl, 'list')?>
-                <?php endif?>
+            <a href="<?= Url::to(['catalog/product', 'product' => $product])?>">
+                <?= \common\components\artboximage\ArtboxImageHelper::getImage($product->imageUrl, 'list')?>
             </a>
         </div>
+        <?php if(!empty($product->is_top) || !empty($product->is_new) || !empty($product->akciya)) :?>
+        <ul class="product-special">
+            <?php if(!empty($product->is_top)) :?>
+                <li class="top">top&nbsp;</li>
+            <?php endif?>
+            <?php if(!empty($product->is_new)) :?>
+                <li class="new">new&nbsp;</li>
+            <?php endif?>
+            <?php if(!empty($product->akciya)) :?>
+                <li class="promo">promo&nbsp;</li>
+            <?php endif?>
+        </ul>
+        <?php endif?>
         <a href="<?= Url::to([
             'catalog/product',
             'product' => $product])
@@ -46,16 +52,11 @@ use yii\helpers\Url;
     <div class="mycarousel">
         <ul class="jcarousel jcarousel-skin-tango">
             <?php foreach ($product->variants as $variant) : ?>
-                <?php if (!empty($variant->image)) :?>
                 <li>
-                    <a href="<?= Url::to([
-                        'catalog/product',
-                        'product' => $product,
-                        '#' => 'm' . $variant->product_variant_id]) ?>">
-                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->image->imageUrl, 'product_variant')?>
+                    <a href="<?= Url::to(['catalog/product', 'product' => $product, '#' => 'm' . $variant->product_variant_id]) ?>">
+                        <?= \common\components\artboximage\ArtboxImageHelper::getImage($variant->imageUrl, 'product_variant')?>
                     </a>
                 </li>
-                <?php endif; ?>
             <?php endforeach; ?>
         </ul>
     </div>