diff --git a/composer.json b/composer.json
index 180e5f1..a7dbfb5 100755
--- a/composer.json
+++ b/composer.json
@@ -33,7 +33,8 @@
"kartik-v/yii2-widget-select2": "@dev",
"phpoffice/phpexcel": "^1.8",
"bower-asset/amcharts": "@dev",
- "bower-asset/pnotify": "@dev"
+ "bower-asset/pnotify": "@dev",
+ "kartik-v/yii2-widget-colorinput": "*"
},
"require-dev": {
"yiisoft/yii2-debug": "~2.0.0",
diff --git a/composer.lock b/composer.lock
index 33dca47..0a3b5d6 100755
--- a/composer.lock
+++ b/composer.lock
@@ -4,7 +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"
],
- "content-hash": "ee517d5a3aceb2f736a9f4528c5a3e11",
+ "hash": "482c96d17c08496f9d67ccef1d071cc3",
+ "content-hash": "ea8f4f552cdc9b0c7ac2eeb4ae9afa66",
"packages": [
{
"name": "2amigos/yii2-tinymce-widget",
@@ -64,7 +65,7 @@
"yii 2",
"yii2"
],
- "time": "2015-03-28T21:53:43+00:00"
+ "time": "2015-03-28 21:53:43"
},
{
"name": "bower-asset/amcharts",
@@ -102,7 +103,10 @@
},
"type": "bower-asset-library",
"extra": {
- "bower-asset-main": "./dist/amcharts/amcharts.js"
+ "bower-asset-main": "./dist/amcharts/amcharts.js",
+ "branch-alias": {
+ "dev-master": "3.13.0-dev"
+ }
},
"time": "2015-01-28 07:40:20"
},
@@ -121,7 +125,7 @@
"shasum": ""
},
"require": {
- "bower-asset/jquery": ">=1.9.1,<4.0"
+ "bower-asset/jquery": ">=1.9.1,<=3"
},
"type": "bower-asset-library",
"extra": {
@@ -572,7 +576,7 @@
"markdown",
"markdown-extra"
],
- "time": "2016-09-14T20:40:20+00:00"
+ "time": "2016-09-14 20:40:20"
},
{
"name": "ezyang/htmlpurifier",
@@ -619,7 +623,7 @@
"keywords": [
"html"
],
- "time": "2017-03-13T06:30:53+00:00"
+ "time": "2017-03-13 06:30:53"
},
{
"name": "firebase/php-jwt",
@@ -662,7 +666,7 @@
],
"description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
"homepage": "https://github.com/firebase/php-jwt",
- "time": "2016-07-18T04:51:16+00:00"
+ "time": "2016-07-18 04:51:16"
},
{
"name": "fortawesome/font-awesome",
@@ -710,7 +714,7 @@
"font",
"icon"
],
- "time": "2016-10-24T15:52:54+00:00"
+ "time": "2016-10-24 15:52:54"
},
{
"name": "google/apiclient",
@@ -769,7 +773,7 @@
"keywords": [
"google"
],
- "time": "2017-03-22T18:32:04+00:00"
+ "time": "2017-03-22 18:32:04"
},
{
"name": "google/apiclient-services",
@@ -806,7 +810,7 @@
"keywords": [
"google"
],
- "time": "2017-03-13T17:40:44+00:00"
+ "time": "2017-03-13 17:40:44"
},
{
"name": "google/auth",
@@ -854,7 +858,7 @@
"google",
"oauth2"
],
- "time": "2016-11-02T14:59:14+00:00"
+ "time": "2016-11-02 14:59:14"
},
{
"name": "guzzlehttp/guzzle",
@@ -916,7 +920,7 @@
"rest",
"web service"
],
- "time": "2017-02-28T22:50:30+00:00"
+ "time": "2017-02-28 22:50:30"
},
{
"name": "guzzlehttp/promises",
@@ -967,7 +971,7 @@
"keywords": [
"promise"
],
- "time": "2016-12-20T10:07:11+00:00"
+ "time": "2016-12-20 10:07:11"
},
{
"name": "guzzlehttp/psr7",
@@ -1032,7 +1036,7 @@
"uri",
"url"
],
- "time": "2017-03-20T17:10:46+00:00"
+ "time": "2017-03-20 17:10:46"
},
{
"name": "hiqdev/yii2-asset-icheck",
@@ -1104,7 +1108,7 @@
"iCheck",
"yii2"
],
- "time": "2016-03-30T10:59:26+00:00"
+ "time": "2016-03-30 10:59:26"
},
{
"name": "hiqdev/yii2-asset-pnotify",
@@ -1166,7 +1170,7 @@
"pnotify",
"yii2"
],
- "time": "2015-09-09T15:16:38+00:00"
+ "time": "2015-09-09 15:16:38"
},
{
"name": "imagine/imagine",
@@ -1223,7 +1227,7 @@
"image manipulation",
"image processing"
],
- "time": "2015-09-19T16:54:05+00:00"
+ "time": "2015-09-19 16:54:05"
},
{
"name": "kartik-v/bootstrap-fileinput",
@@ -1276,7 +1280,7 @@
"progress",
"upload"
],
- "time": "2017-04-02T18:38:08+00:00"
+ "time": "2017-04-02 18:38:08"
},
{
"name": "kartik-v/yii2-krajee-base",
@@ -1327,7 +1331,61 @@
"widget",
"yii2"
],
- "time": "2017-02-22T05:58:53+00:00"
+ "time": "2017-02-22 05:58:53"
+ },
+ {
+ "name": "kartik-v/yii2-widget-colorinput",
+ "version": "v1.0.3",
+ "source": {
+ "type": "git",
+ "url": "https://github.com/kartik-v/yii2-widget-colorinput.git",
+ "reference": "3f6e847ef72cf6e27e4d3b4870b00b8f80d51752"
+ },
+ "dist": {
+ "type": "zip",
+ "url": "https://api.github.com/repos/kartik-v/yii2-widget-colorinput/zipball/3f6e847ef72cf6e27e4d3b4870b00b8f80d51752",
+ "reference": "3f6e847ef72cf6e27e4d3b4870b00b8f80d51752",
+ "shasum": ""
+ },
+ "require": {
+ "kartik-v/yii2-krajee-base": "*"
+ },
+ "type": "yii2-extension",
+ "extra": {
+ "branch-alias": {
+ "dev-master": "1.0.x-dev"
+ }
+ },
+ "autoload": {
+ "psr-4": {
+ "kartik\\color\\": ""
+ }
+ },
+ "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 Yii 2 widget encapsulating the HTML 5 color input (sub repo split from yii2-widgets)",
+ "homepage": "https://github.com/kartik-v/yii2-widget-colorinput",
+ "keywords": [
+ "HTML5",
+ "color",
+ "extension",
+ "form",
+ "input",
+ "jquery",
+ "plugin",
+ "widget",
+ "yii2"
+ ],
+ "time": "2016-01-14 11:15:49"
},
{
"name": "kartik-v/yii2-widget-fileinput",
@@ -1382,7 +1440,7 @@
"widget",
"yii2"
],
- "time": "2016-06-16T06:53:01+00:00"
+ "time": "2016-06-16 06:53:01"
},
{
"name": "kartik-v/yii2-widget-select2",
@@ -1513,7 +1571,7 @@
"logging",
"psr-3"
],
- "time": "2017-03-13T07:08:03+00:00"
+ "time": "2017-03-13 07:08:03"
},
{
"name": "noam148/yii2-image-manager",
@@ -1562,7 +1620,7 @@
"widget",
"yii2"
],
- "time": "2017-04-23T15:41:45+00:00"
+ "time": "2017-04-23 15:41:45"
},
{
"name": "noam148/yii2-image-resize",
@@ -1608,7 +1666,7 @@
"resize",
"yii2"
],
- "time": "2016-11-29T18:17:37+00:00"
+ "time": "2016-11-29 18:17:37"
},
{
"name": "phpoffice/phpexcel",
@@ -1665,7 +1723,7 @@
"xls",
"xlsx"
],
- "time": "2015-05-01T07:00:55+00:00"
+ "time": "2015-05-01 07:00:55"
},
{
"name": "phpseclib/phpseclib",
@@ -1757,7 +1815,7 @@
"x.509",
"x509"
],
- "time": "2016-10-04T00:57:04+00:00"
+ "time": "2016-10-04 00:57:04"
},
{
"name": "psr/cache",
@@ -1803,7 +1861,7 @@
"psr",
"psr-6"
],
- "time": "2016-08-06T20:24:11+00:00"
+ "time": "2016-08-06 20:24:11"
},
{
"name": "psr/http-message",
@@ -1853,7 +1911,7 @@
"request",
"response"
],
- "time": "2016-08-06T14:39:51+00:00"
+ "time": "2016-08-06 14:39:51"
},
{
"name": "psr/log",
@@ -1900,7 +1958,7 @@
"psr",
"psr-3"
],
- "time": "2016-10-10T12:19:37+00:00"
+ "time": "2016-10-10 12:19:37"
},
{
"name": "rmrevin/yii2-fontawesome",
@@ -1952,7 +2010,7 @@
"font",
"yii"
],
- "time": "2017-01-11T14:05:47+00:00"
+ "time": "2017-01-11 14:05:47"
},
{
"name": "speixoto/yii2-amcharts",
@@ -1994,7 +2052,7 @@
"amcharts",
"yii"
],
- "time": "2016-08-23T13:52:28+00:00"
+ "time": "2016-08-23 13:52:28"
},
{
"name": "swiftmailer/swiftmailer",
@@ -2048,7 +2106,7 @@
"mail",
"mailer"
],
- "time": "2017-04-20T17:32:18+00:00"
+ "time": "2017-04-20 17:32:18"
},
{
"name": "tinymce/tinymce",
@@ -2094,7 +2152,7 @@
"tinymce",
"wysiwyg"
],
- "time": "2017-04-25T12:41:19+00:00"
+ "time": "2017-04-25 12:41:19"
},
{
"name": "yii2tech/filedb",
@@ -2142,7 +2200,7 @@
"static",
"yii2"
],
- "time": "2017-02-06T10:58:30+00:00"
+ "time": "2017-02-06 10:58:30"
},
{
"name": "yiisoft/yii2",
@@ -2242,7 +2300,7 @@
"framework",
"yii2"
],
- "time": "2017-02-08T09:04:32+00:00"
+ "time": "2017-02-08 09:04:32"
},
{
"name": "yiisoft/yii2-bootstrap",
@@ -2292,7 +2350,7 @@
"bootstrap",
"yii2"
],
- "time": "2016-03-17T03:29:28+00:00"
+ "time": "2016-03-17 03:29:28"
},
{
"name": "yiisoft/yii2-composer",
@@ -2342,7 +2400,7 @@
"extension installer",
"yii2"
],
- "time": "2016-12-20T13:26:02+00:00"
+ "time": "2016-12-20 13:26:02"
},
{
"name": "yiisoft/yii2-imagine",
@@ -2390,7 +2448,7 @@
"imagine",
"yii2"
],
- "time": "2016-11-03T19:28:39+00:00"
+ "time": "2016-11-03 19:28:39"
},
{
"name": "yiisoft/yii2-swiftmailer",
@@ -2440,7 +2498,7 @@
"swiftmailer",
"yii2"
],
- "time": "2016-09-09T11:48:11+00:00"
+ "time": "2016-09-09 11:48:11"
},
{
"name": "yiister/yii2-gentelella",
@@ -2498,7 +2556,7 @@
"theme",
"yii2"
],
- "time": "2017-03-21T14:59:58+00:00"
+ "time": "2017-03-21 14:59:58"
}
],
"packages-dev": [
@@ -2559,7 +2617,7 @@
"gherkin",
"parser"
],
- "time": "2016-10-30T11:50:56+00:00"
+ "time": "2016-10-30 11:50:56"
},
{
"name": "bower-asset/typeahead.js",
@@ -2677,7 +2735,7 @@
"functional testing",
"unit testing"
],
- "time": "2017-03-25T03:34:50+00:00"
+ "time": "2017-03-25 03:34:50"
},
{
"name": "codeception/verify",
@@ -2713,7 +2771,7 @@
}
],
"description": "BDD assertion library for PHPUnit",
- "time": "2017-01-09T10:58:51+00:00"
+ "time": "2017-01-09 10:58:51"
},
{
"name": "doctrine/instantiator",
@@ -2767,7 +2825,7 @@
"constructor",
"instantiate"
],
- "time": "2015-06-14T21:17:01+00:00"
+ "time": "2015-06-14 21:17:01"
},
{
"name": "fzaninotto/faker",
@@ -2815,7 +2873,7 @@
"faker",
"fixtures"
],
- "time": "2016-04-29T12:21:54+00:00"
+ "time": "2016-04-29 12:21:54"
},
{
"name": "myclabs/deep-copy",
@@ -2857,7 +2915,7 @@
"object",
"object graph"
],
- "time": "2017-04-12T18:52:22+00:00"
+ "time": "2017-04-12 18:52:22"
},
{
"name": "phpdocumentor/reflection-common",
@@ -2911,7 +2969,7 @@
"reflection",
"static analysis"
],
- "time": "2015-12-27T11:43:31+00:00"
+ "time": "2015-12-27 11:43:31"
},
{
"name": "phpdocumentor/reflection-docblock",
@@ -2956,7 +3014,7 @@
}
],
"description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
- "time": "2016-09-30T07:12:33+00:00"
+ "time": "2016-09-30 07:12:33"
},
{
"name": "phpdocumentor/type-resolver",
@@ -3003,7 +3061,7 @@
"email": "me@mikevanriel.com"
}
],
- "time": "2016-11-25T06:54:22+00:00"
+ "time": "2016-11-25 06:54:22"
},
{
"name": "phpspec/php-diff",
@@ -3041,7 +3099,7 @@
}
],
"description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
- "time": "2016-04-07T12:29:16+00:00"
+ "time": "2016-04-07 12:29:16"
},
{
"name": "phpspec/prophecy",
@@ -3104,7 +3162,7 @@
"spy",
"stub"
],
- "time": "2017-03-02T20:05:34+00:00"
+ "time": "2017-03-02 20:05:34"
},
{
"name": "phpunit/php-code-coverage",
@@ -3167,7 +3225,7 @@
"testing",
"xunit"
],
- "time": "2017-04-02T07:44:40+00:00"
+ "time": "2017-04-02 07:44:40"
},
{
"name": "phpunit/php-file-iterator",
@@ -3214,7 +3272,7 @@
"filesystem",
"iterator"
],
- "time": "2016-10-03T07:40:28+00:00"
+ "time": "2016-10-03 07:40:28"
},
{
"name": "phpunit/php-text-template",
@@ -3255,7 +3313,7 @@
"keywords": [
"template"
],
- "time": "2015-06-21T13:50:34+00:00"
+ "time": "2015-06-21 13:50:34"
},
{
"name": "phpunit/php-timer",
@@ -3304,7 +3362,7 @@
"keywords": [
"timer"
],
- "time": "2017-02-26T11:10:40+00:00"
+ "time": "2017-02-26 11:10:40"
},
{
"name": "phpunit/php-token-stream",
@@ -3353,7 +3411,7 @@
"keywords": [
"tokenizer"
],
- "time": "2017-02-27T10:12:30+00:00"
+ "time": "2017-02-27 10:12:30"
},
{
"name": "phpunit/phpunit",
@@ -3435,7 +3493,7 @@
"testing",
"xunit"
],
- "time": "2017-04-03T02:22:27+00:00"
+ "time": "2017-04-03 02:22:27"
},
{
"name": "phpunit/phpunit-mock-objects",
@@ -3494,7 +3552,7 @@
"mock",
"xunit"
],
- "time": "2016-12-08T20:27:08+00:00"
+ "time": "2016-12-08 20:27:08"
},
{
"name": "sebastian/code-unit-reverse-lookup",
@@ -3539,7 +3597,7 @@
],
"description": "Looks up which function or method a line of code belongs to",
"homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
- "time": "2017-03-04T06:30:41+00:00"
+ "time": "2017-03-04 06:30:41"
},
{
"name": "sebastian/comparator",
@@ -3603,7 +3661,7 @@
"compare",
"equality"
],
- "time": "2017-01-29T09:50:25+00:00"
+ "time": "2017-01-29 09:50:25"
},
{
"name": "sebastian/diff",
@@ -3655,7 +3713,7 @@
"keywords": [
"diff"
],
- "time": "2015-12-08T07:14:41+00:00"
+ "time": "2015-12-08 07:14:41"
},
{
"name": "sebastian/environment",
@@ -3705,7 +3763,7 @@
"environment",
"hhvm"
],
- "time": "2016-11-26T07:53:53+00:00"
+ "time": "2016-11-26 07:53:53"
},
{
"name": "sebastian/exporter",
@@ -3772,7 +3830,7 @@
"export",
"exporter"
],
- "time": "2016-11-19T08:54:04+00:00"
+ "time": "2016-11-19 08:54:04"
},
{
"name": "sebastian/global-state",
@@ -3823,7 +3881,7 @@
"keywords": [
"global state"
],
- "time": "2015-10-12T03:26:01+00:00"
+ "time": "2015-10-12 03:26:01"
},
{
"name": "sebastian/object-enumerator",
@@ -3869,7 +3927,7 @@
],
"description": "Traverses array structures and object graphs to enumerate all referenced objects",
"homepage": "https://github.com/sebastianbergmann/object-enumerator/",
- "time": "2017-02-18T15:18:39+00:00"
+ "time": "2017-02-18 15:18:39"
},
{
"name": "sebastian/recursion-context",
@@ -3922,7 +3980,7 @@
],
"description": "Provides functionality to recursively process PHP variables",
"homepage": "http://www.github.com/sebastianbergmann/recursion-context",
- "time": "2016-11-19T07:33:16+00:00"
+ "time": "2016-11-19 07:33:16"
},
{
"name": "sebastian/resource-operations",
@@ -3964,7 +4022,7 @@
],
"description": "Provides a list of PHP built-in functions that operate on resources",
"homepage": "https://www.github.com/sebastianbergmann/resource-operations",
- "time": "2015-07-28T20:34:47+00:00"
+ "time": "2015-07-28 20:34:47"
},
{
"name": "sebastian/version",
@@ -4007,7 +4065,7 @@
],
"description": "Library that helps with managing the version number of Git-hosted PHP projects",
"homepage": "https://github.com/sebastianbergmann/version",
- "time": "2016-10-03T07:35:21+00:00"
+ "time": "2016-10-03 07:35:21"
},
{
"name": "stecman/symfony-console-completion",
@@ -4052,7 +4110,7 @@
}
],
"description": "Automatic BASH completion for Symfony Console Component based applications.",
- "time": "2016-02-24T05:08:54+00:00"
+ "time": "2016-02-24 05:08:54"
},
{
"name": "symfony/browser-kit",
@@ -4109,7 +4167,7 @@
],
"description": "Symfony BrowserKit Component",
"homepage": "https://symfony.com",
- "time": "2017-02-21T09:12:04+00:00"
+ "time": "2017-02-21 09:12:04"
},
{
"name": "symfony/console",
@@ -4172,7 +4230,7 @@
],
"description": "Symfony Console Component",
"homepage": "https://symfony.com",
- "time": "2017-04-04T14:33:42+00:00"
+ "time": "2017-04-04 14:33:42"
},
{
"name": "symfony/css-selector",
@@ -4225,7 +4283,7 @@
],
"description": "Symfony CssSelector Component",
"homepage": "https://symfony.com",
- "time": "2017-02-21T09:12:04+00:00"
+ "time": "2017-02-21 09:12:04"
},
{
"name": "symfony/debug",
@@ -4282,7 +4340,7 @@
],
"description": "Symfony Debug Component",
"homepage": "https://symfony.com",
- "time": "2017-03-28T21:38:24+00:00"
+ "time": "2017-03-28 21:38:24"
},
{
"name": "symfony/dom-crawler",
@@ -4338,7 +4396,7 @@
],
"description": "Symfony DomCrawler Component",
"homepage": "https://symfony.com",
- "time": "2017-02-21T09:12:04+00:00"
+ "time": "2017-02-21 09:12:04"
},
{
"name": "symfony/event-dispatcher",
@@ -4398,7 +4456,7 @@
],
"description": "Symfony EventDispatcher Component",
"homepage": "https://symfony.com",
- "time": "2017-04-04T07:26:27+00:00"
+ "time": "2017-04-04 07:26:27"
},
{
"name": "symfony/finder",
@@ -4447,7 +4505,7 @@
],
"description": "Symfony Finder Component",
"homepage": "https://symfony.com",
- "time": "2017-03-20T09:32:19+00:00"
+ "time": "2017-03-20 09:32:19"
},
{
"name": "symfony/polyfill-mbstring",
@@ -4506,7 +4564,7 @@
"portable",
"shim"
],
- "time": "2016-11-14T01:06:16+00:00"
+ "time": "2016-11-14 01:06:16"
},
{
"name": "symfony/yaml",
@@ -4561,7 +4619,7 @@
],
"description": "Symfony Yaml Component",
"homepage": "https://symfony.com",
- "time": "2017-03-20T09:45:15+00:00"
+ "time": "2017-03-20 09:45:15"
},
{
"name": "webmozart/assert",
@@ -4611,7 +4669,7 @@
"check",
"validate"
],
- "time": "2016-11-23T20:04:58+00:00"
+ "time": "2016-11-23 20:04:58"
},
{
"name": "yiisoft/yii2-debug",
@@ -4658,7 +4716,7 @@
"debugger",
"yii2"
],
- "time": "2017-02-21T10:30:50+00:00"
+ "time": "2017-02-21 10:30:50"
},
{
"name": "yiisoft/yii2-faker",
@@ -4705,7 +4763,7 @@
"faker",
"yii2"
],
- "time": "2015-03-01T06:22:44+00:00"
+ "time": "2015-03-01 06:22:44"
},
{
"name": "yiisoft/yii2-gii",
@@ -4758,7 +4816,7 @@
"gii",
"yii2"
],
- "time": "2016-03-18T14:09:46+00:00"
+ "time": "2016-03-18 14:09:46"
}
],
"aliases": [],
diff --git a/frontend/controllers/AccountController.php b/frontend/controllers/AccountController.php
new file mode 100644
index 0000000..040ddf7
--- /dev/null
+++ b/frontend/controllers/AccountController.php
@@ -0,0 +1,43 @@
+user->identity;
+
+ $orders = $user->getOrders()
+ ->with(
+ [
+ 'label',
+ 'orderProducts',
+ ]
+ )
+ ->orderBy(
+ [
+ 'id' => SORT_DESC,
+ ]
+ )
+ ->all();
+
+ return $this->render(
+ 'index',
+ [
+ 'orders' => $orders,
+ ]
+ );
+ }
+ }
\ No newline at end of file
diff --git a/frontend/views/account/index.php b/frontend/views/account/index.php
new file mode 100644
index 0000000..8f41d94
--- /dev/null
+++ b/frontend/views/account/index.php
@@ -0,0 +1,120 @@
+params[ 'breadcrumbs' ][] = \Yii::t('app', 'Мои заказы');
+
+?>
+
+
+
+
+
+
+
+
+
+
+
+
Если у вас есть вопросы, пожалуйста,
+ напишите нам, наш центр обслуживания клиентов работает круглосуточно.
+
+
+
+
+
+
+
+ Заказ |
+ Дата |
+ Сумма |
+ Статус |
+ Действие |
+
+
+
+
+ orderProducts as $product) {
+ $price += $product->price * $product->count;
+ }
+ ?>
+
+ №= $order->id; ?> |
+ = date('d.m.Y', $order->created_at); ?> |
+ 150.00 |
+ Готовится
+ |
+ Посмотреть
+ |
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
\ No newline at end of file
--
libgit2 0.21.4