Merge remote-tracking branch 'origin/master'

# Conflicts: # models/Order.php

Merge remote-tracking branch 'origin/master'
# Conflicts: # models/Order.php
Alexey Boroda
2 parents bb962a6d fbfae870
Showing 13 changed files with 639 additions and 29 deletions Show diff stats
controllers/OrderPaymentController.php
models/Order.php
models/OrderPayment.php
models/OrderPaymentLang.php
models/OrderPaymentSearch.php
models/ProductFrontendSearch.php
views/order-payment/_form.php
views/order-payment/_form_language.php
views/order-payment/_search.php
views/order-payment/create.php
views/order-payment/index.php
views/order-payment/update.php
views/order-payment/view.php
+<?php
+
+namespace artweb\artbox\ecommerce\controllers;
+
+use Yii;
+use artweb\artbox\ecommerce\models\OrderPayment;
+use artweb\artbox\ecommerce\models\OrderPaymentSearch;
+use yii\web\Controller;
+use yii\web\NotFoundHttpException;
+use yii\filters\VerbFilter;
+
+/**
+ * OrderPaymentController implements the CRUD actions for OrderPayment model.
+ */
+class OrderPaymentController extends Controller
+{
+    /**
+     * @inheritdoc
+     */
+    public function behaviors()
+    {
+        return [
+            'verbs' => [
+                'class' => VerbFilter::className(),
+                'actions' => [
+                    'delete' => ['POST'],
+                ],
+            ],
+        ];
+    }
+
+    /**
+     * Lists all OrderPayment models.
+     * @return mixed
+     */
+    public function actionIndex()
+    {
+        $searchModel = new OrderPaymentSearch();
+        $dataProvider = $searchModel->search(Yii::$app->request->queryParams);
+
+        return $this->render('index', [
+            'searchModel' => $searchModel,
+            'dataProvider' => $dataProvider,
+        ]);
+    }
+
+    /**
+     * Displays a single OrderPayment model.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionView($id)
+    {
+        return $this->render('view', [
+            'model' => $this->findModel($id),
+        ]);
+    }
+
+    /**
+     * Creates a new OrderPayment model.
+     * If creation is successful, the browser will be redirected to the 'view' page.
+     * @return mixed
+     */
+    public function actionCreate()
+    {
+        $model = new OrderPayment();
+        $model->generateLangs();
+        if ($model->load(Yii::$app->request->post())) {
+            $model->loadLangs(\Yii::$app->request);
+            if ($model->save() && $model->transactionStatus) {
+                return $this->redirect([
+                    'view',
+                    'id' => $model->id,
+                ]);
+            }
+
+        }
+
+        return $this->render('create', [
+            'model' => $model,
+            'modelLangs' => $model->modelLangs,
+        ]);
+    }
+
+    /**
+     * Updates an existing OrderPayment model.
+     * If update is successful, the browser will be redirected to the 'view' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionUpdate($id)
+    {
+        $model = $this->findModel($id);
+        $model->generateLangs();
+        if ($model->load(Yii::$app->request->post())) {
+            $model->loadLangs(\Yii::$app->request);
+            if ($model->save() && $model->transactionStatus) {
+
+                return $this->redirect([
+                    'view',
+                    'id' => $model->id,
+                ]);
+            }
+        }
+
+        return $this->render('update', [
+            'model' => $model,
+            'modelLangs' => $model->modelLangs,
+        ]);
+    }
+
+    /**
+     * Deletes an existing OrderPayment model.
+     * If deletion is successful, the browser will be redirected to the 'index' page.
+     * @param integer $id
+     * @return mixed
+     */
+    public function actionDelete($id)
+    {
+        $this->findModel($id)->delete();
+
+        return $this->redirect(['index']);
+    }
+
+    /**
+     * Finds the OrderPayment model based on its primary key value.
+     * If the model is not found, a 404 HTTP exception will be thrown.
+     * @param integer $id
+     * @return OrderPayment the loaded model
+     * @throws NotFoundHttpException if the model cannot be found
+     */
+    protected function findModel($id)
+    {
+        if (($model = OrderPayment::findOne($id)) !== null) {
+            return $model;
+        } else {
+            throw new NotFoundHttpException('The requested page does not exist.');
+        }
+    }
+}
@@ -40,26 +40,10 @@
      * @property double  $amount_imposed
      * @property string  $shipping_by
      * @property string  $city
+     * @property string  $deliveryString
      */
     class Order extends ActiveRecord
     {
-        const PAYMENT_LIST = [
-            1 => [
-                'label' => 'Оплатить наличными',
-            ],
-            2 => [
-                'label' => 'Оплатить на карту Приват Банка',
-                'hint'  => 'оплата поступает 30 минут до суток!',
-            ],
-            3 => [
-                'label' => 'Оплатить "Правекс-телеграф"',
-                'hint'  => 'оплата денежным переводом поступает от 30 мин. до 4 часов',
-            ],
-            4 => [
-                'label' => 'Оплатить по безналичному расчету',
-                'hint'  => 'оплата поступает на счет от 1 до 3 рабочих дней! Счет на оплату отправим сразу после обработки заказана на ваш e-mail',
-            ],
-        ];
         const SHIPPING_BY = [
             1 => [
@@ -140,16 +124,6 @@
                     'string',
                     'max' => 255,
                 ],
-                [
-                    [ 'payment' ],
-                    'in',
-                    'range' => [
-                        1,
-                        2,
-                        3,
-                        4,
-                    ],
-                ],
             ];
         }
@@ -170,9 +144,54 @@
         {
             return $this->hasOne(Customer::className(), [ 'id' => 'user_id' ]);
         }
-        
+
+        /**
+         * @return \yii\db\ActiveQuery
+         */
         public function getProducts()
         {
             return $this->hasMany(OrderProduct::className(), [ 'order_id' => 'id' ]);
         }
+
+
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getOrderDelivery(){
+            return $this->hasOne(Delivery::className(), ['id'=> 'delivery']);
+        }
+
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getOrderLabel(){
+            return $this->hasOne(Label::className(),['id'=> 'status']);
+        }
+
+
+
+        /**
+         * @return \yii\db\ActiveQuery
+         */
+        public function getOrderPayment(){
+            return $this->hasOne(OrderPayment::className(),['id'=> 'payment']);
+        }
+
+
+        /**
+         * @return string
+         */
+        public function getDeliveryString(){
+            if(!empty($this->orderDelivery)){
+                if(!empty($this->orderDelivery->parent)){
+                    return $this->orderDelivery->parent->lang->title .': '.$this->orderDelivery->lang->title;
+                } else {
+                    return $this->orderDelivery->lang->title;
+                }
+            } else {
+                return '';
+            }
+        }
+
+
     }
 \ No newline at end of file
+<?php
+
+namespace artweb\artbox\ecommerce\models;
+
+use artweb\artbox\language\behaviors\LanguageBehavior;
+use Yii;
+use yii\db\ActiveQuery;
+use yii\db\ActiveRecord;
+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;
+    /**
+     * @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']);
+    }
+}
+<?php
+
+namespace artweb\artbox\ecommerce\models;
+
+use artweb\artbox\language\models\Language;
+use Yii;
+
+/**
+ * This is the model class for table "order_payment_lang".
+ *
+ * @property integer $id
+ * @property integer $order_payment_id
+ * @property integer $language_id
+ * @property string $title
+ * @property string $text
+ *
+ * @property Language $language
+ * @property OrderPayment $orderPayment
+ */
+class OrderPaymentLang extends \yii\db\ActiveRecord
+{
+    /**
+     * @inheritdoc
+     */
+    public static function tableName()
+    {
+        return 'order_payment_lang';
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['order_payment_id', 'language_id', 'title'], 'required'],
+            [['order_payment_id', 'language_id'], 'integer'],
+            [['text'], 'string'],
+            [['title'], 'string', 'max' => 255],
+            [['language_id'], 'exist', 'skipOnError' => true, 'targetClass' => Language::className(), 'targetAttribute' => ['language_id' => 'id']],
+            [['order_payment_id'], 'exist', 'skipOnError' => true, 'targetClass' => OrderPayment::className(), 'targetAttribute' => ['order_payment_id' => 'id']],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function attributeLabels()
+    {
+        return [
+            'id' => 'ID',
+            'order_payment_id' => 'Order Payment ID',
+            'language_id' => 'Language ID',
+            'title' => 'Title',
+            'text' => 'Text',
+        ];
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getLanguage()
+    {
+        return $this->hasOne(Language::className(), ['id' => 'language_id']);
+    }
+
+    /**
+     * @return \yii\db\ActiveQuery
+     */
+    public function getOrderPayment()
+    {
+        return $this->hasOne(OrderPayment::className(), ['id' => 'order_payment_id']);
+    }
+}
+<?php
+
+namespace artweb\artbox\ecommerce\models;
+
+use Yii;
+use yii\base\Model;
+use yii\data\ActiveDataProvider;
+use artweb\artbox\ecommerce\models\OrderPayment;
+
+/**
+ * OrderPaymentSearch represents the model behind the search form about `artweb\artbox\ecommerce\models\OrderPayment`.
+ */
+class OrderPaymentSearch extends OrderPayment
+{
+    /**
+     * @inheritdoc
+     */
+    public function rules()
+    {
+        return [
+            [['id'], 'integer'],
+        ];
+    }
+
+    /**
+     * @inheritdoc
+     */
+    public function scenarios()
+    {
+        // bypass scenarios() implementation in the parent class
+        return Model::scenarios();
+    }
+
+    /**
+     * Creates data provider instance with search query applied
+     *
+     * @param array $params
+     *
+     * @return ActiveDataProvider
+     */
+    public function search($params)
+    {
+        $query = OrderPayment::find();
+
+        // add conditions that should always apply here
+
+        $dataProvider = new ActiveDataProvider([
+            'query' => $query,
+        ]);
+
+        $this->load($params);
+
+        if (!$this->validate()) {
+            // uncomment the following line if you do not want to return any records when validation fails
+            // $query->where('0=1');
+            return $dataProvider;
+        }
+
+        // grid filtering conditions
+        $query->andFilterWhere([
+            'id' => $this->id,
+        ]);
+
+        return $dataProvider;
+    }
+}
@@ -100,7 +100,7 @@
                     'allModels'  => $this->getSearchQuery($category, $params, $in_stock)
                                          ->with('variant', 'videos')->all(),
                     'pagination' => [
-                        'pageSize' => 10,
+                        'pageSize' => 11,
                     ],
                     'sort'       => $sort,
                 ]
+<?php
+
+use artweb\artbox\ecommerce\models\OrderPaymentLang;
+use artweb\artbox\language\widgets\LanguageForm;
+use kartik\select2\Select2;
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model artweb\artbox\ecommerce\models\OrderPayment */
+/* @var $form yii\widgets\ActiveForm */
+/* @var $modelLangs OrderPaymentLang */
+?>
+
+<div class="order-payment-form">
+
+    <?php $form = ActiveForm::begin(); ?>
+
+    <?= $form->field($model, 'status')
+        ->widget(Select2::className(), ( [
+            'name'          => 'status',
+            'hideSearch'    => true,
+            'data'          => [
+                1 => \Yii::t('app', 'Active'),
+                2 => \Yii::t('app', 'Inactive'),
+            ],
+            'options'       => [ 'placeholder' => \Yii::t('app', 'Select status...') ],
+            'pluginOptions' => [
+                'allowClear' => true,
+            ],
+        ] )) ?>
+
+    <?= LanguageForm::widget([
+        'modelLangs' => $modelLangs,
+        'formView'    => '@artweb/artbox/ecommerce/views/order-payment/_form_language',
+        'form'        => $form,
+    ]) ?>
+    <div class="form-group">
+        <?= Html::submitButton($model->isNewRecord ? 'Create' : 'Update', ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+use artweb\artbox\ecommerce\models\OrderPaymentLang;
+use artweb\artbox\language\models\Language;
+use yii\web\View;
+use yii\widgets\ActiveForm;
+
+/**
+ * @var OrderPaymentLang   $model_lang
+ * @var Language           $language
+ * @var ActiveForm         $form
+ * @var View               $this
+ */
+?>
+
+
+
+
+<?= $form->field($model_lang, '[' . $language->id . ']title')->textInput(['maxlength' => true]) ?>
+
+
+
+
+
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\ActiveForm;
+
+/* @var $this yii\web\View */
+/* @var $model artweb\artbox\ecommerce\models\OrderPaymentSearch */
+/* @var $form yii\widgets\ActiveForm */
+?>
+
+<div class="order-payment-search">
+
+    <?php $form = ActiveForm::begin([
+        'action' => ['index'],
+        'method' => 'get',
+    ]); ?>
+
+    <?= $form->field($model, 'id') ?>
+
+    <div class="form-group">
+        <?= Html::submitButton('Search', ['class' => 'btn btn-primary']) ?>
+        <?= Html::resetButton('Reset', ['class' => 'btn btn-default']) ?>
+    </div>
+
+    <?php ActiveForm::end(); ?>
+
+</div>
+<?php
+
+use yii\helpers\Html;
+
+
+/* @var $this yii\web\View */
+/* @var $model artweb\artbox\ecommerce\models\OrderPayment */
+
+$this->title = 'Create Order Payment';
+$this->params['breadcrumbs'][] = ['label' => 'Order Payments', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="order-payment-create">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <?= $this->render('_form', [
+        'model' => $model,
+        'modelLangs' => $modelLangs
+    ]) ?>
+
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\grid\GridView;
+
+/* @var $this yii\web\View */
+/* @var $searchModel artweb\artbox\ecommerce\models\OrderPaymentSearch */
+/* @var $dataProvider yii\data\ActiveDataProvider */
+
+$this->title = 'Order Payments';
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="order-payment-index">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+    <?php // echo $this->render('_search', ['model' => $searchModel]); ?>
+
+    <p>
+        <?= Html::a('Create Order Payment', ['create'], ['class' => 'btn btn-success']) ?>
+    </p>
+    <?= GridView::widget([
+        'dataProvider' => $dataProvider,
+        'filterModel' => $searchModel,
+        'columns' => [
+            ['class' => 'yii\grid\SerialColumn'],
+
+            'status',
+            [
+                'attribute' => 'title',
+                'value'     => 'lang.title',
+            ],
+
+            ['class' => 'yii\grid\ActionColumn'],
+        ],
+    ]); ?>
+</div>
+<?php
+
+use yii\helpers\Html;
+
+/* @var $this yii\web\View */
+/* @var $model artweb\artbox\ecommerce\models\OrderPayment */
+
+$this->title = 'Update Order Payment: ' . $model->id;
+$this->params['breadcrumbs'][] = ['label' => 'Order Payments', 'url' => ['index']];
+$this->params['breadcrumbs'][] = ['label' => $model->id, 'url' => ['view', 'id' => $model->id]];
+$this->params['breadcrumbs'][] = 'Update';
+?>
+<div class="order-payment-update">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+
+    <?= $this->render('_form', [
+        'model' => $model,
+        'modelLangs' => $modelLangs
+    ]) ?>
+
+
+</div>
+<?php
+
+use yii\helpers\Html;
+use yii\widgets\DetailView;
+
+/* @var $this yii\web\View */
+/* @var $model artweb\artbox\ecommerce\models\OrderPayment */
+
+$this->title = $model->id;
+$this->params['breadcrumbs'][] = ['label' => 'Order Payments', 'url' => ['index']];
+$this->params['breadcrumbs'][] = $this->title;
+?>
+<div class="order-payment-view">
+
+    <h1><?= Html::encode($this->title) ?></h1>
+
+    <p>
+        <?= Html::a('Update', ['update', 'id' => $model->id], ['class' => 'btn btn-primary']) ?>
+        <?= Html::a('Delete', ['delete', 'id' => $model->id], [
+            'class' => 'btn btn-danger',
+            'data' => [
+                'confirm' => 'Are you sure you want to delete this item?',
+                'method' => 'post',
+            ],
+        ]) ?>
+    </p>
+
+    <?= DetailView::widget([
+        'model' => $model,
+        'attributes' => [
+            'id',
+        ],
+    ]) ?>
+
+</div>