diff --git a/backend/modules/shop/models/ars/Order.php b/backend/modules/shop/models/ars/Order.php
index 45180ae..0925d49 100755
--- a/backend/modules/shop/models/ars/Order.php
+++ b/backend/modules/shop/models/ars/Order.php
@@ -2,8 +2,10 @@
namespace backend\modules\shop\models\ars;
+use common\models\User;
use Yii;
use yii\behaviors\TimestampBehavior;
+use yii\helpers\ArrayHelper;
/**
* This is the model class for table "ats_order".
@@ -38,6 +40,25 @@ use yii\behaviors\TimestampBehavior;
*/
class Order extends \yii\db\ActiveRecord
{
+ /*支付类型*/
+ const PAY_TYPE_WX = 1;//微信支付
+ const PAY_TYPE_BALANCES = 2;//余额支付
+ const PAY_TYPE_POINT_EXCHANGE = 3;//积分兑换
+ /*支付id*/
+ const PAY_ID_WX = 1;//微信公众号支付
+ const PAY_ID_MINI = 2;//小程序支付
+ const PAY_ID_POINTS_SHOP = 3;//积分商城兑换
+ /*配送方式*/
+ const SHIPPING_TYPE_NO_SHIPPING = 0;//无需配送
+ const SHIPPING_TYPE_PICKED_UP_BY_CUSTOMER = 1;//自提
+ const SHIPPING_TYPE_EXPRESS = 2;//快递物流
+ /*发货状态*/
+ const SHIPPING_STATUS_UNSHIPPED = 0;/*未发货*/
+ const SHIPPING_STATUS_SHIPMENT = 1;/*已发货*/
+ const SHIPPING_STATUS_TAKE = 2;/*已收货*/
+ const SHIPPING_STATUS_RETURN = 3;/*退货*/
+ const SHIPPING_STATUS_PORTION = 4;/*部分发货*/
+
/**
* {@inheritdoc}
*/
@@ -120,4 +141,52 @@ class Order extends \yii\db\ActiveRecord
],
];
}
+
+ public function getUser()
+ {
+ return $this->hasOne(User::className(), ['id' => 'user_id']);
+ }
+
+ public function getProvinceId()
+ {
+ return $this->hasOne(Province::className(), ['province_id' => 'province']);
+ }
+
+ public function getCityId()
+ {
+ return $this->hasOne(City::className(), ['city_id' => 'city']);
+ }
+ public function getAreaId()
+ {
+ return $this->hasOne(Area::className(), ['area_id' => 'area']);
+ }
+
+ /**
+ * @param $column
+ * @param null $value
+ * @return bool
+ * 获取各状态数组
+ */
+ public static function dropDown($column, $value = null)
+ {
+ $types = ExpressType::find()->asArray()->all();
+ $data = ArrayHelper::map($types, 'id', 'shipping_name');
+ $data[0] = '无需配送';
+ $dropDownList = [
+ 'pay_type' => [
+ '0' => '未支付',
+ '1' => '微信支付',
+ '2' => '余额支付',
+ '3' => '积分兑换',
+ ],
+ 'shipping_type' => $data,
+ ];
+ //根据具体值显示对应的值
+ if ($value !== null)
+ return array_key_exists($column, $dropDownList) ? $dropDownList[$column][$value] : false;
+ //返回关联数组,用户下拉的filter实现
+ else
+ return array_key_exists($column, $dropDownList) ? $dropDownList[$column] : false;
+ }
+
}
diff --git a/backend/modules/shop/models/searchs/OrderSearch.php b/backend/modules/shop/models/searchs/OrderSearch.php
index 3911f52..a7b25a9 100755
--- a/backend/modules/shop/models/searchs/OrderSearch.php
+++ b/backend/modules/shop/models/searchs/OrderSearch.php
@@ -5,7 +5,8 @@ namespace backend\modules\shop\models\searchs;
use yii\base\Model;
use yii\data\ActiveDataProvider;
use yii\helpers\ArrayHelper;
-use backend\modules\shop\models\ars\Order;
+use backend\modules\shop\models\ars\Order;
+use Yii;
/**
* OrderSearch represents the model behind the search form of ` backend\modules\shop\models\ars\Order`.
@@ -52,35 +53,64 @@ class OrderSearch extends Order
'width' => '2%',
'align' => 'center'
],
- 'id',
- 'user_id',
- 'order_sn',
- 'invoice_id',
- 'status',
- //'type',
- //'goods_count',
- //'goods_amount',
- //'shipping_amount',
- //'shipping_type',
- //'consignee',
- //'phone',
- //'province',
- //'city',
- //'area',
- //'taking_site',
- //'pay_type',
- //'pay_at',
- //'payment_sn',
- //'payment_amount',
- //'receivables',
- //'remarks',
- //'discount_amount',
- //'discount_description',
- //'updated_at',
- //'created_at',
+ 'id',
+ [
+ 'attribute' => 'user_id',
+// 'value' => function ($model) {
+// return base64_decode($model->user->nickname);
+// }
+ ],
+ 'order_sn',
+ 'invoice_id',
+ 'status',
+ 'type',
+ 'goods_count',
+ 'goods_amount',
+ 'shipping_amount',
+ 'shipping_type',
+ [
+ 'label' => '收货信息',
+ 'format' => 'raw',
+ 'value' => function ($model) {
+ return Yii::$app->controller->renderPartial('table_consignee_info', ['model' => $model]);
+ },
+ ],
+ 'taking_site',
+ 'pay_type',
+ 'pay_at',
+ 'payment_sn',
+ 'payment_amount',
+ 'receivables',
+ 'remarks',
+ 'discount_amount',
+ 'discount_description',
+ [
+ 'attribute' => 'updated_at',
+ 'value' => function ($model) {
+ return date('Y-m-d H:i:s', $model->updated_at);
+ }
+ ],
+ [
+ 'attribute' => 'created_at',
+ 'value' => function ($model) {
+ return date('Y-m-d H:i:s', $model->created_at);
+ }
+ ],
[
'class' => 'iron\grid\ActionColumn',
'align' => 'center',
+ 'config' => [
+ [
+ 'name' => 'view',
+ 'icon' => 'list',
+ 'title' => '详情',
+ ],
+ [
+ 'name' => 'update',
+ 'icon' => 'pencil',
+ 'title' => '修改'
+ ]
+ ],
],
];
}
diff --git a/backend/modules/shop/views/order/index.php b/backend/modules/shop/views/order/index.php
index 618d3d1..a2b1150 100755
--- a/backend/modules/shop/views/order/index.php
+++ b/backend/modules/shop/views/order/index.php
@@ -6,8 +6,9 @@ use iron\grid\GridView;
/* @var $this yii\web\View */
/* @var $searchModel backend\models\searchs\OrderSearch */
/* @var $dataProvider yii\data\ActiveDataProvider */
+/* @var $columns */
-$this->title = 'Orders';
+$this->title = '订单列表';
$this->params['breadcrumbs'][] = $this->title;
?>
@@ -16,10 +17,10 @@ $this->params['breadcrumbs'][] = $this->title;
'dataProvider' => $dataProvider,
'filter' => $this->render("_search", ['model' => $searchModel]),
'batch' => [
- [
- "label" => "删除",
- "url" => "order/deletes"
- ],
+// [
+// "label" => "删除",
+// "url" => "order/deletes"
+// ],
],
'columns' => $columns
]);
diff --git a/backend/modules/shop/views/order/table_consignee_info.php b/backend/modules/shop/views/order/table_consignee_info.php
new file mode 100644
index 0000000..88d3595
--- /dev/null
+++ b/backend/modules/shop/views/order/table_consignee_info.php
@@ -0,0 +1,35 @@
+
+
+
+
+
+ 联系人: |
+ = $model->consignee ?> |
+
+
+ 地址: |
+
+ = ($model->provinceId ? $model->provinceId->name : '') . ($model->cityId ? $model->cityId->name : '') . ($model->area ? $model->area->name : '') ?>
+
+ = $model->address ?>
+ |
+
+
diff --git a/composer.lock b/composer.lock
index 3565b5d..10b0a18 100644
--- a/composer.lock
+++ b/composer.lock
@@ -4,8 +4,70 @@
"Read more about it at https://getcomposer.org/doc/01-basic-usage.md#installing-dependencies",
"This file is @generated automatically"
],
- "content-hash": "2c9d2c75498023f08e9c4155af6cb5d4",
+ "content-hash": "f679ebe17a306b33afd5dede1cb05dfb",
"packages": [
+ {
+ "name": "antkaz/yii2-vue",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/antkaz/yii2-vue.git",
+ "reference": "150deabf6a08961d8876f0eaf55ca53d97badef7"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/antkaz/yii2-vue/zipball/150deabf6a08961d8876f0eaf55ca53d97badef7",
+ "reference": "150deabf6a08961d8876f0eaf55ca53d97badef7",
+ "shasum": ""
+ },
+ "require": {
+ "npm-asset/vue": "~2.6.0",
+ "yiisoft/yii2": "~2.0.14"
+ },
+ "type": "yii2-extension",
+ "autoload": {
+ "psr-4": {
+ "antkaz\\vue\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "MIT"
+ ],
+ "authors": [
+ {
+ "name": "Anton Kazarinov",
+ "email": "askazarinov@gmail.com"
+ }
+ ],
+ "description": "The Vue.js extension for the Yii framework",
+ "homepage": "https://github.com/antkaz/yii2-vue",
+ "keywords": [
+ "Vue.js",
+ "vue",
+ "yii2"
+ ],
+ "time": "2019-04-08T06:19:27+00:00"
+ },
+ {
+ "name": "bower-asset/babel",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "git@github.com:Micua/babel.git",
+ "reference": "a08c19bcf39c6d6e7bfb73598e2b3148376ab6ff"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/Micua/babel/zipball/a08c19bcf39c6d6e7bfb73598e2b3148376ab6ff",
+ "reference": "a08c19bcf39c6d6e7bfb73598e2b3148376ab6ff"
+ },
+ "type": "bower-asset",
+ "license": [
+ "MIT"
+ ],
+ "time": "2016-07-22T14:54:14+00:00"
+ },
{
"name": "bower-asset/inputmask",
"version": "3.3.11",
@@ -17,8 +79,7 @@
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/5e670ad62f50c738388d4dcec78d2888505ad77b",
- "reference": "5e670ad62f50c738388d4dcec78d2888505ad77b",
- "shasum": ""
+ "reference": "5e670ad62f50c738388d4dcec78d2888505ad77b"
},
"require": {
"bower-asset/jquery": ">=1.7"
@@ -71,14 +132,13 @@
"version": "3.4.1",
"source": {
"type": "git",
- "url": "git@github.com:jquery/jquery-dist.git",
+ "url": "https://github.com/jquery/jquery-dist.git",
"reference": "15bc73803f76bc53b654b9fdbbbc096f56d7c03d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/jquery/jquery-dist/zipball/15bc73803f76bc53b654b9fdbbbc096f56d7c03d",
- "reference": "15bc73803f76bc53b654b9fdbbbc096f56d7c03d",
- "shasum": ""
+ "reference": "15bc73803f76bc53b654b9fdbbbc096f56d7c03d"
},
"type": "bower-asset-library",
"extra": {
@@ -109,8 +169,7 @@
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/bestiejs/punycode.js/zipball/38c8d3131a82567bfef18da09f7f4db68c84f8a3",
- "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3",
- "shasum": ""
+ "reference": "38c8d3131a82567bfef18da09f7f4db68c84f8a3"
},
"type": "bower-asset-library",
"extra": {
@@ -272,6 +331,468 @@
],
"time": "2019-10-28T03:44:26+00:00"
},
+ {
+ "name": "kartik-v/bootstrap-popover-x",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/bootstrap-popover-x.git",
+ "reference": "a5fd110f7b5b133f5e9aeabd6ad969366f353536"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/bootstrap-popover-x/zipball/a5fd110f7b5b133f5e9aeabd6ad969366f353536",
+ "reference": "a5fd110f7b5b133f5e9aeabd6ad969366f353536",
+ "shasum": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.4.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "kartik\\plugins\\popover\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Kartik Visweswaran",
+ "email": "kartikv2@gmail.com",
+ "homepage": "http://www.krajee.com/"
+ }
+ ],
+ "description": "Bootstrap Popover Extended - Popover with modal behavior, styling enhancements and more.",
+ "homepage": "https://github.com/kartik-v/bootstrap-popover-x",
+ "keywords": [
+ "bootstrap",
+ "extended",
+ "jquery",
+ "modal",
+ "modal-popover",
+ "popover",
+ "popover-x"
+ ],
+ "time": "2019-09-03T03:12:53+00:00"
+ },
+ {
+ "name": "kartik-v/bootstrap-tabs-x",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/bootstrap-tabs-x.git",
+ "reference": "fb3894222cc7aed17907daf017c1ea3ce5bfb746"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/bootstrap-tabs-x/zipball/fb3894222cc7aed17907daf017c1ea3ce5bfb746",
+ "reference": "fb3894222cc7aed17907daf017c1ea3ce5bfb746",
+ "shasum": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "kartik\\plugins\\tabs\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Kartik Visweswaran",
+ "email": "kartikv2@gmail.com",
+ "homepage": "http://www.krajee.com/"
+ }
+ ],
+ "description": "Extended Bootstrap Tabs with ability to align tabs in multiple ways, add borders, rotated titles, and more.",
+ "homepage": "https://github.com/kartik-v/bootstrap-tabs-x",
+ "keywords": [
+ "bootstrap",
+ "extended",
+ "jquery",
+ "modal",
+ "modal-tabs",
+ "tabs",
+ "tabs-x"
+ ],
+ "time": "2019-05-25T06:59:26+00:00"
+ },
+ {
+ "name": "kartik-v/dependent-dropdown",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/dependent-dropdown.git",
+ "reference": "c9e0b2b5b58ad717842396053804f8d0281df1ae"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/dependent-dropdown/zipball/c9e0b2b5b58ad717842396053804f8d0281df1ae",
+ "reference": "c9e0b2b5b58ad717842396053804f8d0281df1ae",
+ "shasum": ""
+ },
+ "type": "library",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.4.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "kartik\\plugins\\depdrop\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Kartik Visweswaran",
+ "email": "kartikv2@gmail.com",
+ "homepage": "http://www.krajee.com/"
+ }
+ ],
+ "description": "A multi level dependent dropdown JQuery plugin that allows nested dependencies.",
+ "homepage": "https://github.com/kartik-v/dependent-dropdown",
+ "keywords": [
+ "dependent",
+ "dropdown",
+ "jquery",
+ "option",
+ "select"
+ ],
+ "time": "2019-09-03T03:12:44+00:00"
+ },
+ {
+ "name": "kartik-v/yii2-editable",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/yii2-editable.git",
+ "reference": "1617a4749788d0c94b5a417c965893949a4239bf"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/yii2-editable/zipball/1617a4749788d0c94b5a417c965893949a4239bf",
+ "reference": "1617a4749788d0c94b5a417c965893949a4239bf",
+ "shasum": ""
+ },
+ "require": {
+ "kartik-v/yii2-popover-x": "~1.3",
+ "kartik-v/yii2-widget-activeform": ">=1.5.7"
+ },
+ "type": "yii2-extension",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.7.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "kartik\\editable\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Kartik Visweswaran",
+ "email": "kartikv2@gmail.com",
+ "homepage": "http://www.krajee.com/"
+ }
+ ],
+ "description": "An enhanced editable widget for Yii 2.0 that allows easy editing of displayed data with numerous configuration possibilities.",
+ "homepage": "https://github.com/kartik-v/yii2-editable",
+ "keywords": [
+ "bootstrap",
+ "editable",
+ "input",
+ "jquery",
+ "popover",
+ "popover-x",
+ "widget"
+ ],
+ "time": "2019-05-25T07:13:53+00:00"
+ },
+ {
+ "name": "kartik-v/yii2-krajee-base",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/yii2-krajee-base.git",
+ "reference": "8aa48bb2e7613db45b3c34f7a9346d7f43b1f4ec"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/yii2-krajee-base/zipball/8aa48bb2e7613db45b3c34f7a9346d7f43b1f4ec",
+ "reference": "8aa48bb2e7613db45b3c34f7a9346d7f43b1f4ec",
+ "shasum": ""
+ },
+ "suggest": {
+ "yiisoft/yii2-bootstrap": "for Krajee extensions to work with Bootstrap 3.x version",
+ "yiisoft/yii2-bootstrap4": "for Krajee extensions to work with Bootstrap 4.x version"
+ },
+ "type": "yii2-extension",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "2.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "kartik\\base\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Kartik Visweswaran",
+ "email": "kartikv2@gmail.com",
+ "homepage": "http://www.krajee.com/"
+ }
+ ],
+ "description": "Base library and foundation components for all Yii2 Krajee extensions.",
+ "homepage": "https://github.com/kartik-v/yii2-krajee-base",
+ "keywords": [
+ "base",
+ "extension",
+ "foundation",
+ "krajee",
+ "widget",
+ "yii2"
+ ],
+ "time": "2019-05-25T07:25:02+00:00"
+ },
+ {
+ "name": "kartik-v/yii2-popover-x",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/yii2-popover-x.git",
+ "reference": "9bd939c9de39e399a039a36e73bce069a69d8a5e"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/yii2-popover-x/zipball/9bd939c9de39e399a039a36e73bce069a69d8a5e",
+ "reference": "9bd939c9de39e399a039a36e73bce069a69d8a5e",
+ "shasum": ""
+ },
+ "require": {
+ "kartik-v/bootstrap-popover-x": ">=1.4",
+ "kartik-v/yii2-krajee-base": ">=2.0"
+ },
+ "type": "yii2-extension",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.3.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "kartik\\popover\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Kartik Visweswaran",
+ "email": "kartikv2@gmail.com",
+ "homepage": "http://www.krajee.com/"
+ }
+ ],
+ "description": "An extended bootstrap 3.0 popover widget which combines both the bootstrap popover and modal features and includes various new styling enhancements.",
+ "homepage": "https://github.com/kartik-v/yii2-popover-x",
+ "keywords": [
+ "bootstrap",
+ "extended",
+ "jquery",
+ "modal",
+ "modal-popover",
+ "popover",
+ "popover-x"
+ ],
+ "time": "2019-05-25T07:27:12+00:00"
+ },
+ {
+ "name": "kartik-v/yii2-tabs-x",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/yii2-tabs-x.git",
+ "reference": "e5d49bb4e65f5618813d888ab9a405b13946cb5b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/yii2-tabs-x/zipball/e5d49bb4e65f5618813d888ab9a405b13946cb5b",
+ "reference": "e5d49bb4e65f5618813d888ab9a405b13946cb5b",
+ "shasum": ""
+ },
+ "require": {
+ "kartik-v/bootstrap-tabs-x": "~1.3",
+ "kartik-v/yii2-krajee-base": ">=1.9.8"
+ },
+ "type": "yii2-extension",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.2.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "kartik\\tabs\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Kartik Visweswaran",
+ "email": "kartikv2@gmail.com",
+ "homepage": "http://www.krajee.com/"
+ }
+ ],
+ "description": "An extended bootstrap 3.0 tabs widget with ability to align tabs in multiple ways, add borders, rotated titles, and more.",
+ "homepage": "https://github.com/kartik-v/yii2-tabs-x",
+ "keywords": [
+ "bootstrap",
+ "extended",
+ "jquery",
+ "modal",
+ "modal-tabs",
+ "tabs",
+ "tabs-x"
+ ],
+ "time": "2019-05-25T07:28:38+00:00"
+ },
+ {
+ "name": "kartik-v/yii2-widget-activeform",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/yii2-widget-activeform.git",
+ "reference": "4d578ff5508f1fc93ac8dd19cf22237216dfd5f9"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/yii2-widget-activeform/zipball/4d578ff5508f1fc93ac8dd19cf22237216dfd5f9",
+ "reference": "4d578ff5508f1fc93ac8dd19cf22237216dfd5f9",
+ "shasum": ""
+ },
+ "require": {
+ "kartik-v/yii2-krajee-base": ">=1.9.8"
+ },
+ "type": "yii2-extension",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.5.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "kartik\\form\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Kartik Visweswaran",
+ "email": "kartikv2@gmail.com",
+ "homepage": "http://www.krajee.com/"
+ }
+ ],
+ "description": "Enhanced Yii2 active-form and active-field with full bootstrap styling support (sub repo split from yii2-widgets).",
+ "homepage": "https://github.com/kartik-v/yii2-widget-activeform",
+ "keywords": [
+ "activefield",
+ "activeform",
+ "extension",
+ "field",
+ "form",
+ "widget",
+ "yii2"
+ ],
+ "time": "2019-09-05T13:48:09+00:00"
+ },
+ {
+ "name": "kartik-v/yii2-widget-depdrop",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/yii2-widget-depdrop.git",
+ "reference": "4dffe1fd0c9d9d5b7e6231f6cd059dfa36d22b3b"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/yii2-widget-depdrop/zipball/4dffe1fd0c9d9d5b7e6231f6cd059dfa36d22b3b",
+ "reference": "4dffe1fd0c9d9d5b7e6231f6cd059dfa36d22b3b",
+ "shasum": ""
+ },
+ "require": {
+ "kartik-v/dependent-dropdown": "~1.4",
+ "kartik-v/yii2-krajee-base": ">=2.0.0"
+ },
+ "type": "yii2-extension",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "kartik\\depdrop\\": "src"
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "Kartik Visweswaran",
+ "email": "kartikv2@gmail.com",
+ "homepage": "http://www.krajee.com/"
+ }
+ ],
+ "description": "Widget that enables setting up dependent dropdowns with nested dependencies (sub repo split from yii2-widgets)",
+ "homepage": "https://github.com/kartik-v/yii2-widget-depdrop",
+ "keywords": [
+ "dependent",
+ "dropdown",
+ "extension",
+ "form",
+ "jquery",
+ "plugin",
+ "widget",
+ "yii2"
+ ],
+ "time": "2019-05-25T07:32:15+00:00"
+ },
{
"name": "markbaker/complex",
"version": "1.4.7",
@@ -483,28 +1004,47 @@
},
{
"name": "npm-asset/bootstrap",
- "version": "4.3.1",
+ "version": "4.4.1",
"dist": {
"type": "tar",
- "url": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.3.1.tgz"
+ "url": "https://registry.npmjs.org/bootstrap/-/bootstrap-4.4.1.tgz"
},
"type": "npm-asset",
"license": [
"MIT"
]
},
+ {
+ "name": "npm-asset/vue",
+ "version": "2.6.x-dev",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/vuejs/vue.git",
+ "reference": "edf7df0c837557dd3ea8d7b42ad8d4b21858ade0"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/vuejs/vue/zipball/edf7df0c837557dd3ea8d7b42ad8d4b21858ade0",
+ "reference": "edf7df0c837557dd3ea8d7b42ad8d4b21858ade0"
+ },
+ "type": "npm-asset",
+ "license": [
+ "MIT"
+ ],
+ "time": "2019-01-11T22:51:45+00:00"
+ },
{
"name": "phpoffice/phpspreadsheet",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/PHPOffice/PhpSpreadsheet.git",
- "reference": "6a2e0cef4390c62e9847eaa09b1a2b48297d5651"
+ "reference": "1648dc9ebef6ebe0c5a172e16cf66732918416e0"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/6a2e0cef4390c62e9847eaa09b1a2b48297d5651",
- "reference": "6a2e0cef4390c62e9847eaa09b1a2b48297d5651",
+ "url": "https://api.github.com/repos/PHPOffice/PhpSpreadsheet/zipball/1648dc9ebef6ebe0c5a172e16cf66732918416e0",
+ "reference": "1648dc9ebef6ebe0c5a172e16cf66732918416e0",
"shasum": ""
},
"require": {
@@ -584,7 +1124,7 @@
"xls",
"xlsx"
],
- "time": "2019-11-17T20:53:09+00:00"
+ "time": "2019-12-01T23:13:51+00:00"
},
{
"name": "psr/simple-cache",
@@ -634,18 +1174,54 @@
],
"time": "2017-10-23T01:57:42+00:00"
},
+ {
+ "name": "xj/yii2-babel",
+ "version": "dev-master",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/xjflyttp/yii2-babel.git",
+ "reference": "b63034971497d34347db6f050eb7bb70ea2aa870"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/xjflyttp/yii2-babel/zipball/b63034971497d34347db6f050eb7bb70ea2aa870",
+ "reference": "b63034971497d34347db6f050eb7bb70ea2aa870",
+ "shasum": ""
+ },
+ "require": {
+ "bower-asset/babel": "*"
+ },
+ "type": "library",
+ "autoload": {
+ "psr-4": {
+ "xj\\babel\\": ""
+ }
+ },
+ "notification-url": "https://packagist.org/downloads/",
+ "license": [
+ "BSD-3-Clause"
+ ],
+ "authors": [
+ {
+ "name": "xjflyttp",
+ "email": "xjflyttp@gmail.com"
+ }
+ ],
+ "description": "yii2-babel",
+ "time": "2016-05-16T04:46:32+00:00"
+ },
{
"name": "yiisoft/yii2",
"version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-framework.git",
- "reference": "e5aa7e91f3c310cd47aaeb0eee05d69b2e8c7ed0"
+ "reference": "811448abe28edfbda4c77c5ba07398b6f427db11"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/e5aa7e91f3c310cd47aaeb0eee05d69b2e8c7ed0",
- "reference": "e5aa7e91f3c310cd47aaeb0eee05d69b2e8c7ed0",
+ "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/811448abe28edfbda4c77c5ba07398b6f427db11",
+ "reference": "811448abe28edfbda4c77c5ba07398b6f427db11",
"shasum": ""
},
"require": {
@@ -732,7 +1308,7 @@
"framework",
"yii2"
],
- "time": "2019-11-12T18:18:10+00:00"
+ "time": "2019-12-04T23:08:56+00:00"
},
{
"name": "yiisoft/yii2-bootstrap4",
@@ -864,12 +1440,12 @@
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-redis.git",
- "reference": "7d354043f1427e473bafa8e0626a7ff3ade95e6b"
+ "reference": "b0a658af48da996860284351970e12102a7d55e4"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-redis/zipball/7d354043f1427e473bafa8e0626a7ff3ade95e6b",
- "reference": "7d354043f1427e473bafa8e0626a7ff3ade95e6b",
+ "url": "https://api.github.com/repos/yiisoft/yii2-redis/zipball/b0a658af48da996860284351970e12102a7d55e4",
+ "reference": "b0a658af48da996860284351970e12102a7d55e4",
"shasum": ""
},
"require": {
@@ -908,7 +1484,7 @@
"session",
"yii2"
],
- "time": "2019-11-05T14:59:07+00:00"
+ "time": "2019-11-23T18:04:46+00:00"
}
],
"packages-dev": [
@@ -918,12 +1494,12 @@
"source": {
"type": "git",
"url": "https://github.com/kint-php/kint.git",
- "reference": "5cc6ac40c3b8aed404ee65a6b98a7c7ef6e6ffbb"
+ "reference": "335ac1bcaf04d87df70d8aa51e8887ba2c6d203b"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/kint-php/kint/zipball/5cc6ac40c3b8aed404ee65a6b98a7c7ef6e6ffbb",
- "reference": "5cc6ac40c3b8aed404ee65a6b98a7c7ef6e6ffbb",
+ "url": "https://api.github.com/repos/kint-php/kint/zipball/335ac1bcaf04d87df70d8aa51e8887ba2c6d203b",
+ "reference": "335ac1bcaf04d87df70d8aa51e8887ba2c6d203b",
"shasum": ""
},
"require": {
@@ -980,20 +1556,20 @@
"kint",
"php"
],
- "time": "2019-10-14T18:57:03+00:00"
+ "time": "2019-10-17T18:05:24+00:00"
},
{
"name": "opis/closure",
- "version": "3.4.1",
+ "version": "dev-master",
"source": {
"type": "git",
"url": "https://github.com/opis/closure.git",
- "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7"
+ "reference": "93ebc5712cdad8d5f489b500c59d122df2e53969"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/opis/closure/zipball/e79f851749c3caa836d7ccc01ede5828feb762c7",
- "reference": "e79f851749c3caa836d7ccc01ede5828feb762c7",
+ "url": "https://api.github.com/repos/opis/closure/zipball/93ebc5712cdad8d5f489b500c59d122df2e53969",
+ "reference": "93ebc5712cdad8d5f489b500c59d122df2e53969",
"shasum": ""
},
"require": {
@@ -1006,7 +1582,7 @@
"type": "library",
"extra": {
"branch-alias": {
- "dev-master": "3.3.x-dev"
+ "dev-master": "3.5.x-dev"
}
},
"autoload": {
@@ -1041,7 +1617,7 @@
"serialization",
"serialize"
],
- "time": "2019-10-19T18:38:51+00:00"
+ "time": "2019-11-29T22:36:02+00:00"
},
{
"name": "phpspec/php-diff",
@@ -1083,16 +1659,16 @@
},
{
"name": "yiisoft/yii2-debug",
- "version": "2.1.11",
+ "version": "2.1.12",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-debug.git",
- "reference": "72e7c6c454028366f14ccef5a93d6c18fc9dcd63"
+ "reference": "bf9234ba1369116d12ebe266d98006416a5ae304"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/72e7c6c454028366f14ccef5a93d6c18fc9dcd63",
- "reference": "72e7c6c454028366f14ccef5a93d6c18fc9dcd63",
+ "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/bf9234ba1369116d12ebe266d98006416a5ae304",
+ "reference": "bf9234ba1369116d12ebe266d98006416a5ae304",
"shasum": ""
},
"require": {
@@ -1137,20 +1713,20 @@
"debugger",
"yii2"
],
- "time": "2019-11-05T13:56:49+00:00"
+ "time": "2019-11-19T20:09:08+00:00"
},
{
"name": "yiisoft/yii2-gii",
- "version": "2.1.2",
+ "version": "2.1.3",
"source": {
"type": "git",
"url": "https://github.com/yiisoft/yii2-gii.git",
- "reference": "cf3e81953a9e9796eed4021f3065bc5c18ee3356"
+ "reference": "0dcc7d3c66de045f1b560ad4928dc67a6611f6d1"
},
"dist": {
"type": "zip",
- "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/cf3e81953a9e9796eed4021f3065bc5c18ee3356",
- "reference": "cf3e81953a9e9796eed4021f3065bc5c18ee3356",
+ "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/0dcc7d3c66de045f1b560ad4928dc67a6611f6d1",
+ "reference": "0dcc7d3c66de045f1b560ad4928dc67a6611f6d1",
"shasum": ""
},
"require": {
@@ -1188,12 +1764,17 @@
"gii",
"yii2"
],
- "time": "2019-10-08T10:28:42+00:00"
+ "time": "2019-11-19T20:19:33+00:00"
}
],
"aliases": [],
"minimum-stability": "dev",
"stability-flags": {
+ "kartik-v/yii2-tabs-x": 20,
+ "kartik-v/yii2-editable": 20,
+ "kartik-v/yii2-widget-depdrop": 20,
+ "antkaz/yii2-vue": 20,
+ "xj/yii2-babel": 20,
"yiisoft/yii2-debug": 20,
"kint-php/kint": 20,
"yiisoft/yii2-gii": 20