-Add column to payment

Alexey Boroda
1 parent 1f2fdc61
Showing 4 changed files with 189 additions and 185 deletions Show diff stats
controllers/OrderController.php
models/Order.php
models/OrderPayment.php
views/order/_form.php
@@ -290,7 +290,7 @@
             }
             $model = $this->findModel($id);
-    
+            
             /**
              * @var User $user
              */
@@ -388,7 +388,7 @@
                 throw new NotFoundHttpException('The requested page does not exist.');
             }
         }
-    
+        
         public function actionExitOrder($id)
         {
             $this->unblockOrder($id);
@@ -413,7 +413,10 @@
                         'time' => $date,
                     ];
                 } else {
-                    return [ 'success' => false ];
+                    return [
+                        'success' => false,
+                        'errors'  => $model->errors,
+                    ];
                 }
             }
         }
@@ -110,6 +110,7 @@
                 ],
                 [
                     [
+                        'shipping_by',
                         'created_at',
                         'updated_at',
                         'deleted_at',
@@ -159,7 +160,6 @@
                         'consignment',
                         'insurance',
                         'amount_imposed',
-                        'shipping_by',
                         'city',
                         'adress',
                         'status',
 <?php
-
-namespace artweb\artbox\ecommerce\models;
-
-use artweb\artbox\language\behaviors\LanguageBehavior;
-use yii\db\ActiveQuery;
-use yii\web\Request;
-/**
- * This is the model class for table "order_payment".
- *
- * @property integer $id
- * @property integer $status
- *
- * @property OrderPaymentLang[] $orderPaymentLangs
- *
- * * From language behavior *
- * @property orderPaymentLang   $lang
- * @property orderPaymentLang[] $langs
- * @property orderPaymentLang   $objectLang
- * @property string           $ownerKey
- * @property string           $langKey
- * @property orderPaymentLang[] $modelLangs
- * @property bool             $transactionStatus
- * @method string           getOwnerKey()
- * @method void             setOwnerKey( string $value )
- * @method string           getLangKey()
- * @method void             setLangKey( string $value )
- * @method ActiveQuery      getLangs()
- * @method ActiveQuery      getLang( integer $language_id )
- * @method OrderPaymentLang[]    generateLangs()
- * @method void             loadLangs( Request $request )
- * @method bool             linkLangs()
- * @method bool             saveLangs()
- * @method bool             getTransactionStatus()
- * * End language behavior
- */
-class OrderPayment extends \yii\db\ActiveRecord
-{
-
-
-    const ACTIVE = 1;
-    const INACTIVE = 2;
+    
+    namespace artweb\artbox\ecommerce\models;
+    
+    use artweb\artbox\language\behaviors\LanguageBehavior;
+    use yii\db\ActiveQuery;
+    use yii\web\Request;
+    
     /**
-     * @inheritdoc
+     * This is the model class for table "order_payment".
+     *
+     * @property integer            $id
+     * @property integer            $status
+     * @property string             $short
+     * @property OrderPaymentLang[] $orderPaymentLangs
+     * * From language behavior *
+     * @property orderPaymentLang   $lang
+     * @property orderPaymentLang[] $langs
+     * @property orderPaymentLang   $objectLang
+     * @property string             $ownerKey
+     * @property string             $langKey
+     * @property orderPaymentLang[] $modelLangs
+     * @property bool               $transactionStatus
+     * @method string           getOwnerKey()
+     * @method void             setOwnerKey( string $value )
+     * @method string           getLangKey()
+     * @method void             setLangKey( string $value )
+     * @method ActiveQuery      getLangs()
+     * @method ActiveQuery      getLang( integer $language_id )
+     * @method OrderPaymentLang[]    generateLangs()
+     * @method void             loadLangs( Request $request )
+     * @method bool             linkLangs()
+     * @method bool             saveLangs()
+     * @method bool             getTransactionStatus()
+     * * End language behavior
      */
-    public static function tableName()
+    class OrderPayment extends \yii\db\ActiveRecord
     {
-        return 'order_payment';
+        
+        const ACTIVE = 1;
+        const INACTIVE = 2;
+        /**
+         * @inheritdoc
+         */
+        public static function tableName()
+        {
+            return 'order_payment';
+        }
+        
+        public function behaviors()
+        {
+            return [
+                'language' => [
+                    'class'      => LanguageBehavior::className(),
+                    'objectLang' => OrderPaymentLang::className(),
+                    'ownerKey'   => 'id',
+                    'langKey'    => 'order_payment_id',
+                ],
+            ];
+        }
+        
+        /**
+         * @inheritdoc
+         */
+        public function rules()
+        {
+            return [
+                [
+                    [ 'status' ],
+                    'integer',
+                ],
+                [
+                    [ 'status' ],
+                    'default',
+                    'value' => 1,
+                ],
+            ];
+        }
+        
+        /**
+         * @inheritdoc
+         */
+        public function attributeLabels()
+        {
+            return [
+                'id'     => \Yii::t('app', 'ID'),
+                'status' => \Yii::t('app', 'Статус'),
+            ];
+        }
+        
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getOrderPaymentLangs()
+        {
+            return $this->hasMany(OrderPaymentLang::className(), [ 'order_payment_id' => 'id' ]);
+        }
     }
-
-
-    public function behaviors()
-    {
-        return [
-            'language' => [
-                'class'      => LanguageBehavior::className(),
-                'objectLang' => OrderPaymentLang::className(),
-                'ownerKey'   => 'id',
-                'langKey'    => 'order_payment_id',
-            ],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function rules()
-    {
-        return [
-            [['status'], 'integer'],
-            [
-                [ 'status' ],
-                'default',
-                'value' => 1,
-            ],
-        ];
-    }
-
-    /**
-     * @inheritdoc
-     */
-    public function attributeLabels()
-    {
-        return [
-            'id' => \Yii::t('app','ID'),
-            'status' => \Yii::t('app','Статус'),
-        ];
-    }
-
-    /**
-     * @return \yii\db\ActiveQuery
-     */
-    public function getOrderPaymentLangs()
-    {
-        return $this->hasMany(OrderPaymentLang::className(), ['order_payment_id' => 'id']);
-    }
-}
@@ -92,37 +92,6 @@ JS;
 <?php $form = ActiveForm::begin(); ?>
 <div class="container">
     <div class="form-group">
-        <div class="row">
-            <?= Html::submitButton(
-                $model->isNewRecord ? \Yii::t('app', 'Создать') : \Yii::t('app', 'Обновить'),
-                [ 'class' => $model->isNewRecord ? 'btn btn-success btn-lg' : 'btn btn-primary btn-lg' ]
-            ) ?>
-            <?= Html::a(
-                \Yii::t('app', 'Печать'),
-                yii\helpers\Url::to(
-                    [
-                        'order/print',
-                        'order_id' => $model->id,
-                    ]
-                ),
-                [
-                    'class'  => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg',
-                    'target' => '_blank',
-                ]
-            ) ?>
-            <?= Html::a(
-                \Yii::t('app', 'Выйти'),
-                yii\helpers\Url::to(
-                    [
-                        'exit-order',
-                        'id' => $model->id,
-                    ]
-                ),
-                [
-                    'class'  => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg',
-                ]
-            ) ?>
-        </div>
         <br>
         <div class="row">
             <div class="col-sm-6">
@@ -196,6 +165,7 @@ JS;
                          ) ?>
                 <?php
+                    
                     if (\Yii::$app->user->identity->isAdmin()) {
                         echo $form->field($model, 'manager_id')
                                   ->dropDownList(
@@ -210,7 +180,60 @@ JS;
                                   ) ;
                 }
                 ?>
+    
+                    <h2><?php echo \Yii::t('app', 'Отправить смс'); ?></h2>
+                        <?php
+                            echo Select2::widget(
+                                [
+                                    'id'            => 'sms-template-selector',
+                                    'name'          => 'select-sms-template',
+                                    'data'          => ArrayHelper::map(
+                                        SmsTemplate::find()
+                                                   ->asArray()
+                                                   ->all(),
+                                        'text',
+                                        'title'
+                                    ),
+                                    'options'       => [ 'placeholder' => \Yii::t('app', 'Выберите шаблон') ],
+                                    'pluginOptions' => [
+                                        'allowClear' => true,
+                                    ],
+                                ]
+                            );
+                        ?>
+                        <br>
+                        <?php
+                            echo Html::textarea(
+                                'sms-text',
+                                '',
+                                [
+                                    'rows'  => 3,
+                                    'id'    => 'sms-text-area',
+                                    'class' => 'form-control',
+                                ]
+                            );
+                        ?>
+                        <br>
+                        <?php
+                            if ($model->isNewRecord) {
+                                echo Html::button(
+                                    \Yii::t('app', 'Отправить'),
+                                    [
+                                        'class' => 'btn btn-warning disabled',
+                                    ]
+                                );
+                            } else {
+                                echo Html::button(
+                                    \Yii::t('app', 'Отправить'),
+                                    [
+                                        'class' => 'btn btn-warning',
+                                        'id'    => 'send-sms-action',
+                                    ]
+                                );
+                            }
+                        ?>
+                
             </div>
             <div class="col-sm-6">
@@ -258,10 +281,43 @@ JS;
             </div>
         </div>
     </div>
+    <br>
+    <div class="row">
+        <?= Html::submitButton(
+            $model->isNewRecord ? \Yii::t('app', 'Создать') : \Yii::t('app', 'Обновить'),
+            [ 'class' => $model->isNewRecord ? 'btn btn-success btn-lg' : 'btn btn-primary btn-lg' ]
+        ) ?>
+        <?= Html::a(
+            \Yii::t('app', 'Печать'),
+            yii\helpers\Url::to(
+                [
+                    'order/print',
+                    'order_id' => $model->id,
+                ]
+            ),
+            [
+                'class'  => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg',
+                'target' => '_blank',
+            ]
+        ) ?>
+        <?= Html::a(
+            \Yii::t('app', 'Выйти'),
+            yii\helpers\Url::to(
+                [
+                    'exit-order',
+                    'id' => $model->id,
+                ]
+            ),
+            [
+                'class'  => $model->isNewRecord ? 'btn btn-info disabled btn-lg' : 'btn btn-info btn-lg',
+            ]
+        ) ?>
+    </div>
 </div>
-<?php ActiveForm::end(); ?>
-
+<?php ActiveForm::end(); ?>
+<br>
+<br>
 <div class="container">
     <div class="row">
         <?php
@@ -447,59 +503,3 @@ JS;
 </div>
 <br>
 <br>
-<div class="container">
-    <h2><?php echo \Yii::t('app', 'Отправить смс'); ?></h2>
-    <div class="row">
-        <?php
-            echo Select2::widget(
-                [
-                    'id'            => 'sms-template-selector',
-                    'name'          => 'select-sms-template',
-                    'data'          => ArrayHelper::map(
-                        SmsTemplate::find()
-                                   ->asArray()
-                                   ->all(),
-                        'text',
-                        'title'
-                    ),
-                    'options'       => [ 'placeholder' => \Yii::t('app', 'Выберите шаблон') ],
-                    'pluginOptions' => [
-                        'allowClear' => true,
-                    ],
-                ]
-            );
-        
-        ?>
-        <br>
-        <?php
-            echo Html::textarea(
-                'sms-text',
-                '',
-                [
-                    'rows'  => 3,
-                    'id'    => 'sms-text-area',
-                    'class' => 'form-control',
-                ]
-            );
-        ?>
-        <br>
-        <?php
-            if ($model->isNewRecord) {
-                echo Html::button(
-                    \Yii::t('app', 'Отправить'),
-                    [
-                        'class' => 'btn btn-warning disabled',
-                    ]
-                );
-            } else {
-                echo Html::button(
-                    \Yii::t('app', 'Отправить'),
-                    [
-                        'class' => 'btn btn-warning',
-                        'id'    => 'send-sms-action',
-                    ]
-                );
-            }
-        ?>
-    </div>
-</div>