Commit e5e827a887bafa143cc49b06e6793b038a3434df
1 parent
eebfc91e
Clean up
Showing
10 changed files
with
22 additions
and
12 deletions
Show diff stats
models/Delivery.php
| @@ -6,6 +6,7 @@ | @@ -6,6 +6,7 @@ | ||
| 6 | use artbox\core\models\Language; | 6 | use artbox\core\models\Language; |
| 7 | use Yii; | 7 | use Yii; |
| 8 | use yii\db\ActiveQuery; | 8 | use yii\db\ActiveQuery; |
| 9 | + use yii\db\ActiveRecord; | ||
| 9 | use yii\web\Request; | 10 | use yii\web\Request; |
| 10 | 11 | ||
| 11 | /** | 12 | /** |
| @@ -42,7 +43,7 @@ | @@ -42,7 +43,7 @@ | ||
| 42 | * * End language behavior * | 43 | * * End language behavior * |
| 43 | * @see LanguageBehavior | 44 | * @see LanguageBehavior |
| 44 | */ | 45 | */ |
| 45 | - class Delivery extends \yii\db\ActiveRecord | 46 | + class Delivery extends ActiveRecord |
| 46 | { | 47 | { |
| 47 | /** | 48 | /** |
| 48 | * @inheritdoc | 49 | * @inheritdoc |
models/DeliveryLang.php
| @@ -4,7 +4,8 @@ | @@ -4,7 +4,8 @@ | ||
| 4 | 4 | ||
| 5 | use artbox\core\models\Language; | 5 | use artbox\core\models\Language; |
| 6 | use Yii; | 6 | use Yii; |
| 7 | - | 7 | + use yii\db\ActiveRecord; |
| 8 | + | ||
| 8 | /** | 9 | /** |
| 9 | * This is the model class for table "delivery_lang". | 10 | * This is the model class for table "delivery_lang". |
| 10 | * | 11 | * |
| @@ -15,7 +16,7 @@ | @@ -15,7 +16,7 @@ | ||
| 15 | * @property Delivery $delivery | 16 | * @property Delivery $delivery |
| 16 | * @property Language $language | 17 | * @property Language $language |
| 17 | */ | 18 | */ |
| 18 | - class DeliveryLang extends \yii\db\ActiveRecord | 19 | + class DeliveryLang extends ActiveRecord |
| 19 | { | 20 | { |
| 20 | /** | 21 | /** |
| 21 | * @inheritdoc | 22 | * @inheritdoc |
models/LabelLang.php
| @@ -4,7 +4,8 @@ | @@ -4,7 +4,8 @@ | ||
| 4 | 4 | ||
| 5 | use artbox\core\models\Language; | 5 | use artbox\core\models\Language; |
| 6 | use Yii; | 6 | use Yii; |
| 7 | - | 7 | + use yii\db\ActiveRecord; |
| 8 | + | ||
| 8 | /** | 9 | /** |
| 9 | * This is the model class for table "label_lang". | 10 | * This is the model class for table "label_lang". |
| 10 | * | 11 | * |
| @@ -15,7 +16,7 @@ | @@ -15,7 +16,7 @@ | ||
| 15 | * @property Label $label | 16 | * @property Label $label |
| 16 | * @property Language $language | 17 | * @property Language $language |
| 17 | */ | 18 | */ |
| 18 | - class LabelLang extends \yii\db\ActiveRecord | 19 | + class LabelLang extends ActiveRecord |
| 19 | { | 20 | { |
| 20 | /** | 21 | /** |
| 21 | * @inheritdoc | 22 | * @inheritdoc |
models/OrderProduct.php
| @@ -4,6 +4,7 @@ | @@ -4,6 +4,7 @@ | ||
| 4 | 4 | ||
| 5 | use artbox\catalog\models\Variant; | 5 | use artbox\catalog\models\Variant; |
| 6 | use Yii; | 6 | use Yii; |
| 7 | + use yii\db\ActiveRecord; | ||
| 7 | use yii\helpers\ArrayHelper; | 8 | use yii\helpers\ArrayHelper; |
| 8 | 9 | ||
| 9 | /** | 10 | /** |
| @@ -18,7 +19,7 @@ | @@ -18,7 +19,7 @@ | ||
| 18 | * @property Order $order | 19 | * @property Order $order |
| 19 | * @property Variant $variant | 20 | * @property Variant $variant |
| 20 | */ | 21 | */ |
| 21 | - class OrderProduct extends \yii\db\ActiveRecord | 22 | + class OrderProduct extends ActiveRecord |
| 22 | { | 23 | { |
| 23 | /** | 24 | /** |
| 24 | * @inheritdoc | 25 | * @inheritdoc |
views/delivery/_search.php
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | + use artbox\order\models\DeliverySearch; | ||
| 3 | use yii\helpers\Html; | 4 | use yii\helpers\Html; |
| 4 | use yii\widgets\ActiveForm; | 5 | use yii\widgets\ActiveForm; |
| 5 | 6 | ||
| 6 | /* @var $this yii\web\View */ | 7 | /* @var $this yii\web\View */ |
| 7 | - /* @var $model common\models\DeliverySearch */ | 8 | + /* @var $model DeliverySearch */ |
| 8 | /* @var $form yii\widgets\ActiveForm */ | 9 | /* @var $form yii\widgets\ActiveForm */ |
| 9 | ?> | 10 | ?> |
| 10 | 11 |
views/label/_search.php
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | + use artbox\order\models\LabelSearch; | ||
| 3 | use yii\helpers\Html; | 4 | use yii\helpers\Html; |
| 4 | use yii\widgets\ActiveForm; | 5 | use yii\widgets\ActiveForm; |
| 5 | 6 | ||
| 6 | /* @var $this yii\web\View */ | 7 | /* @var $this yii\web\View */ |
| 7 | - /* @var $model common\models\LabelSearch */ | 8 | + /* @var $model LabelSearch */ |
| 8 | /* @var $form yii\widgets\ActiveForm */ | 9 | /* @var $form yii\widgets\ActiveForm */ |
| 9 | ?> | 10 | ?> |
| 10 | 11 |
views/order-product/_search.php
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | + use artbox\order\models\OrderProductSearch; | ||
| 3 | use yii\helpers\Html; | 4 | use yii\helpers\Html; |
| 4 | use yii\widgets\ActiveForm; | 5 | use yii\widgets\ActiveForm; |
| 5 | 6 | ||
| 6 | /* @var $this yii\web\View */ | 7 | /* @var $this yii\web\View */ |
| 7 | - /* @var $model common\models\OrderProductSearch */ | 8 | + /* @var $model OrderProductSearch */ |
| 8 | /* @var $form yii\widgets\ActiveForm */ | 9 | /* @var $form yii\widgets\ActiveForm */ |
| 9 | ?> | 10 | ?> |
| 10 | 11 |
views/order-product/index.php
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | + use artbox\order\models\OrderProductSearch; | ||
| 3 | use yii\helpers\Html; | 4 | use yii\helpers\Html; |
| 4 | use yii\grid\GridView; | 5 | use yii\grid\GridView; |
| 5 | 6 | ||
| 6 | /* @var $this yii\web\View */ | 7 | /* @var $this yii\web\View */ |
| 7 | - /* @var $searchModel common\models\OrderProductSearch */ | 8 | + /* @var $searchModel OrderProductSearch */ |
| 8 | /* @var $dataProvider yii\data\ActiveDataProvider */ | 9 | /* @var $dataProvider yii\data\ActiveDataProvider */ |
| 9 | 10 | ||
| 10 | $this->title = Yii::t('order', 'Order Products'); | 11 | $this->title = Yii::t('order', 'Order Products'); |
views/order/_search.php
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | + use artbox\order\models\OrderSearch; | ||
| 3 | use yii\helpers\Html; | 4 | use yii\helpers\Html; |
| 4 | use yii\widgets\ActiveForm; | 5 | use yii\widgets\ActiveForm; |
| 5 | 6 | ||
| 6 | /* @var $this yii\web\View */ | 7 | /* @var $this yii\web\View */ |
| 7 | - /* @var $model common\models\OrderSearch */ | 8 | + /* @var $model OrderSearch */ |
| 8 | /* @var $form yii\widgets\ActiveForm */ | 9 | /* @var $form yii\widgets\ActiveForm */ |
| 9 | ?> | 10 | ?> |
| 10 | 11 |
views/payment/_search.php
| 1 | <?php | 1 | <?php |
| 2 | 2 | ||
| 3 | + use artbox\order\models\PaymentSearch; | ||
| 3 | use yii\helpers\Html; | 4 | use yii\helpers\Html; |
| 4 | use yii\widgets\ActiveForm; | 5 | use yii\widgets\ActiveForm; |
| 5 | 6 | ||
| 6 | /* @var $this yii\web\View */ | 7 | /* @var $this yii\web\View */ |
| 7 | - /* @var $model common\models\PaymentSearch */ | 8 | + /* @var $model PaymentSearch */ |
| 8 | /* @var $form yii\widgets\ActiveForm */ | 9 | /* @var $form yii\widgets\ActiveForm */ |
| 9 | ?> | 10 | ?> |
| 10 | 11 |