bug fixing

backend/modules/business/views/business/_form.php

@@ -4,6 +4,7 @@ use yii\helpers\Html;
 use yii\widgets\ActiveForm;
 use common\widgets\PlacePicker\PlacePicker;
 use trntv\filekit\widget\Upload;
+use yii\web\JsExpression;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Business */
@@ -117,6 +118,7 @@ use trntv\filekit\widget\Upload;
                 [
                     'url' => ['/file-storage/upload'],
                     'maxFileSize' => 5000000, // 5 MiB
+                    'acceptFileTypes' => new JsExpression('/(\.|\/)(gif|jpe?g|png)$/i'),
                 ]);
             ?>
 

backend/modules/location/views/state/index.php

@@ -43,7 +43,7 @@ $this->params['breadcrumbs'][] = $this->title;
             // 'updated_at',
 
             ['class' => 'yii\grid\ActionColumn',
-                'template' => '{update}{delete}'],
+                'template' => '{update} {delete}'],
         ],
     ]); ?>
     

backend/modules/theme/controllers/CategoryController.php

@@ -68,8 +68,17 @@ class CategoryController extends Controller
         $model = new Category();
         $model->status = $model::STATUS_ACTIVE;
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
-            return $this->redirect(['view', 'id' => $model->id]);
+        if ($model->load(Yii::$app->request->post()) && $model->save() ) {
+            Yii::$app->getSession()->setFlash('success', [
+                'type' => 'success',
+                'duration' => 5000,
+                'icon' => 'fa fa-envira',
+                'message' => 'New Theme Category Created! ',
+                'title' => 'Category',
+                'positonY' => 'top',
+                'positonX' => 'right'
+            ]);
+            return $this->redirect(['files', 'id' => $model->id]);
         }
 
         return $this->render('create', [
@@ -89,7 +98,7 @@ class CategoryController extends Controller
 
         $model = $this->findModel($id);
 
-        if ($model->load(Yii::$app->request->post()) && $model->save()) {
+        if ($model->load(Yii::$app->request->post()) && $model->save() && $model->validate()) {
             return $this->redirect(['view', 'id' => $model->id]);
         }
 
@@ -150,8 +159,15 @@ class CategoryController extends Controller
 
                         if ($flag) {
                             $transaction->commit();
-
-                            return $this->redirect(['index']);
+                            Yii::$app->getSession()->setFlash('success', [
+                                'type' => 'success',
+                                'duration' => 5000,
+                                'icon' => 'fa fa-file',
+                                'message' => 'New File is added to Category Files list! ',
+                                'title' => 'Category Files',
+                                'positonY' => 'top',
+                                'positonX' => 'right'
+                            ]);
                         }
                     } catch (Exception $e) {
                         $transaction->rollBack();

backend/modules/theme/views/category/_form.php

@@ -3,6 +3,7 @@
 use yii\helpers\Html;
 use yii\bootstrap\ActiveForm;
 use trntv\filekit\widget\Upload;
+use yii\web\JsExpression;
 
 /* @var $this yii\web\View */
 /* @var $model common\models\Category */
@@ -11,14 +12,16 @@ use trntv\filekit\widget\Upload;
 
 <div class="category-form">
 
-    <?php $form = ActiveForm::begin(); ?>
+    <?php $form = ActiveForm::begin([
+        'options' => ['enctype' => 'multipart/form-data',],
+    ]); ?>
 
     <div id="myTabContent" class="tab-content">
         <div class="tab-pane fade in active" id="info">
             <div class="page-header">
 
                 <h3> <?= Yii::t('backend', 'Info') ?> </h3>
-                
+
             </div>
             <div class="row">
                 <div class="col-md-6">
@@ -48,6 +51,9 @@ use trntv\filekit\widget\Upload;
                         Upload::className(),
                         [
                             'url' => ['/file-storage/upload'],
+                            'sortable' => true,
+                            'maxFileSize' => 10000000, // 10 MiB
+                            'acceptFileTypes' => new JsExpression('/(\.|\/)(gif|jpe?g|png)$/i')
                         ])->label('Image');
                     ?>
 
@@ -71,6 +77,6 @@ use trntv\filekit\widget\Upload;
             </div>
         </div>
 
-    <?php ActiveForm::end(); ?>
+        <?php ActiveForm::end(); ?>
 
-</div>
+    </div>

backend/modules/theme/views/category/index.php

@@ -43,8 +43,22 @@ $this->params['breadcrumbs'][] = $this->title;
             'created_at:datetime',
 //            'updated_at',
 
-            ['class' => 'yii\grid\ActionColumn',
-                'template' => '{update} {delete}'],
+            [
+                'class' => 'yii\grid\ActionColumn',
+                'template' => '{update}  {delete}',
+                'buttons' => [
+                    'download' => function ($url) {
+                        return Html::a(
+                            '<span class="glyphicon glyphicon-arrow-download"></span>',
+                            $url,
+                            [
+                                'title' => 'Download',
+                                'data-pjax' => '0',
+                            ]
+                        );
+                    },
+                ],
+            ],
         ],
     ]); ?>
 

backend/views/layouts/common.php

@@ -9,6 +9,7 @@ use yii\helpers\ArrayHelper;
 use yii\helpers\Html;
 use yii\helpers\Url;
 use yii\widgets\Breadcrumbs;
+use kartik\growl\Growl;
 
 $bundle = BackendAsset::register($this);
 ?>
@@ -203,7 +204,7 @@ $bundle = BackendAsset::register($this);
                         ],
                         [
                             'label' => Yii::t('backend', 'Theme'),
-                            'icon' => '<i class="fa fa-sitemap"></i>',
+                            'icon' => '<i class="fa fa-envira"></i>',
                             'url' => ['/theme/theme/index'],
                             'visible' => Yii::$app->user->can('administrator')
                         ],
@@ -337,6 +338,25 @@ $bundle = BackendAsset::register($this);
                         'options' => ArrayHelper::getValue(Yii::$app->session->getFlash('alert'), 'options'),
                     ]) ?>
                 <?php endif; ?>
+<!--                //Get all flash messages and loop through them-->
+                <?php foreach (Yii::$app->session->getAllFlashes() as $message):; ?>
+                    <?= Growl::widget([
+                        'type' => (!empty($message['type'])) ? $message['type'] : 'danger',
+                        'title' => (!empty($message['title'])) ? Html::encode($message['title']) : 'Title Not Set!',
+                        'icon' => (!empty($message['icon'])) ? $message['icon'] : 'fa fa-info',
+                        'body' => (!empty($message['message'])) ? Html::encode($message['message']) : 'Message Not Set!',
+                        'showSeparator' => true,
+                        'delay' => 1, //This delay is how long before the message shows
+                        'pluginOptions' => [
+                            'delay' => (!empty($message['duration'])) ? $message['duration'] : 3000, //This delay is how long the message shows for
+                            'placement' => [
+                                'from' => (!empty($message['positonY'])) ? $message['positonY'] : 'top',
+                                'align' => (!empty($message['positonX'])) ? $message['positonX'] : 'right',
+                            ]
+                        ]
+                    ]);
+                    ?>
+                <?php endforeach; ?>
                 <?= $content ?>
             </section><!-- /.content -->
         </aside><!-- /.right-side -->

backend/views/website/index.php

@@ -52,7 +52,7 @@ $this->params['breadcrumbs'][] = $this->title;
 
             [
                 'class' => 'yii\grid\ActionColumn',
-                'template' => '{update}{delete}'
+                'template' => '{update} {delete}'
             ],
         ],
     ]); ?>

common/models/Business.php

@@ -105,6 +105,7 @@ class Business extends \yii\db\ActiveRecord
                 'targetClass' => District::className(),
                 'targetAttribute' => ['district_id' => 'id']
             ],
+            ['logo', 'file', 'extensions' => 'jpeg, gif, png'],
         ];
     }
 

common/models/Category.php

@@ -47,10 +47,18 @@ class Category extends \yii\db\ActiveRecord
         return [
             [['name', 'status'], 'required'],
             [['status', 'created_at', 'updated_at'], 'integer'],
-            [['name', 'slug'], 'string', 'max' => 32],
+            [['name', 'slug'], 'string', 'length' => [1,32]],
+            [['name', 'slug'],'trim'],
+            [
+                ['name', 'slug'],
+                'match',
+                'pattern' => '/^[a-zA-Z\s0-9_-]+$/',
+                'message' => 'only, alphanumeric characters, underscores and dashes are allowed.'
+            ],
+            ['name', 'unique'],
             [['description'], 'string', 'max' => 512],
             [['image_url', 'image_path'], 'string', 'max' => 1024],
-            [['image'], 'safe']
+            [['image'], 'safe'],
         ];
     }
 
@@ -90,12 +98,13 @@ class Category extends \yii\db\ActiveRecord
                 'createdAtAttribute' => 'created_at',
                 'updatedAtAttribute' => 'updated_at'
             ]
-            ];
+        ];
     }
 
     public static function getAllCategories()
     {
         $models = static::find()->active()->all();
+
         return ArrayHelper::map(
             $models,
             'id',

common/models/State.php

@@ -54,6 +54,13 @@ class State extends \yii\db\ActiveRecord
         return [
             [['name'], 'required'],
             [['name'], 'unique'],
+            [['name', 'slug'],'trim'],
+            [
+                ['name', 'slug'],
+                'match',
+                'pattern' => '/^[a-zA-Z\s0-9_-]+$/',
+                'message' => 'only, alphanumeric characters, underscores and dashes are allowed.'
+            ],
             [['status', 'created_at', 'updated_at'], 'integer'],
             [['name', 'slug'], 'string', 'max' => 1024],
         ];

common/models/Theme.php

@@ -58,6 +58,13 @@ class Theme extends \yii\db\ActiveRecord
         return [
             [['category_id', 'code', 'slug', 'name', 'status'], 'required'],
             [['category_id', 'status', 'created_at', 'updated_at'], 'integer'],
+            [['name', 'slug', 'code'],'trim'],
+            [
+                ['name', 'slug', 'code'],
+                'match',
+                'pattern' => '/^[a-zA-Z\s0-9_-]+$/',
+                'message' => 'only, alphanumeric characters, underscores and dashes are allowed.'
+            ],
             [['code', 'slug', 'name'], 'string', 'max' => 32],
             [['description'], 'string', 'max' => 512],
             [['category_id'], 'exist', 'skipOnError' => true, 'targetClass' => Category::className(), 'targetAttribute' => ['category_id' => 'id']],

common/models/Website.php

@@ -53,6 +53,11 @@ class Website extends \yii\db\ActiveRecord
             [['domain_name'], 'required'],
             [['domain_name'], 'string', 'max' => 255],
             [
+                ['domain_name'],
+                'match',
+                'pattern' => '/^[a-zA-Z0-9][a-zA-Z0-9-_]{0,61}[a-zA-Z0-9]{0,1}\.([a-zA-Z]{1,6}|[a-zA-Z0-9-]{1,30}\.[a-zA-Z]{2,3})$/'
+            ],
+            [
                 ['theme_id'],
                 'exist',
                 'skipOnError' => true,

composer.json

@@ -50,7 +50,8 @@
     "petrabarus/yii2-googleplacesautocomplete": "dev-master",
     "symfony/process": "^3.0",
     "yiisoft/yii2-httpclient": "*",
-    "wbraganca/yii2-dynamicform": "*"
+    "wbraganca/yii2-dynamicform": "*",
+    "kartik-v/yii2-widget-growl": "*"
   },
   "require-dev": {
     "yiisoft/yii2-debug": "^2.0.0",

frontend/controllers/SiteController.php

@@ -38,11 +38,14 @@ class SiteController extends Controller
         $domain = $_SERVER['HTTP_HOST'];
         $website = Website::find()->where(['domain_name' =>$domain])->one();
         $businessId = $website->business_id;
+        if(isEmpty($businessId)){
+            $businessId = 3;
+        }
         $client = new Client();
         $response = $client->createRequest()
             ->setMethod('get')
             ->setUrl('http://libromi.com/api/v1/business/view')
-            ->setData(['id' => $businessId])
+            ->setData(['id' => 2])
             ->send();
         $data = $response->isOk ? $response->data : [];
         return $this->render('index', ['data' => $data]);