Eugeny Galkovskiy / land-artbox

Commit e7fd226c4a2b33fe0de916a470cf9a2efcb6b0a2

Authored by Alex Savenko
2 parents dc4c5454 fc6e429e

Mdadsaderge branch 'master' of gitlab.artweb.com.ua:zhegal/land-artbox 

Conflicts:
	common/config/mail.php
	common/config/settings.php
Showing 4 changed files with 17 additions and 3 deletions   Show diff stats
Inline Side-by-side
common/config/mail.php
  Show/Hide comments   View file @e7fd226
@@ -7,4 +7,4 @@ return [ @@ -7,4 +7,4 @@ return [
7 'pass' => 'upfly2000', 7 'pass' => 'upfly2000',
8 'id' => 1, 8 'id' => 1,
9 ], 9 ],
10 -];  
11 \ No newline at end of file 10 \ No newline at end of file
  11 +];
common/config/settings.php
  Show/Hide comments   View file @e7fd226
@@ -5,7 +5,11 @@ return [ @@ -5,7 +5,11 @@ return [
5 'phone' => '+38 (044) 593-73-76', 5 'phone' => '+38 (044) 593-73-76',
6 'phone2' => '+38 (098) 468-07-64', 6 'phone2' => '+38 (098) 468-07-64',
7 'skype' => 'artwebstudio', 7 'skype' => 'artwebstudio',
  8 +<<<<<<< HEAD
8 'email' => 'kazimirova.artweb@gmail.com', 9 'email' => 'kazimirova.artweb@gmail.com',
  10 +=======
  11 + 'email' => 'kennen.md@gmail.com',
  12 +>>>>>>> fc6e429ed2845fc1a2bb0aec4b9fa64211a7f823
9 'house' => '1-М', 13 'house' => '1-М',
10 'street' => 'пр. М. Бажана', 14 'street' => 'пр. М. Бажана',
11 'office' => '25', 15 'office' => '25',
common/models/Order.php
  Show/Hide comments   View file @e7fd226
@@ -20,6 +20,8 @@ use artbox\core\models\Feedback; @@ -20,6 +20,8 @@ use artbox\core\models\Feedback;
20 */ 20 */
21 class Order extends Feedback 21 class Order extends Feedback
22 { 22 {
  23 + const SCENARIO_ORDER = 'order';
  24 +
23 public function rules() 25 public function rules()
24 { 26 {
25 return array_merge(parent::rules(), [ 27 return array_merge(parent::rules(), [
@@ -32,6 +34,14 @@ class Order extends Feedback @@ -32,6 +34,14 @@ class Order extends Feedback
32 34
33 public function scenarios() 35 public function scenarios()
34 { 36 {
35 - return []; 37 + return
  38 + [
  39 + self::SCENARIO_ORDER => [
  40 + 'name',
  41 + 'email',
  42 + 'message',
  43 + 'subject',
  44 + ],
  45 + ];
36 } 46 }
37 } 47 }
frontend/controllers/SiteController.php
  Show/Hide comments   View file @e7fd226
@@ -113,7 +113,7 @@ @@ -113,7 +113,7 @@
113 if (empty( Yii::$app->request->post() )) { 113 if (empty( Yii::$app->request->post() )) {
114 throw new BadRequestHttpException(); 114 throw new BadRequestHttpException();
115 } else { 115 } else {
116 - $model = new Order(); 116 + $model = new Order(['scenario' => Order::SCENARIO_ORDER]);
117 if ($model->load(Yii::$app->request->post()) && $model->save()) { 117 if ($model->load(Yii::$app->request->post()) && $model->save()) {
118 118
119 try { 119 try {