From 290fae5b06464dcb025bd642a8ac52521982f220 Mon Sep 17 00:00:00 2001 From: Vitaliy Date: Thu, 31 Mar 2016 11:46:01 +0300 Subject: [PATCH] 25.03.16 finish 1 --- backend/controllers/OrdersController.php | 2 +- backend/views/layouts/main-sidebar.php | 2 +- backend/views/orders/_form.php | 123 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++-------- backend/views/orders/_search.php | 2 -- backend/views/orders/index.php | 1 - backend/views/orders/view.php | 1 - common/models/Customers.php | 6 +++--- common/models/OrderItems.php | 1 + common/models/Orders.php | 21 +++++++++++++++++++++ common/translation/ru/app.php | 4 ++++ composer.json | 4 +++- composer.lock | 2168 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/controllers/CabinetController.php | 100 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/controllers/OrderController.php | 190 ---------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------------- frontend/controllers/SiteController.php | 4 +--- frontend/views/cabinet/bookmarks.php | 24 ++++++++++++++++++++++++ frontend/views/cabinet/index.php | 18 ++++++++++++++++++ frontend/views/cabinet/my-orders.php | 24 ++++++++++++++++++++++++ frontend/views/cabinet/update.php | 56 ++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/views/catalog/product.php | 11 ++++++++++- frontend/views/layouts/cabinet.php | 28 ++++++++++++++++++++++++++++ frontend/views/layouts/main.php | 2 +- frontend/views/site/cabinet.php | 37 ------------------------------------- frontend/web/css/concat_all.css | 67 +++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++ frontend/web/js/basket.js | 20 ++++++++++++++++++++ 25 files changed, 2509 insertions(+), 407 deletions(-) create mode 100644 frontend/controllers/CabinetController.php delete mode 100644 frontend/controllers/OrderController.php create mode 100644 frontend/views/cabinet/bookmarks.php create mode 100644 frontend/views/cabinet/index.php create mode 100644 frontend/views/cabinet/my-orders.php create mode 100644 frontend/views/cabinet/update.php create mode 100644 frontend/views/layouts/cabinet.php delete mode 100644 frontend/views/site/cabinet.php diff --git a/backend/controllers/OrdersController.php b/backend/controllers/OrdersController.php index 666f90c..803c32e 100644 --- a/backend/controllers/OrdersController.php +++ b/backend/controllers/OrdersController.php @@ -24,7 +24,7 @@ class OrdersController extends Controller 'class' => AccessControl::className(), 'rules' => [ [ - 'actions' => ['login', 'error'], + 'actions' => ['login', 'error','update','delete','create','view'], 'allow' => true, ], [ diff --git a/backend/views/layouts/main-sidebar.php b/backend/views/layouts/main-sidebar.php index d73e76e..7f98a6a 100644 --- a/backend/views/layouts/main-sidebar.php +++ b/backend/views/layouts/main-sidebar.php @@ -23,7 +23,7 @@ use yii\widgets\Menu; 'items' => [ ['label' => 'MAIN NAVIGATION', 'options'=>['class'=>'header']], - ['label' => 'Заказы', 'url' => ['orders/index'], 'template'=>' {label}'], + ['label' => 'Заказы', 'url' => ['/orders/index'], 'template'=>' {label}'], [ 'label' => 'Products', 'template'=>' {label}', diff --git a/backend/views/orders/_form.php b/backend/views/orders/_form.php index 5071223..071eb17 100644 --- a/backend/views/orders/_form.php +++ b/backend/views/orders/_form.php @@ -1,8 +1,11 @@ - field($model, 'customer_id')->textInput() ?> - field($model, 'name')->textInput(['maxlength' => true]) ?> field($model, 'email')->textInput(['maxlength' => true]) ?> field($model, 'phone')->textInput(['maxlength' => true]) ?> - field($model, 'delivery')->textInput() ?> + field($model, 'delivery', [ + ])->radioList([ + '1' => 'Курьерска доставка по Киеву и области', + '2' => 'В любой регион Украины', + '3' => 'Самовывоз (бесплатно)', + ], [ + 'item' => function($index, $label, $name, $checked, $value) { + + $return = '
'; + + return $return; + }, + ]); + + + ?> + + field($model, 'payment')->textInput() ?> - field($model, 'code')->textInput(['maxlength' => true]) ?> + echo $form->field($model, 'payment', [ + ])->radioList([ + '1' => 'Оплата наличными', + '2' => 'Оплата по безналичному расчету. Код ЕГРПОУ', + '3' => 'Приват 24', + '4' => 'Согласовать с менеджером', + ], [ + 'item' => function ($index, $label, $name, $checked, $value) use ($model) { + if($index != 1){ + + $return = '
'; + + return $return; + } else { + + $return = '
'; + + return $return; + } + + }, + ]); + + + ?> field($model, 'status')->textInput() ?> - field($model, 'created_at')->textInput() ?> + field($model, 'created')->widget(DatePicker::classname(), [ + 'language' => 'ru', + 'pluginOptions' => [ + 'format'=> 'yyyy-mm-d' + + ], + + ]) ?> + field($model, 'updated')->widget(DatePicker::classname(), [ + 'language' => 'ru', + 'pluginOptions' => [ + 'format'=> 'yyyy-mm-d' + + ], + + ]) ?> + + field($model, 'orderItems')->widget(MultipleInput::className(), [ + 'columns' => [ + [ + 'name' => 'order_items_id', + 'type' => MultipleInputColumn::TYPE_HIDDEN_INPUT, + ], + [ + 'name' => 'item_id', + 'type' => MultipleInputColumn::TYPE_TEXT_INPUT, + 'title' => 'item id', + ], + [ + 'name' => 'item_name', + 'type' => MultipleInputColumn::TYPE_TEXT_INPUT, + 'title' => 'name', + 'value' => function($data){ + if($data instanceof OrderItems){ + return $data->item->product->name .' '. $data->item->name; + } + }, + ], + [ + 'name' => 'item_count', + 'type' => MultipleInputColumn::TYPE_TEXT_INPUT, + 'title' => 'item count', + ], + [ + 'name' => 'price', + 'type' => MultipleInputColumn::TYPE_TEXT_INPUT, + 'title' => 'Price', + ], + ], + ]); + ?> + - field($model, 'updated_at')->textInput() ?>
isNewRecord ? Yii::t('app', 'Create') : Yii::t('app', 'Update'), ['class' => $model->isNewRecord ? 'btn btn-success' : 'btn btn-primary']) ?> diff --git a/backend/views/orders/_search.php b/backend/views/orders/_search.php index 665ffd8..35018d8 100644 --- a/backend/views/orders/_search.php +++ b/backend/views/orders/_search.php @@ -17,8 +17,6 @@ use yii\widgets\ActiveForm; field($model, 'order_id') ?> - field($model, 'customer_id') ?> - field($model, 'name') ?> field($model, 'email') ?> diff --git a/backend/views/orders/index.php b/backend/views/orders/index.php index 66f25b7..bd1a359 100644 --- a/backend/views/orders/index.php +++ b/backend/views/orders/index.php @@ -25,7 +25,6 @@ $this->params['breadcrumbs'][] = $this->title; ['class' => 'yii\grid\SerialColumn'], 'order_id', - 'customer_id', 'name', 'email:email', 'phone', diff --git a/backend/views/orders/view.php b/backend/views/orders/view.php index d25be9b..f6ab9ae 100644 --- a/backend/views/orders/view.php +++ b/backend/views/orders/view.php @@ -29,7 +29,6 @@ $this->params['breadcrumbs'][] = $this->title; 'model' => $model, 'attributes' => [ 'order_id', - 'customer_id', 'name', 'email:email', 'phone', diff --git a/common/models/Customers.php b/common/models/Customers.php index dfd894c..fc01726 100644 --- a/common/models/Customers.php +++ b/common/models/Customers.php @@ -39,9 +39,9 @@ class Customers extends User [['status', 'created_at', 'updated_at'], 'integer'], [['username', 'password_hash', 'password_reset_token', 'email', 'phone','surname'], 'string', 'max' => 255], [['auth_key'], 'string', 'max' => 32], - [['email'], 'unique'], - [['password_reset_token'], 'unique'], - [['phone'], 'unique'], +// [['email'], 'unique'], +// [['password_reset_token'], 'unique'], +// [['phone'], 'unique'], ]; } diff --git a/common/models/OrderItems.php b/common/models/OrderItems.php index 11dc3c8..e148f5d 100644 --- a/common/models/OrderItems.php +++ b/common/models/OrderItems.php @@ -2,6 +2,7 @@ namespace common\models; +use common\modules\product\models\ProductVariant; use Yii; /** diff --git a/common/models/Orders.php b/common/models/Orders.php index 4c6afe0..ea746ef 100644 --- a/common/models/Orders.php +++ b/common/models/Orders.php @@ -23,6 +23,8 @@ use yii\behaviors\TimestampBehavior; */ class Orders extends \yii\db\ActiveRecord { + + /** * @inheritdoc */ @@ -39,6 +41,7 @@ class Orders extends \yii\db\ActiveRecord { return [ [['customer_id', 'delivery', 'payment', 'status', 'created_at', 'updated_at'], 'integer'], + [['created', 'updated'],'safe'], [['name', 'email', 'phone'], 'required'], [['name', 'email', 'code'], 'string', 'max' => 255], [['phone'], 'string', 'max' => 32], @@ -55,6 +58,24 @@ class Orders extends \yii\db\ActiveRecord ]; } + + public function getCreated(){ + if(!empty($this->created_at)){ + return date("Y-m-d" , $this->created_at); + } else { + return ''; + } + } + + + public function getUpdated(){ + if(!empty($this->updated_at)){ + return date("Y-m-d" , $this->updated_at); + } else { + return ''; + } + } + /** * @inheritdoc */ diff --git a/common/translation/ru/app.php b/common/translation/ru/app.php index 37c20fe..66b4f36 100644 --- a/common/translation/ru/app.php +++ b/common/translation/ru/app.php @@ -27,4 +27,8 @@ return [ 'checkout' => 'оформить заказ', 'sum' => 'Сумма', 'continue_shopping' => 'продолжить покупки', + 'edit_personal_data' => 'Редактировать личные данные', + 'personal_data' => 'Личные данные', + 'my_orders' => 'Мои заказы', + 'bookmarks' => 'Закладки', ]; \ No newline at end of file diff --git a/composer.json b/composer.json index e8e6452..a7b5861 100644 --- a/composer.json +++ b/composer.json @@ -31,7 +31,9 @@ "rmrevin/yii2-comments": "1.4.*", "bower-asset/admin-lte": "*", "FortAwesome/Font-Awesome": "*", - "unclead/yii2-multiple-input": "~1.0" + "kartik-v/yii2-widget-datepicker": "*", + "unclead/yii2-multiple-input": "~1.0", + "codeception/codeception":"*" }, "require-dev": { "yiisoft/yii2-codeception": "*", diff --git a/composer.lock b/composer.lock index e30a2eb..dfb8f78 100644 --- a/composer.lock +++ b/composer.lock @@ -4,8 +4,8 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "hash": "7543c4377d8fa28fcee5a5d9e3aabcb8", - "content-hash": "7c7bea2b7f00d81aab75adce39789723", + "hash": "a7d36c8cf4be5f624bef0426936b9594", + "content-hash": "1e53816a430c74ec792d83ade8eac412", "packages": [ { "name": "2amigos/yii2-transliterator-helper", @@ -52,16 +52,16 @@ }, { "name": "almasaeed2010/adminlte", - "version": "v2.3.2", + "version": "v2.3.3", "source": { "type": "git", "url": "https://github.com/almasaeed2010/AdminLTE.git", - "reference": "1ee281b3b99e8d8cccdc72fb8437c6888149cb46" + "reference": "8db979795044412a2e2b4e9659788c23cb59fcd3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/almasaeed2010/AdminLTE/zipball/1ee281b3b99e8d8cccdc72fb8437c6888149cb46", - "reference": "1ee281b3b99e8d8cccdc72fb8437c6888149cb46", + "url": "https://api.github.com/repos/almasaeed2010/AdminLTE/zipball/8db979795044412a2e2b4e9659788c23cb59fcd3", + "reference": "8db979795044412a2e2b4e9659788c23cb59fcd3", "shasum": "" }, "type": "library", @@ -88,7 +88,66 @@ "theme", "web" ], - "time": "2015-10-23 14:50:49" + "time": "2016-03-24 14:31:41" + }, + { + "name": "behat/gherkin", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/Behat/Gherkin.git", + "reference": "6f005467f571c3c53477fb0a646ba8092aa54bd4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Behat/Gherkin/zipball/6f005467f571c3c53477fb0a646ba8092aa54bd4", + "reference": "6f005467f571c3c53477fb0a646ba8092aa54bd4", + "shasum": "" + }, + "require": { + "php": ">=5.3.1" + }, + "require-dev": { + "phpunit/phpunit": "~4.5|~5", + "symfony/phpunit-bridge": "~2.7|~3", + "symfony/yaml": "~2.3|~3" + }, + "suggest": { + "symfony/yaml": "If you want to parse features, represented in YAML files" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.4-dev" + } + }, + "autoload": { + "psr-0": { + "Behat\\Gherkin": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + } + ], + "description": "Gherkin DSL parser for PHP 5.3", + "homepage": "http://behat.org/", + "keywords": [ + "BDD", + "Behat", + "Cucumber", + "DSL", + "gherkin", + "parser" + ], + "time": "2015-12-31 10:51:34" }, { "name": "bower-asset/admin-lte", @@ -225,16 +284,16 @@ }, { "name": "bower-asset/jquery", - "version": "2.2.1", + "version": "2.2.2", "source": { "type": "git", "url": "https://github.com/jquery/jquery-dist.git", - "reference": "788eaba2f83e7b7445c7a83a50c81c0704423874" + "reference": "086d381cd2f3b4b8b0af85ecb2c9593a61e5b4bd" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/788eaba2f83e7b7445c7a83a50c81c0704423874", - "reference": "788eaba2f83e7b7445c7a83a50c81c0704423874", + "url": "https://api.github.com/repos/jquery/jquery-dist/zipball/086d381cd2f3b4b8b0af85ecb2c9593a61e5b4bd", + "reference": "086d381cd2f3b4b8b0af85ecb2c9593a61e5b4bd", "shasum": "" }, "type": "bower-asset-library", @@ -393,12 +452,12 @@ "source": { "type": "git", "url": "https://github.com/cebe/markdown.git", - "reference": "e4499350d8a94c4c693a7e784295eff7a717ae67" + "reference": "e2a490ceec590bf5bfd1b43bd424fb9dceceb7c5" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/cebe/markdown/zipball/e4499350d8a94c4c693a7e784295eff7a717ae67", - "reference": "e4499350d8a94c4c693a7e784295eff7a717ae67", + "url": "https://api.github.com/repos/cebe/markdown/zipball/e2a490ceec590bf5bfd1b43bd424fb9dceceb7c5", + "reference": "e2a490ceec590bf5bfd1b43bd424fb9dceceb7c5", "shasum": "" }, "require": { @@ -445,7 +504,7 @@ "markdown", "markdown-extra" ], - "time": "2016-02-09 22:09:46" + "time": "2016-03-18 13:28:11" }, { "name": "cebe/yii2-gravatar", @@ -491,6 +550,91 @@ "time": "2013-12-10 17:49:58" }, { + "name": "codeception/codeception", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/Codeception/Codeception.git", + "reference": "a04ceaea52d2a050d8df19df1a85fb1b24456477" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/Codeception/Codeception/zipball/a04ceaea52d2a050d8df19df1a85fb1b24456477", + "reference": "a04ceaea52d2a050d8df19df1a85fb1b24456477", + "shasum": "" + }, + "require": { + "behat/gherkin": "~4.4.0", + "ext-json": "*", + "ext-mbstring": "*", + "facebook/webdriver": ">=1.0.1 <2.0", + "guzzlehttp/guzzle": ">=4.1.4 <7.0", + "guzzlehttp/psr7": "~1.0", + "php": ">=5.4.0 <8.0", + "phpunit/php-code-coverage": ">=2.1.3", + "phpunit/phpunit": ">4.8.20 <6.0", + "symfony/browser-kit": ">=2.7 <3.1", + "symfony/console": ">=2.7 <3.1", + "symfony/css-selector": ">=2.7 <3.1", + "symfony/dom-crawler": ">=2.7 <3.1", + "symfony/event-dispatcher": ">=2.7 <3.1", + "symfony/finder": ">=2.7 <3.1", + "symfony/yaml": ">=2.7 <3.1" + }, + "require-dev": { + "codeception/specify": "~0.3", + "facebook/php-sdk-v4": "~5.0", + "flow/jsonpath": "~0.2", + "league/factory-muffin": "^3.0", + "league/factory-muffin-faker": "^1.0", + "monolog/monolog": "~1.8", + "pda/pheanstalk": "~3.0", + "php-amqplib/php-amqplib": "~2.4" + }, + "suggest": { + "codeception/specify": "BDD-style code blocks", + "codeception/verify": "BDD-style assertions", + "flow/jsonpath": "For using JSONPath in REST module", + "league/factory-muffin": "For DataFactory module", + "league/factory-muffin-faker": "For Faker support in DataFactory module", + "phpseclib/phpseclib": "for SFTP option in FTP Module" + }, + "bin": [ + "codecept" + ], + "type": "library", + "extra": { + "branch-alias": [] + }, + "autoload": { + "psr-4": { + "Codeception\\": "src\\Codeception", + "Codeception\\Extension\\": "ext" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Bodnarchuk", + "email": "davert@mail.ua", + "homepage": "http://codegyre.com" + } + ], + "description": "BDD-style testing framework", + "homepage": "http://codeception.com/", + "keywords": [ + "BDD", + "TDD", + "acceptance testing", + "functional testing", + "unit testing" + ], + "time": "2016-03-26 21:39:36" + }, + { "name": "developeruz/yii2-db-rbac", "version": "dev-master", "source": { @@ -533,16 +677,16 @@ }, { "name": "dmstr/yii2-adminlte-asset", - "version": "2.2.4", + "version": "2.3.0", "source": { "type": "git", "url": "https://github.com/dmstr/yii2-adminlte-asset.git", - "reference": "c842a15ceef4e903f70ac927ec3246e6d53e1148" + "reference": "73eca05cf04d70f169a88b430d2c03c3b54d623a" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/c842a15ceef4e903f70ac927ec3246e6d53e1148", - "reference": "c842a15ceef4e903f70ac927ec3246e6d53e1148", + "url": "https://api.github.com/repos/dmstr/yii2-adminlte-asset/zipball/73eca05cf04d70f169a88b430d2c03c3b54d623a", + "reference": "73eca05cf04d70f169a88b430d2c03c3b54d623a", "shasum": "" }, "require": { @@ -583,7 +727,61 @@ "extension", "yii2" ], - "time": "2015-11-06 10:35:36" + "time": "2016-03-23 04:18:15" + }, + { + "name": "doctrine/instantiator", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/doctrine/instantiator.git", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d", + "reference": "8e884e78f9f0eb1329e445619e04456e64d8051d", + "shasum": "" + }, + "require": { + "php": ">=5.3,<8.0-DEV" + }, + "require-dev": { + "athletic/athletic": "~0.1.8", + "ext-pdo": "*", + "ext-phar": "*", + "phpunit/phpunit": "~4.0", + "squizlabs/php_codesniffer": "~2.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Doctrine\\Instantiator\\": "src/Doctrine/Instantiator/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Marco Pivetta", + "email": "ocramius@gmail.com", + "homepage": "http://ocramius.github.com/" + } + ], + "description": "A small, lightweight utility to instantiate objects in PHP without invoking their constructors", + "homepage": "https://github.com/doctrine/instantiator", + "keywords": [ + "constructor", + "instantiate" + ], + "time": "2015-06-14 21:17:01" }, { "name": "ezyang/htmlpurifier", @@ -630,17 +828,60 @@ "time": "2015-08-05 01:03:42" }, { + "name": "facebook/webdriver", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/facebook/php-webdriver.git", + "reference": "1c98108ba3eb435b681655764de11502a0653705" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/facebook/php-webdriver/zipball/1c98108ba3eb435b681655764de11502a0653705", + "reference": "1c98108ba3eb435b681655764de11502a0653705", + "shasum": "" + }, + "require": { + "php": ">=5.3.19" + }, + "require-dev": { + "phpunit/phpunit": "4.6.*" + }, + "suggest": { + "phpdocumentor/phpdocumentor": "2.*" + }, + "type": "library", + "autoload": { + "psr-4": { + "Facebook\\WebDriver\\": "lib/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "Apache-2.0" + ], + "description": "A PHP client for WebDriver", + "homepage": "https://github.com/facebook/php-webdriver", + "keywords": [ + "facebook", + "php", + "selenium", + "webdriver" + ], + "time": "2015-12-31 15:58:49" + }, + { "name": "fortawesome/font-awesome", "version": "dev-master", "source": { "type": "git", "url": "https://github.com/FortAwesome/Font-Awesome.git", - "reference": "03fd1951e930d4d4754204fdc532ca493e924a1b" + "reference": "f97ab41d187553e86abb8c7f6c057c9c0b88de58" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/03fd1951e930d4d4754204fdc532ca493e924a1b", - "reference": "03fd1951e930d4d4754204fdc532ca493e924a1b", + "url": "https://api.github.com/repos/FortAwesome/Font-Awesome/zipball/f97ab41d187553e86abb8c7f6c057c9c0b88de58", + "reference": "f97ab41d187553e86abb8c7f6c057c9c0b88de58", "shasum": "" }, "require-dev": { @@ -675,7 +916,178 @@ "font", "icon" ], - "time": "2016-03-10 18:47:19" + "time": "2016-03-23 12:04:52" + }, + { + "name": "guzzlehttp/guzzle", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/guzzle/guzzle.git", + "reference": "d094e337976dff9d8e2424e8485872194e768662" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/guzzle/zipball/d094e337976dff9d8e2424e8485872194e768662", + "reference": "d094e337976dff9d8e2424e8485872194e768662", + "shasum": "" + }, + "require": { + "guzzlehttp/promises": "~1.0", + "guzzlehttp/psr7": "~1.1", + "php": ">=5.5.0" + }, + "require-dev": { + "ext-curl": "*", + "phpunit/phpunit": "~4.0", + "psr/log": "~1.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "6.2-dev" + } + }, + "autoload": { + "files": [ + "src/functions_include.php" + ], + "psr-4": { + "GuzzleHttp\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle is a PHP HTTP client library", + "homepage": "http://guzzlephp.org/", + "keywords": [ + "client", + "curl", + "framework", + "http", + "http client", + "rest", + "web service" + ], + "time": "2016-03-21 20:02:09" + }, + { + "name": "guzzlehttp/promises", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/guzzle/promises.git", + "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/promises/zipball/bb9024c526b22f3fe6ae55a561fd70653d470aa8", + "reference": "bb9024c526b22f3fe6ae55a561fd70653d470aa8", + "shasum": "" + }, + "require": { + "php": ">=5.5.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Promise\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "Guzzle promises library", + "keywords": [ + "promise" + ], + "time": "2016-03-08 01:15:46" + }, + { + "name": "guzzlehttp/psr7", + "version": "1.2.3", + "source": { + "type": "git", + "url": "https://github.com/guzzle/psr7.git", + "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/guzzle/psr7/zipball/2e89629ff057ebb49492ba08e6995d3a6a80021b", + "reference": "2e89629ff057ebb49492ba08e6995d3a6a80021b", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "psr/http-message": "~1.0" + }, + "provide": { + "psr/http-message-implementation": "1.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "psr-4": { + "GuzzleHttp\\Psr7\\": "src/" + }, + "files": [ + "src/functions_include.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Michael Dowling", + "email": "mtdowling@gmail.com", + "homepage": "https://github.com/mtdowling" + } + ], + "description": "PSR-7 message implementation", + "keywords": [ + "http", + "message", + "stream", + "uri" + ], + "time": "2016-02-18 21:54:00" }, { "name": "imagine/imagine", @@ -840,17 +1252,17 @@ "time": "2016-02-02 14:28:12" }, { - "name": "kartik-v/yii2-widget-select2", + "name": "kartik-v/yii2-widget-datepicker", "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/kartik-v/yii2-widget-select2.git", - "reference": "cb2a5992cb96bd2939e30ec1c76eba418d6a30af" + "url": "https://github.com/kartik-v/yii2-widget-datepicker.git", + "reference": "3f7b38886e334a2c8c4262f155d98812461efd36" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/cb2a5992cb96bd2939e30ec1c76eba418d6a30af", - "reference": "cb2a5992cb96bd2939e30ec1c76eba418d6a30af", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-datepicker/zipball/3f7b38886e334a2c8c4262f155d98812461efd36", + "reference": "3f7b38886e334a2c8c4262f155d98812461efd36", "shasum": "" }, "require": { @@ -859,12 +1271,12 @@ "type": "yii2-extension", "extra": { "branch-alias": { - "dev-master": "2.0.x-dev" + "dev-master": "1.3.x-dev" } }, "autoload": { "psr-4": { - "kartik\\select2\\": "" + "kartik\\date\\": "" } }, "notification-url": "https://packagist.org/downloads/", @@ -878,27 +1290,81 @@ "homepage": "http://www.krajee.com/" } ], - "description": "Enhanced Yii2 wrapper for the Select2 jQuery plugin (sub repo split from yii2-widgets).", - "homepage": "https://github.com/kartik-v/yii2-widget-select2", + "description": "Enhanced Yii2 wrapper for the bootstrap datepicker plugin (sub repo split from yii2-widgets).", + "homepage": "https://github.com/kartik-v/yii2-widget-datepicker", "keywords": [ - "dropdown", + "date", "extension", "form", "jquery", + "picker", "plugin", "select2", "widget", "yii2" ], - "time": "2016-03-10 11:33:59" + "time": "2016-03-29 09:44:50" }, { - "name": "lusitanian/oauth", - "version": "v0.3.6", + "name": "kartik-v/yii2-widget-select2", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/Lusitanian/PHPoAuthLib.git", - "reference": "4ce8c488971410233eb3b1e6d9ac4e81debb41d5" + "url": "https://github.com/kartik-v/yii2-widget-select2.git", + "reference": "cb2a5992cb96bd2939e30ec1c76eba418d6a30af" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/kartik-v/yii2-widget-select2/zipball/cb2a5992cb96bd2939e30ec1c76eba418d6a30af", + "reference": "cb2a5992cb96bd2939e30ec1c76eba418d6a30af", + "shasum": "" + }, + "require": { + "kartik-v/yii2-krajee-base": "~1.7" + }, + "type": "yii2-extension", + "extra": { + "branch-alias": { + "dev-master": "2.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "kartik\\select2\\": "" + } + }, + "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 wrapper for the Select2 jQuery plugin (sub repo split from yii2-widgets).", + "homepage": "https://github.com/kartik-v/yii2-widget-select2", + "keywords": [ + "dropdown", + "extension", + "form", + "jquery", + "plugin", + "select2", + "widget", + "yii2" + ], + "time": "2016-03-10 11:33:59" + }, + { + "name": "lusitanian/oauth", + "version": "v0.3.6", + "source": { + "type": "git", + "url": "https://github.com/Lusitanian/PHPoAuthLib.git", + "reference": "4ce8c488971410233eb3b1e6d9ac4e81debb41d5" }, "dist": { "type": "zip", @@ -1155,34 +1621,40 @@ "time": "2016-01-13 18:15:48" }, { - "name": "rmrevin/yii2-comments", - "version": "1.4.2", + "name": "phpdocumentor/reflection-docblock", + "version": "2.0.4", "source": { "type": "git", - "url": "https://github.com/rmrevin/yii2-comments.git", - "reference": "c68ddf276fe24ece0173781a8f7391a2cf7e6a12" + "url": "https://github.com/phpDocumentor/ReflectionDocBlock.git", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rmrevin/yii2-comments/zipball/c68ddf276fe24ece0173781a8f7391a2cf7e6a12", - "reference": "c68ddf276fe24ece0173781a8f7391a2cf7e6a12", + "url": "https://api.github.com/repos/phpDocumentor/ReflectionDocBlock/zipball/d68dbdc53dc358a816f00b300704702b2eaff7b8", + "reference": "d68dbdc53dc358a816f00b300704702b2eaff7b8", "shasum": "" }, "require": { - "php": ">=5.4.0", - "rmrevin/yii2-fontawesome": "~2.10", - "yiisoft/yii2": "2.0.*" + "php": ">=5.3.3" }, - "type": "yii2-extension", + "require-dev": { + "phpunit/phpunit": "~4.0" + }, + "suggest": { + "dflydev/markdown": "~1.0", + "erusev/parsedown": "~1.0" + }, + "type": "library", "extra": { - "asset-installer-paths": { - "npm-asset-library": "vendor/npm", - "bower-asset-library": "vendor/bower" + "branch-alias": { + "dev-master": "2.0.x-dev" } }, "autoload": { - "psr-4": { - "rmrevin\\yii\\module\\Comments\\": "" + "psr-0": { + "phpDocumentor": [ + "src/" + ] } }, "notification-url": "https://packagist.org/downloads/", @@ -1191,49 +1663,45 @@ ], "authors": [ { - "name": "Roman Revin", - "email": "xgismox@gmail.com", - "homepage": "http://rmrevin.ru/" + "name": "Mike van Riel", + "email": "mike.vanriel@naenius.com" } ], - "description": "Comments module for Yii2", - "keywords": [ - "comment", - "module", - "widget", - "yii" - ], - "time": "2016-03-01 13:18:41" + "time": "2015-02-03 12:10:50" }, { - "name": "rmrevin/yii2-fontawesome", - "version": "2.13.0", + "name": "phpspec/prophecy", + "version": "dev-master", "source": { "type": "git", - "url": "https://github.com/rmrevin/yii2-fontawesome.git", - "reference": "2efbfacb22be59f373d11a7e3dfa9213e2ba18a9" + "url": "https://github.com/phpspec/prophecy.git", + "reference": "b02221e42163be673f9b44a0bc92a8b4907a7c6d" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/2efbfacb22be59f373d11a7e3dfa9213e2ba18a9", - "reference": "2efbfacb22be59f373d11a7e3dfa9213e2ba18a9", + "url": "https://api.github.com/repos/phpspec/prophecy/zipball/b02221e42163be673f9b44a0bc92a8b4907a7c6d", + "reference": "b02221e42163be673f9b44a0bc92a8b4907a7c6d", "shasum": "" }, "require": { - "bower-asset/fontawesome": "4.5.*", - "php": ">=5.4.0", - "yiisoft/yii2": "2.0.*" + "doctrine/instantiator": "^1.0.2", + "php": "^5.3|^7.0", + "phpdocumentor/reflection-docblock": "~2.0", + "sebastian/comparator": "~1.1", + "sebastian/recursion-context": "~1.0" }, - "type": "yii2-extension", + "require-dev": { + "phpspec/phpspec": "~2.0" + }, + "type": "library", "extra": { - "asset-installer-paths": { - "npm-asset-library": "vendor/npm", - "bower-asset-library": "vendor/bower" + "branch-alias": { + "dev-master": "1.6.x-dev" } }, "autoload": { - "psr-4": { - "rmrevin\\yii\\fontawesome\\": "" + "psr-0": { + "Prophecy\\": "src/" } }, "notification-url": "https://packagist.org/downloads/", @@ -1242,73 +1710,1459 @@ ], "authors": [ { - "name": "Revin Roman", - "email": "roman@rmrevin.com", - "homepage": "https://rmrevin.com/" + "name": "Konstantin Kudryashov", + "email": "ever.zet@gmail.com", + "homepage": "http://everzet.com" + }, + { + "name": "Marcello Duarte", + "email": "marcello.duarte@gmail.com" } ], - "description": "Asset Bundle for Yii2 with Font Awesome", + "description": "Highly opinionated mocking framework for PHP 5.3+", + "homepage": "https://github.com/phpspec/prophecy", "keywords": [ - "asset", - "awesome", - "bundle", - "font", - "yii" - ], - "time": "2015-11-26 15:24:53" + "Double", + "Dummy", + "fake", + "mock", + "spy", + "stub" + ], + "time": "2016-02-21 17:41:21" }, { - "name": "swiftmailer/swiftmailer", - "version": "5.x-dev", + "name": "phpunit/php-code-coverage", + "version": "2.2.x-dev", "source": { "type": "git", - "url": "https://github.com/swiftmailer/swiftmailer.git", - "reference": "fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9" + "url": "https://github.com/sebastianbergmann/php-code-coverage.git", + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9", - "reference": "fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9", + "url": "https://api.github.com/repos/sebastianbergmann/php-code-coverage/zipball/eabf68b476ac7d0f73793aada060f1c1a9bf8979", + "reference": "eabf68b476ac7d0f73793aada060f1c1a9bf8979", "shasum": "" }, "require": { - "php": ">=5.3.3" + "php": ">=5.3.3", + "phpunit/php-file-iterator": "~1.3", + "phpunit/php-text-template": "~1.2", + "phpunit/php-token-stream": "~1.3", + "sebastian/environment": "^1.3.2", + "sebastian/version": "~1.0" }, "require-dev": { - "mockery/mockery": "~0.9.1,<0.9.4" + "ext-xdebug": ">=2.1.4", + "phpunit/phpunit": "~4" + }, + "suggest": { + "ext-dom": "*", + "ext-xdebug": ">=2.2.1", + "ext-xmlwriter": "*" }, "type": "library", "extra": { "branch-alias": { - "dev-master": "5.4-dev" + "dev-master": "2.2.x-dev" } }, "autoload": { - "files": [ - "lib/swift_required.php" + "classmap": [ + "src/" ] }, "notification-url": "https://packagist.org/downloads/", "license": [ - "MIT" + "BSD-3-Clause" ], "authors": [ { - "name": "Chris Corbyn" - }, + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Library that provides collection, processing, and rendering functionality for PHP code coverage information.", + "homepage": "https://github.com/sebastianbergmann/php-code-coverage", + "keywords": [ + "coverage", + "testing", + "xunit" + ], + "time": "2015-10-06 15:47:00" + }, + { + "name": "phpunit/php-file-iterator", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-file-iterator.git", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-file-iterator/zipball/6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "reference": "6150bf2c35d3fc379e50c7602b75caceaa39dbf0", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ { - "name": "Fabien Potencier", - "email": "fabien@symfony.com" + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" } ], - "description": "Swiftmailer, free feature-rich PHP mailer", - "homepage": "http://swiftmailer.org", + "description": "FilterIterator implementation that filters files based on a list of suffixes.", + "homepage": "https://github.com/sebastianbergmann/php-file-iterator/", "keywords": [ - "email", - "mail", - "mailer" + "filesystem", + "iterator" ], - "time": "2016-01-03 15:42:47" + "time": "2015-06-21 13:08:43" + }, + { + "name": "phpunit/php-text-template", + "version": "1.2.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-text-template.git", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-text-template/zipball/31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "reference": "31f8b717e51d9a2afca6c9f046f5d69fc27c8686", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Simple template engine.", + "homepage": "https://github.com/sebastianbergmann/php-text-template/", + "keywords": [ + "template" + ], + "time": "2015-06-21 13:50:34" + }, + { + "name": "phpunit/php-timer", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-timer.git", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-timer/zipball/3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "reference": "3e82f4e9fc92665fafd9157568e4dcb01d014e5b", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Utility class for timing", + "homepage": "https://github.com/sebastianbergmann/php-timer/", + "keywords": [ + "timer" + ], + "time": "2015-06-21 08:01:12" + }, + { + "name": "phpunit/php-token-stream", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/php-token-stream.git", + "reference": "cab6c6fefee93d7b7c3a01292a0fe0884ea66644" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/php-token-stream/zipball/cab6c6fefee93d7b7c3a01292a0fe0884ea66644", + "reference": "cab6c6fefee93d7b7c3a01292a0fe0884ea66644", + "shasum": "" + }, + "require": { + "ext-tokenizer": "*", + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Wrapper around PHP's tokenizer extension.", + "homepage": "https://github.com/sebastianbergmann/php-token-stream/", + "keywords": [ + "tokenizer" + ], + "time": "2015-09-23 14:46:55" + }, + { + "name": "phpunit/phpunit", + "version": "4.8.x-dev", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit.git", + "reference": "1a1b63266c046e1856fd03812a4e0ac2b51aa2d5" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit/zipball/1a1b63266c046e1856fd03812a4e0ac2b51aa2d5", + "reference": "1a1b63266c046e1856fd03812a4e0ac2b51aa2d5", + "shasum": "" + }, + "require": { + "ext-dom": "*", + "ext-json": "*", + "ext-pcre": "*", + "ext-reflection": "*", + "ext-spl": "*", + "php": ">=5.3.3", + "phpspec/prophecy": "^1.3.1", + "phpunit/php-code-coverage": "~2.1", + "phpunit/php-file-iterator": "~1.4", + "phpunit/php-text-template": "~1.2", + "phpunit/php-timer": ">=1.0.6", + "phpunit/phpunit-mock-objects": "~2.3", + "sebastian/comparator": "~1.1", + "sebastian/diff": "~1.2", + "sebastian/environment": "~1.3", + "sebastian/exporter": "~1.2", + "sebastian/global-state": "~1.0", + "sebastian/version": "~1.0", + "symfony/yaml": "~2.1|~3.0" + }, + "suggest": { + "phpunit/php-invoker": "~1.1" + }, + "bin": [ + "phpunit" + ], + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "4.8.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "The PHP Unit Testing framework.", + "homepage": "https://phpunit.de/", + "keywords": [ + "phpunit", + "testing", + "xunit" + ], + "time": "2016-03-14 15:10:21" + }, + { + "name": "phpunit/phpunit-mock-objects", + "version": "2.3.x-dev", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/phpunit-mock-objects.git", + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/phpunit-mock-objects/zipball/ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "reference": "ac8e7a3db35738d56ee9a76e78a4e03d97628983", + "shasum": "" + }, + "require": { + "doctrine/instantiator": "^1.0.2", + "php": ">=5.3.3", + "phpunit/php-text-template": "~1.2", + "sebastian/exporter": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "suggest": { + "ext-soap": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "2.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sb@sebastian-bergmann.de", + "role": "lead" + } + ], + "description": "Mock Object library for PHPUnit", + "homepage": "https://github.com/sebastianbergmann/phpunit-mock-objects/", + "keywords": [ + "mock", + "xunit" + ], + "time": "2015-10-02 06:51:40" + }, + { + "name": "psr/http-message", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/php-fig/http-message.git", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/php-fig/http-message/zipball/85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "reference": "85d63699f0dbedb190bbd4b0d2b9dc707ea4c298", + "shasum": "" + }, + "require": { + "php": ">=5.3.0" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Psr\\Http\\Message\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "PHP-FIG", + "homepage": "http://www.php-fig.org/" + } + ], + "description": "Common interface for HTTP messages", + "keywords": [ + "http", + "http-message", + "psr", + "psr-7", + "request", + "response" + ], + "time": "2015-05-04 20:22:00" + }, + { + "name": "rmrevin/yii2-comments", + "version": "1.4.2", + "source": { + "type": "git", + "url": "https://github.com/rmrevin/yii2-comments.git", + "reference": "c68ddf276fe24ece0173781a8f7391a2cf7e6a12" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rmrevin/yii2-comments/zipball/c68ddf276fe24ece0173781a8f7391a2cf7e6a12", + "reference": "c68ddf276fe24ece0173781a8f7391a2cf7e6a12", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "rmrevin/yii2-fontawesome": "~2.10", + "yiisoft/yii2": "2.0.*" + }, + "type": "yii2-extension", + "extra": { + "asset-installer-paths": { + "npm-asset-library": "vendor/npm", + "bower-asset-library": "vendor/bower" + } + }, + "autoload": { + "psr-4": { + "rmrevin\\yii\\module\\Comments\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Roman Revin", + "email": "xgismox@gmail.com", + "homepage": "http://rmrevin.ru/" + } + ], + "description": "Comments module for Yii2", + "keywords": [ + "comment", + "module", + "widget", + "yii" + ], + "time": "2016-03-01 13:18:41" + }, + { + "name": "rmrevin/yii2-fontawesome", + "version": "2.13.0", + "source": { + "type": "git", + "url": "https://github.com/rmrevin/yii2-fontawesome.git", + "reference": "2efbfacb22be59f373d11a7e3dfa9213e2ba18a9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/rmrevin/yii2-fontawesome/zipball/2efbfacb22be59f373d11a7e3dfa9213e2ba18a9", + "reference": "2efbfacb22be59f373d11a7e3dfa9213e2ba18a9", + "shasum": "" + }, + "require": { + "bower-asset/fontawesome": "4.5.*", + "php": ">=5.4.0", + "yiisoft/yii2": "2.0.*" + }, + "type": "yii2-extension", + "extra": { + "asset-installer-paths": { + "npm-asset-library": "vendor/npm", + "bower-asset-library": "vendor/bower" + } + }, + "autoload": { + "psr-4": { + "rmrevin\\yii\\fontawesome\\": "" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Revin Roman", + "email": "roman@rmrevin.com", + "homepage": "https://rmrevin.com/" + } + ], + "description": "Asset Bundle for Yii2 with Font Awesome", + "keywords": [ + "asset", + "awesome", + "bundle", + "font", + "yii" + ], + "time": "2015-11-26 15:24:53" + }, + { + "name": "sebastian/comparator", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/comparator.git", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/comparator/zipball/937efb279bd37a375bcadf584dec0726f84dbf22", + "reference": "937efb279bd37a375bcadf584dec0726f84dbf22", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/diff": "~1.2", + "sebastian/exporter": "~1.2" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.2.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides the functionality to compare PHP values for equality", + "homepage": "http://www.github.com/sebastianbergmann/comparator", + "keywords": [ + "comparator", + "compare", + "equality" + ], + "time": "2015-07-26 15:48:44" + }, + { + "name": "sebastian/diff", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/diff.git", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/diff/zipball/13edfd8706462032c2f52b4b862974dd46b71c9e", + "reference": "13edfd8706462032c2f52b4b862974dd46b71c9e", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.8" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.4-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Kore Nordmann", + "email": "mail@kore-nordmann.de" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Diff implementation", + "homepage": "https://github.com/sebastianbergmann/diff", + "keywords": [ + "diff" + ], + "time": "2015-12-08 07:14:41" + }, + { + "name": "sebastian/environment", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/environment.git", + "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/environment/zipball/dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", + "reference": "dc7a29032cf72b54f36dac15a1ca5b3a1b6029bf", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Provides functionality to handle HHVM/PHP environments", + "homepage": "http://www.github.com/sebastianbergmann/environment", + "keywords": [ + "Xdebug", + "environment", + "hhvm" + ], + "time": "2016-02-26 18:40:46" + }, + { + "name": "sebastian/exporter", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/exporter.git", + "reference": "f88f8936517d54ae6d589166810877fb2015d0a2" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/exporter/zipball/f88f8936517d54ae6d589166810877fb2015d0a2", + "reference": "f88f8936517d54ae6d589166810877fb2015d0a2", + "shasum": "" + }, + "require": { + "php": ">=5.3.3", + "sebastian/recursion-context": "~1.0" + }, + "require-dev": { + "ext-mbstring": "*", + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.3.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Volker Dusch", + "email": "github@wallbash.com" + }, + { + "name": "Bernhard Schussek", + "email": "bschussek@2bepublished.at" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides the functionality to export PHP variables for visualization", + "homepage": "http://www.github.com/sebastianbergmann/exporter", + "keywords": [ + "export", + "exporter" + ], + "time": "2015-08-09 04:23:41" + }, + { + "name": "sebastian/global-state", + "version": "1.1.1", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/global-state.git", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/global-state/zipball/bc37d50fea7d017d3d340f230811c9f1d7280af4", + "reference": "bc37d50fea7d017d3d340f230811c9f1d7280af4", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.2" + }, + "suggest": { + "ext-uopz": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + } + ], + "description": "Snapshotting of global state", + "homepage": "http://www.github.com/sebastianbergmann/global-state", + "keywords": [ + "global state" + ], + "time": "2015-10-12 03:26:01" + }, + { + "name": "sebastian/recursion-context", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/recursion-context.git", + "reference": "7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/recursion-context/zipball/7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7", + "reference": "7ff5b1b3dcc55b8ab8ae61ef99d4730940856ee7", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Jeff Welch", + "email": "whatthejeff@gmail.com" + }, + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de" + }, + { + "name": "Adam Harvey", + "email": "aharvey@php.net" + } + ], + "description": "Provides functionality to recursively process PHP variables", + "homepage": "http://www.github.com/sebastianbergmann/recursion-context", + "time": "2016-01-28 05:39:29" + }, + { + "name": "sebastian/version", + "version": "1.0.6", + "source": { + "type": "git", + "url": "https://github.com/sebastianbergmann/version.git", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/sebastianbergmann/version/zipball/58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "reference": "58b3a85e7999757d6ad81c787a1fbf5ff6c628c6", + "shasum": "" + }, + "type": "library", + "autoload": { + "classmap": [ + "src/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Sebastian Bergmann", + "email": "sebastian@phpunit.de", + "role": "lead" + } + ], + "description": "Library that helps with managing the version number of Git-hosted PHP projects", + "homepage": "https://github.com/sebastianbergmann/version", + "time": "2015-06-21 13:59:46" + }, + { + "name": "swiftmailer/swiftmailer", + "version": "5.x-dev", + "source": { + "type": "git", + "url": "https://github.com/swiftmailer/swiftmailer.git", + "reference": "fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9", + "reference": "fffbc0e2a7e376dbb0a4b5f2ff6847330f20ccf9", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "require-dev": { + "mockery/mockery": "~0.9.1,<0.9.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "5.4-dev" + } + }, + "autoload": { + "files": [ + "lib/swift_required.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Chris Corbyn" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + } + ], + "description": "Swiftmailer, free feature-rich PHP mailer", + "homepage": "http://swiftmailer.org", + "keywords": [ + "email", + "mail", + "mailer" + ], + "time": "2016-01-03 15:42:47" + }, + { + "name": "symfony/browser-kit", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/browser-kit.git", + "reference": "e07127ac31230b30887c2dddf3708d883d239b14" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/e07127ac31230b30887c2dddf3708d883d239b14", + "reference": "e07127ac31230b30887c2dddf3708d883d239b14", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/dom-crawler": "~2.8|~3.0" + }, + "require-dev": { + "symfony/css-selector": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" + }, + "suggest": { + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\BrowserKit\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony BrowserKit Component", + "homepage": "https://symfony.com", + "time": "2016-03-04 07:55:57" + }, + { + "name": "symfony/console", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/console.git", + "reference": "6b1175135bc2a74c08a28d89761272de8beed8cd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/console/zipball/6b1175135bc2a74c08a28d89761272de8beed8cd", + "reference": "6b1175135bc2a74c08a28d89761272de8beed8cd", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/event-dispatcher": "~2.8|~3.0", + "symfony/process": "~2.8|~3.0" + }, + "suggest": { + "psr/log": "For using the console logger", + "symfony/event-dispatcher": "", + "symfony/process": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Console\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Console Component", + "homepage": "https://symfony.com", + "time": "2016-03-16 17:00:50" + }, + { + "name": "symfony/css-selector", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/css-selector.git", + "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/css-selector/zipball/65e764f404685f2dc20c057e889b3ad04b2e2db0", + "reference": "65e764f404685f2dc20c057e889b3ad04b2e2db0", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\CssSelector\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Jean-François Simon", + "email": "jeanfrancois.simon@sensiolabs.com" + }, + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony CssSelector Component", + "homepage": "https://symfony.com", + "time": "2016-03-04 07:55:57" + }, + { + "name": "symfony/dom-crawler", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/dom-crawler.git", + "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/18a06d7a9af41718c20764a674a0ebba3bc40d1f", + "reference": "18a06d7a9af41718c20764a674a0ebba3bc40d1f", + "shasum": "" + }, + "require": { + "php": ">=5.5.9", + "symfony/polyfill-mbstring": "~1.0" + }, + "require-dev": { + "symfony/css-selector": "~2.8|~3.0" + }, + "suggest": { + "symfony/css-selector": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\DomCrawler\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony DomCrawler Component", + "homepage": "https://symfony.com", + "time": "2016-03-23 13:23:25" + }, + { + "name": "symfony/event-dispatcher", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/event-dispatcher.git", + "reference": "9002dcf018d884d294b1ef20a6f968efc1128f39" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/9002dcf018d884d294b1ef20a6f968efc1128f39", + "reference": "9002dcf018d884d294b1ef20a6f968efc1128f39", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "require-dev": { + "psr/log": "~1.0", + "symfony/config": "~2.8|~3.0", + "symfony/dependency-injection": "~2.8|~3.0", + "symfony/expression-language": "~2.8|~3.0", + "symfony/stopwatch": "~2.8|~3.0" + }, + "suggest": { + "symfony/dependency-injection": "", + "symfony/http-kernel": "" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\EventDispatcher\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony EventDispatcher Component", + "homepage": "https://symfony.com", + "time": "2016-03-10 10:34:12" + }, + { + "name": "symfony/finder", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/finder.git", + "reference": "c54e407b35bc098916704e9fd090da21da4c4f52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/finder/zipball/c54e407b35bc098916704e9fd090da21da4c4f52", + "reference": "c54e407b35bc098916704e9fd090da21da4c4f52", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Finder\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Finder Component", + "homepage": "https://symfony.com", + "time": "2016-03-10 11:13:05" + }, + { + "name": "symfony/polyfill-mbstring", + "version": "dev-master", + "source": { + "type": "git", + "url": "https://github.com/symfony/polyfill-mbstring.git", + "reference": "1289d16209491b584839022f29257ad859b8532d" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/polyfill-mbstring/zipball/1289d16209491b584839022f29257ad859b8532d", + "reference": "1289d16209491b584839022f29257ad859b8532d", + "shasum": "" + }, + "require": { + "php": ">=5.3.3" + }, + "suggest": { + "ext-mbstring": "For best performance" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.1-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Polyfill\\Mbstring\\": "" + }, + "files": [ + "bootstrap.php" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Nicolas Grekas", + "email": "p@tchwork.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony polyfill for the Mbstring extension", + "homepage": "https://symfony.com", + "keywords": [ + "compatibility", + "mbstring", + "polyfill", + "portable", + "shim" + ], + "time": "2016-01-20 09:13:37" + }, + { + "name": "symfony/yaml", + "version": "3.0.x-dev", + "source": { + "type": "git", + "url": "https://github.com/symfony/yaml.git", + "reference": "0047c8366744a16de7516622c5b7355336afae96" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/symfony/yaml/zipball/0047c8366744a16de7516622c5b7355336afae96", + "reference": "0047c8366744a16de7516622c5b7355336afae96", + "shasum": "" + }, + "require": { + "php": ">=5.5.9" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "3.0-dev" + } + }, + "autoload": { + "psr-4": { + "Symfony\\Component\\Yaml\\": "" + }, + "exclude-from-classmap": [ + "/Tests/" + ] + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Fabien Potencier", + "email": "fabien@symfony.com" + }, + { + "name": "Symfony Community", + "homepage": "https://symfony.com/contributors" + } + ], + "description": "Symfony Yaml Component", + "homepage": "https://symfony.com", + "time": "2016-03-04 07:55:57" + }, + { + "name": "unclead/yii2-multiple-input", + "version": "1.2.12", + "source": { + "type": "git", + "url": "https://github.com/unclead/yii2-multiple-input.git", + "reference": "3fd9a3ab9b7d11951f6aa708ba13406868e537fd" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/unclead/yii2-multiple-input/zipball/3fd9a3ab9b7d11951f6aa708ba13406868e537fd", + "reference": "3fd9a3ab9b7d11951f6aa708ba13406868e537fd", + "shasum": "" + }, + "require": { + "php": ">=5.4.0", + "yiisoft/yii2": "*" + }, + "type": "yii2-extension", + "autoload": { + "psr-4": { + "unclead\\widgets\\examples\\": "examples/", + "unclead\\widgets\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "BSD-3-Clause" + ], + "authors": [ + { + "name": "Eugene Tupikov", + "email": "unclead.nsk@gmail.com" + } + ], + "description": "Widget for handle multiple inputs for an attribute of Yii2 framework model", + "keywords": [ + "yii2", + "yii2 array input", + "yii2 multiple field", + "yii2 multiple input", + "yii2 tabular input" + ], + "time": "2016-03-09 09:01:35" }, { "name": "yiisoft/yii2", @@ -1316,12 +3170,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-framework.git", - "reference": "88ceadba3fc19ec90f72b6ba895347b7fecd3dfb" + "reference": "bcc317666439a8ec1dc28874e0577b860b6dd6b3" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/88ceadba3fc19ec90f72b6ba895347b7fecd3dfb", - "reference": "88ceadba3fc19ec90f72b6ba895347b7fecd3dfb", + "url": "https://api.github.com/repos/yiisoft/yii2-framework/zipball/bcc317666439a8ec1dc28874e0577b860b6dd6b3", + "reference": "bcc317666439a8ec1dc28874e0577b860b6dd6b3", "shasum": "" }, "require": { @@ -1402,7 +3256,7 @@ "framework", "yii2" ], - "time": "2016-03-14 12:11:50" + "time": "2016-03-30 14:53:41" }, { "name": "yiisoft/yii2-bootstrap", @@ -1410,12 +3264,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-bootstrap.git", - "reference": "4133d6b26f48615de38ea1ec04eb00c4b7057bc9" + "reference": "4dd9f52e2a376a875d998de6ab4c381291b0c69e" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/4133d6b26f48615de38ea1ec04eb00c4b7057bc9", - "reference": "4133d6b26f48615de38ea1ec04eb00c4b7057bc9", + "url": "https://api.github.com/repos/yiisoft/yii2-bootstrap/zipball/4dd9f52e2a376a875d998de6ab4c381291b0c69e", + "reference": "4dd9f52e2a376a875d998de6ab4c381291b0c69e", "shasum": "" }, "require": { @@ -1452,7 +3306,7 @@ "bootstrap", "yii2" ], - "time": "2016-03-04 00:48:53" + "time": "2016-03-30 22:44:25" }, { "name": "yiisoft/yii2-composer", @@ -1460,12 +3314,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-composer.git", - "reference": "d33d1046a5951f2f7823fe343f28ddc58b3421a4" + "reference": "348122de0b2c2e343b579f93fcda1da78cab4912" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/d33d1046a5951f2f7823fe343f28ddc58b3421a4", - "reference": "d33d1046a5951f2f7823fe343f28ddc58b3421a4", + "url": "https://api.github.com/repos/yiisoft/yii2-composer/zipball/348122de0b2c2e343b579f93fcda1da78cab4912", + "reference": "348122de0b2c2e343b579f93fcda1da78cab4912", "shasum": "" }, "require": { @@ -1499,7 +3353,7 @@ "extension installer", "yii2" ], - "time": "2016-02-06 01:03:32" + "time": "2016-03-21 19:11:44" }, { "name": "yiisoft/yii2-imagine", @@ -1507,12 +3361,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-imagine.git", - "reference": "d87e6a0d1adfd6fa5ef49c18228b2fc9bca04299" + "reference": "a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-imagine/zipball/d87e6a0d1adfd6fa5ef49c18228b2fc9bca04299", - "reference": "d87e6a0d1adfd6fa5ef49c18228b2fc9bca04299", + "url": "https://api.github.com/repos/yiisoft/yii2-imagine/zipball/a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99", + "reference": "a6c34ef6b69fb4670ba987ce4b9cfdb2131a8b99", "shasum": "" }, "require": { @@ -1547,7 +3401,7 @@ "imagine", "yii2" ], - "time": "2016-02-21 23:09:41" + "time": "2016-03-21 19:13:31" }, { "name": "yiisoft/yii2-jui", @@ -1555,12 +3409,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-jui.git", - "reference": "1425ab29929dd195f468d3c4eb340ab509f28b83" + "reference": "69cd9763b4807dbbce367d599dc615c5b8a8ef4f" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/1425ab29929dd195f468d3c4eb340ab509f28b83", - "reference": "1425ab29929dd195f468d3c4eb340ab509f28b83", + "url": "https://api.github.com/repos/yiisoft/yii2-jui/zipball/69cd9763b4807dbbce367d599dc615c5b8a8ef4f", + "reference": "69cd9763b4807dbbce367d599dc615c5b8a8ef4f", "shasum": "" }, "require": { @@ -1597,7 +3451,7 @@ "jQuery UI", "yii2" ], - "time": "2015-12-24 06:23:53" + "time": "2016-03-29 21:32:13" }, { "name": "yiisoft/yii2-swiftmailer", @@ -1605,12 +3459,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-swiftmailer.git", - "reference": "2cca1bb86444a6438b0720f8c60120a400982366" + "reference": "20775fef1047cd927908270a8d7983580304eb57" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/2cca1bb86444a6438b0720f8c60120a400982366", - "reference": "2cca1bb86444a6438b0720f8c60120a400982366", + "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/20775fef1047cd927908270a8d7983580304eb57", + "reference": "20775fef1047cd927908270a8d7983580304eb57", "shasum": "" }, "require": { @@ -1647,7 +3501,7 @@ "swiftmailer", "yii2" ], - "time": "2015-12-07 11:40:31" + "time": "2016-03-21 19:16:09" } ], "packages-dev": [ @@ -1684,12 +3538,12 @@ "source": { "type": "git", "url": "https://github.com/fzaninotto/Faker.git", - "reference": "588da2fff1b9da3acb9b6e1d7395e820102bde01" + "reference": "8deb6343c80c4edf546a6fff01a2b05c7dc59ac4" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/588da2fff1b9da3acb9b6e1d7395e820102bde01", - "reference": "588da2fff1b9da3acb9b6e1d7395e820102bde01", + "url": "https://api.github.com/repos/fzaninotto/Faker/zipball/8deb6343c80c4edf546a6fff01a2b05c7dc59ac4", + "reference": "8deb6343c80c4edf546a6fff01a2b05c7dc59ac4", "shasum": "" }, "require": { @@ -1726,7 +3580,7 @@ "faker", "fixtures" ], - "time": "2016-03-10 07:12:46" + "time": "2016-03-29 16:49:43" }, { "name": "phpspec/php-diff", @@ -1768,12 +3622,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-codeception.git", - "reference": "ee239c244fd011f11c8827f97ebe7600d03f1841" + "reference": "e01b3c46917b3f00c42f6a4aabf612cc36d792e6" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/ee239c244fd011f11c8827f97ebe7600d03f1841", - "reference": "ee239c244fd011f11c8827f97ebe7600d03f1841", + "url": "https://api.github.com/repos/yiisoft/yii2-codeception/zipball/e01b3c46917b3f00c42f6a4aabf612cc36d792e6", + "reference": "e01b3c46917b3f00c42f6a4aabf612cc36d792e6", "shasum": "" }, "require": { @@ -1805,7 +3659,7 @@ "codeception", "yii2" ], - "time": "2015-11-20 08:52:21" + "time": "2016-03-21 19:11:26" }, { "name": "yiisoft/yii2-debug", @@ -1813,12 +3667,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-debug.git", - "reference": "b258732b10a706d3fa41829f13be727e49dabd09" + "reference": "081795536b31d29106b0d1de0cb3aefa3e05e995" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/b258732b10a706d3fa41829f13be727e49dabd09", - "reference": "b258732b10a706d3fa41829f13be727e49dabd09", + "url": "https://api.github.com/repos/yiisoft/yii2-debug/zipball/081795536b31d29106b0d1de0cb3aefa3e05e995", + "reference": "081795536b31d29106b0d1de0cb3aefa3e05e995", "shasum": "" }, "require": { @@ -1852,7 +3706,7 @@ "debugger", "yii2" ], - "time": "2016-03-14 21:47:38" + "time": "2016-03-21 19:12:39" }, { "name": "yiisoft/yii2-faker", @@ -1860,12 +3714,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-faker.git", - "reference": "186c77214e0a4b75f10380b4e6e5f82788922cb7" + "reference": "a8daa97749e7154d91676405a1c59ed81e1ca999" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/186c77214e0a4b75f10380b4e6e5f82788922cb7", - "reference": "186c77214e0a4b75f10380b4e6e5f82788922cb7", + "url": "https://api.github.com/repos/yiisoft/yii2-faker/zipball/a8daa97749e7154d91676405a1c59ed81e1ca999", + "reference": "a8daa97749e7154d91676405a1c59ed81e1ca999", "shasum": "" }, "require": { @@ -1899,7 +3753,7 @@ "faker", "yii2" ], - "time": "2015-12-18 01:52:12" + "time": "2016-03-21 19:13:03" }, { "name": "yiisoft/yii2-gii", @@ -1907,12 +3761,12 @@ "source": { "type": "git", "url": "https://github.com/yiisoft/yii2-gii.git", - "reference": "ce42838abcbef076ebaf46147671d518ae69d028" + "reference": "989d6c52c92e51f0d562729c329ee1012191cba2" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/ce42838abcbef076ebaf46147671d518ae69d028", - "reference": "ce42838abcbef076ebaf46147671d518ae69d028", + "url": "https://api.github.com/repos/yiisoft/yii2-gii/zipball/989d6c52c92e51f0d562729c329ee1012191cba2", + "reference": "989d6c52c92e51f0d562729c329ee1012191cba2", "shasum": "" }, "require": { @@ -1952,7 +3806,7 @@ "gii", "yii2" ], - "time": "2016-02-21 20:39:29" + "time": "2016-03-21 19:13:26" } ], "aliases": [], diff --git a/frontend/controllers/CabinetController.php b/frontend/controllers/CabinetController.php new file mode 100644 index 0000000..e60d215 --- /dev/null +++ b/frontend/controllers/CabinetController.php @@ -0,0 +1,100 @@ + [ + 'class' => AccessControl::className(), + 'rules' => [ + [ + 'actions' => ['login', 'error'], + 'allow' => true, + ], + [ + 'actions' => ['logout', 'index', 'create', 'update', 'view', 'delete','my-orders','bookmarks'], + 'allow' => true, + 'roles' => ['@'], + ], + ], + ], + 'verbs' => [ + 'class' => VerbFilter::className(), + 'actions' => [ + 'logout' => ['post'], + ], + ], + ]; + } + + public function actionIndex(){ + return $this->render('index'); + } + + public function actionUpdate(){ + + + + $model = Yii::$app->user->identity; + + + if(Yii::$app->request->post()){ + + $model->load(Yii::$app->request->post()); + $model->validate(); + + if($model->validate()){ + $model->save(); + + } + + } + + + return $this->render('update',[ + 'model' =>$model + ]); + } + + + public function actionBookmarks(){ + return $this->render('bookmarks',[ + + ]); + } + + public function actionMyOrders(){ + return $this->render('my-orders',[ + + ]); + } + +} \ No newline at end of file diff --git a/frontend/controllers/OrderController.php b/frontend/controllers/OrderController.php deleted file mode 100644 index 3c8a520..0000000 --- a/frontend/controllers/OrderController.php +++ /dev/null @@ -1,190 +0,0 @@ -request->post()) { - $item = $items_id = array(); - - $i = 0; - $order = Yii::$app->request->post(); - - $orderData['Order'] = $order['OrderForm']; - - foreach($order['OrderForm']['one_item'] as $k => $v ){ - $item[$k]['num'] = $v['num']; - $items_id[] = $k; - $i++; - } - - $items = Items::find()->where(['id'=>$items_id])->all(); - - - $orderModel = new Order(); - $orderModel->load($orderData); - $orderModel->save(); - - - foreach($items as $one_item){ - $ItemOrderModel = new ItemOrder(); - $ItemOrderModel->order_id = $orderModel->id; - $ItemOrderModel->num = $item[$one_item->id]['num']; - $ItemOrderModel->item_id = $one_item->id; - $ItemOrderModel->price = $one_item->price * $item[$one_item->id]['num']; - $ItemOrderModel->item_name = $one_item->name; - $ItemOrderModel->save(); - } - Yii::$app->session->set('order', [] ); - return $this->redirect(['order/complete']); - } - $total_price = 0; - - $items_id = []; - - $orders = Yii::$app->session->get('order'); - - if(!empty($orders)){ - foreach($orders as $k => $v) { - $items_id[] = $k; - } - } - - - $items = Items::find()->where(['id'=>$items_id])->all(); - - foreach($items as $item) { - $total_price += $orders[$item['id']]['num'] * $item['price']; - } - - - $dataProvider = new ArrayDataProvider([ - 'allModels' => $items - ]); - - return $this->render('index', [ - 'dataProvider' => $dataProvider, - 'total_price'=> $total_price, - 'model' => new OrderForm() - ]); - } - - - public function actionComplete() - { - return $this->render('complete', [ - ]); - } - - public function actionBuyItems(){ - $data = Yii::$app->request->post(); - $sessionData = Yii::$app->session->get('order'); - if(isset($sessionData) && !array_search($data['id'],Yii::$app->session->get('order')) ){ - $array = Yii::$app->session->get('order'); - $array[$data['id']] = $data; - Yii::$app->session->set('order', $array ); - } else { - $array[$data['id']] = $data; - Yii::$app->session->set('order', $array ); - } - echo count(Yii::$app->session->get('order')); - - } - /** - * Displays a single Order model. - * @param integer $id - * @return mixed - */ - public function actionView($id) - { - return $this->render('view', [ - 'model' => $this->findModel($id), - ]); - } - - /** - * Creates a new Order model. - * If creation is successful, the browser will be redirected to the 'view' page. - * @return mixed - */ - public function actionCreate() - { - $model = new Order(); - - if ($model->load(Yii::$app->request->post()) && $model->save()) { - return $this->redirect(['view', 'id' => $model->id]); - } else { - return $this->render('create', [ - 'model' => $model, - ]); - } - } - - /** - * Updates an existing Order 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); - - if ($model->load(Yii::$app->request->post()) && $model->save()) { - return $this->redirect(['view', 'id' => $model->id]); - } else { - return $this->render('update', [ - 'model' => $model, - ]); - } - } - - /** - * Deletes an existing Order model. - * If deletion is successful, the browser will be redirected to the 'index' page. - * @param integer $id - * @return mixed - */ - public function actionDelete() - { - $data = Yii::$app->request->post(); - $sessionData = Yii::$app->session->get('order'); - unset($sessionData[$data['id']]); - Yii::$app->session->set('order', $sessionData); - return count(Yii::$app->session->get('order')); - } - - /** - * Finds the Order model based on its primary key value. - * If the model is not found, a 404 HTTP exception will be thrown. - * @param integer $id - * @return Order the loaded model - * @throws NotFoundHttpException if the model cannot be found - */ - protected function findModel($id) - { - if (($model = Order::findOne($id)) !== null) { - return $model; - } else { - throw new NotFoundHttpException('The requested page does not exist.'); - } - } -} diff --git a/frontend/controllers/SiteController.php b/frontend/controllers/SiteController.php index edcedb2..b6b60fb 100644 --- a/frontend/controllers/SiteController.php +++ b/frontend/controllers/SiteController.php @@ -236,7 +236,5 @@ class SiteController extends Controller } - public function actionCabinet(){ - return $this->render('cabinet'); - } + } diff --git a/frontend/views/cabinet/bookmarks.php b/frontend/views/cabinet/bookmarks.php new file mode 100644 index 0000000..804d20d --- /dev/null +++ b/frontend/views/cabinet/bookmarks.php @@ -0,0 +1,24 @@ +title = 'Закладки'; +$this->params['breadcrumbs'][] = $this->title; +use yii\helpers\Html; +use yii\helpers\Url; +use yii\widgets\ActiveForm; +?> + +'' +]); ?> + + + + + + + \ No newline at end of file diff --git a/frontend/views/cabinet/index.php b/frontend/views/cabinet/index.php new file mode 100644 index 0000000..0cd910e --- /dev/null +++ b/frontend/views/cabinet/index.php @@ -0,0 +1,18 @@ +title = 'Moй кабинет'; +$this->params['breadcrumbs'][] = $this->title; + +?> + +
+
Имя
+
e-mail
+
Телефон
+
+ +
+ +
user->identity->name ?>
+
user->identity->email ?>
+
user->identity->phone ?>
+
\ No newline at end of file diff --git a/frontend/views/cabinet/my-orders.php b/frontend/views/cabinet/my-orders.php new file mode 100644 index 0000000..72f32c9 --- /dev/null +++ b/frontend/views/cabinet/my-orders.php @@ -0,0 +1,24 @@ +title = 'Мои заказы'; +$this->params['breadcrumbs'][] = $this->title; +use yii\helpers\Html; +use yii\helpers\Url; +use yii\widgets\ActiveForm; +?> + +'' +]); ?> + + + + + + + \ No newline at end of file diff --git a/frontend/views/cabinet/update.php b/frontend/views/cabinet/update.php new file mode 100644 index 0000000..dbb8439 --- /dev/null +++ b/frontend/views/cabinet/update.php @@ -0,0 +1,56 @@ +title = 'Редактировать личные данные'; + $this->params['breadcrumbs'][] = $this->title; + use yii\helpers\Html; + use yii\helpers\Url; + use yii\widgets\ActiveForm; +?> + +'' +]); ?> + +
+
+ + + field($model, 'email', [ + 'template' => '', + ]) ?> + + + + field($model, 'username',[ + 'template' => '', + ])->textInput() ?> + + + + field($model, 'surname',[ + 'template' => '', + ])->textInput() ?> + + + + field($model, 'phone', [ + 'template' => '', + ])->textInput() ?> + + + + + 'my_cust_cabinet_btn']) ?> + +
+
+ + + + + \ No newline at end of file diff --git a/frontend/views/catalog/product.php b/frontend/views/catalog/product.php index 3d40160..931b584 100644 --- a/frontend/views/catalog/product.php +++ b/frontend/views/catalog/product.php @@ -11,7 +11,7 @@ $this->params['breadcrumbs'][] = $product->name .' #'. $product->variant->sku; ?>

name .' '. $product->variant->name?>

-
+
image)) :?> @@ -19,9 +19,18 @@ $this->params['breadcrumbs'][] = $product->name .' #'. $product->variant->sku; <?= $product->image->alt ? $product->image->alt : $product->name?> +
+
+ +
images)) :?>
images as $image) :?> diff --git a/frontend/views/layouts/cabinet.php b/frontend/views/layouts/cabinet.php new file mode 100644 index 0000000..35243f7 --- /dev/null +++ b/frontend/views/layouts/cabinet.php @@ -0,0 +1,28 @@ +beginContent('@app/views/layouts/site_content.php'); +?> +

+ +
+
+
+
+
+
+
+ +
+
+
+ + + +
+
+
+
+endContent() ?> \ No newline at end of file diff --git a/frontend/views/layouts/main.php b/frontend/views/layouts/main.php index 9fad0ff..77d7c60 100644 --- a/frontend/views/layouts/main.php +++ b/frontend/views/layouts/main.php @@ -43,7 +43,7 @@ AppAsset::register($this);
  • Регистрация
    • -
  • user->identity->username , Url::toRoute(['site/cabinet'])); ?>
    • +
  • user->identity->username , Url::toRoute(['cabinet/index'])); ?>
    • diff --git a/frontend/views/site/cabinet.php b/frontend/views/site/cabinet.php deleted file mode 100644 index b04792c..0000000 --- a/frontend/views/site/cabinet.php +++ /dev/null @@ -1,37 +0,0 @@ -title = 'Moй кабинет'; -$this->params['breadcrumbs'][] = $this->title; - -?> - - -

    Личные данные

    - -
    -
    -
    Личные данные
    -
    Мои заказы
    -
    Закладки
    -
    - -
    -
    Имя
    -
    e-mail
    -
    Телефон
    -
    - -
    -
    user->identity->name ?>
    -
    user->identity->email ?>
    -
    user->identity->phone ?>
    -
    - -
    -
    Редактировать личные данные
    -
    -
    -
    \ No newline at end of file diff --git a/frontend/web/css/concat_all.css b/frontend/web/css/concat_all.css index 0824c4e..7f38f76 100644 --- a/frontend/web/css/concat_all.css +++ b/frontend/web/css/concat_all.css @@ -1633,6 +1633,7 @@ span.red { .cabinet_wrap .block_01 { display: inline-block; + vertical-align: top; width: 233px; } @@ -3160,4 +3161,70 @@ span.red { width: 265px; text-align: left; color: #D75C5C; +} + +.customer_content{ + display: inline-block; + width: 420px; +} +.modal_wrapper_cabinet .cabinet_window label { + display: block; + font-size: 13px; + width: 500px; + margin: auto; + margin-bottom: 8px; +} + +.modal_wrapper_cabinet .cabinet_window input { + padding: 8px; + width: 251px; + margin-right: 56px; + margin-left: 11px; + border: 1px solid #C6C7C9; + -webkit-border-radius: 3px; + border-radius: 3px; +} + +.modal_wrapper_cabinet .cabinet_window{ + + text-align: right; +} + + +.modal_wrapper_cabinet{ + margin-left: -60px; +} + +.my_cust_cabinet_btn{ + font-family: 'Ubuntu', sans-serif; + background-color: #6aa033; + border: 0; + color: #ffffff; + padding-top: 8px; + padding-bottom: 8px; + font-size: 13px; + border-top: 1px solid #6aa033; + border-bottom: 2px solid #588c23; + border-radius: 0px 2px 2px 0px; + cursor: pointer; + padding-right: 10px; + padding-left: 10px; + z-index: 2; + height: 38px; +} + +.product_service{ + margin-top: 10px; +} +.product_service ul li{ + font-size: 13px; +} +.product_service ul li.item1 { + background: url('/images/li1.png') left no-repeat; + padding: 3px 23px; +} + +.product_service ul li.item3 { + background: url('/images/li3.png') left no-repeat; + padding: 3px 23px; } \ No newline at end of file diff --git a/frontend/web/js/basket.js b/frontend/web/js/basket.js index a3b3574..c943b3b 100644 --- a/frontend/web/js/basket.js +++ b/frontend/web/js/basket.js @@ -143,5 +143,25 @@ $(document).ready(function(){ input.val(number); }); + /****************************compare and bookmarks********************************************/ + + function addItemToCompare(id){ + $.post( "/orders/compare", {id: id}, function( data ) { + }); + } + + $('#add_to_compare').click(function (event) { + event.preventDefault(); + var id = $('#one_item_block').data('id'); + addItemToCompare(id); + }); + + $('#add_to_bookmarks').click(function(event){ + event.preventDefault(); + var id = $('#one_item_block').data('id'); + $.post( "/orders/bookmarks", {id: id}, function( data ) { + }); + }); + }); \ No newline at end of file -- libgit2 0.21.4