Commit a337a53bb018a9f535e188984698b3a65f48c5be

Authored by Alexey Boroda
1 parent 05f1b3e2

-Cabinet started

composer.json
... ... @@ -33,7 +33,8 @@
33 33 "kartik-v/yii2-widget-select2": "@dev",
34 34 "phpoffice/phpexcel": "^1.8",
35 35 "bower-asset/amcharts": "@dev",
36   - "bower-asset/pnotify": "@dev"
  36 + "bower-asset/pnotify": "@dev",
  37 + "kartik-v/yii2-widget-colorinput": "*"
37 38 },
38 39 "require-dev": {
39 40 "yiisoft/yii2-debug": "~2.0.0",
... ...
composer.lock
... ... @@ -4,7 +4,8 @@
4 4 "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file",
5 5 "This file is @generated automatically"
6 6 ],
7   - "content-hash": "ee517d5a3aceb2f736a9f4528c5a3e11",
  7 + "hash": "482c96d17c08496f9d67ccef1d071cc3",
  8 + "content-hash": "ea8f4f552cdc9b0c7ac2eeb4ae9afa66",
8 9 "packages": [
9 10 {
10 11 "name": "2amigos/yii2-tinymce-widget",
... ... @@ -64,7 +65,7 @@
64 65 "yii 2",
65 66 "yii2"
66 67 ],
67   - "time": "2015-03-28T21:53:43+00:00"
  68 + "time": "2015-03-28 21:53:43"
68 69 },
69 70 {
70 71 "name": "bower-asset/amcharts",
... ... @@ -102,7 +103,10 @@
102 103 },
103 104 "type": "bower-asset-library",
104 105 "extra": {
105   - "bower-asset-main": "./dist/amcharts/amcharts.js"
  106 + "bower-asset-main": "./dist/amcharts/amcharts.js",
  107 + "branch-alias": {
  108 + "dev-master": "3.13.0-dev"
  109 + }
106 110 },
107 111 "time": "2015-01-28 07:40:20"
108 112 },
... ... @@ -121,7 +125,7 @@
121 125 "shasum": ""
122 126 },
123 127 "require": {
124   - "bower-asset/jquery": ">=1.9.1,<4.0"
  128 + "bower-asset/jquery": ">=1.9.1,<=3"
125 129 },
126 130 "type": "bower-asset-library",
127 131 "extra": {
... ... @@ -572,7 +576,7 @@
572 576 "markdown",
573 577 "markdown-extra"
574 578 ],
575   - "time": "2016-09-14T20:40:20+00:00"
  579 + "time": "2016-09-14 20:40:20"
576 580 },
577 581 {
578 582 "name": "ezyang/htmlpurifier",
... ... @@ -619,7 +623,7 @@
619 623 "keywords": [
620 624 "html"
621 625 ],
622   - "time": "2017-03-13T06:30:53+00:00"
  626 + "time": "2017-03-13 06:30:53"
623 627 },
624 628 {
625 629 "name": "firebase/php-jwt",
... ... @@ -662,7 +666,7 @@
662 666 ],
663 667 "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
664 668 "homepage": "https://github.com/firebase/php-jwt",
665   - "time": "2016-07-18T04:51:16+00:00"
  669 + "time": "2016-07-18 04:51:16"
666 670 },
667 671 {
668 672 "name": "fortawesome/font-awesome",
... ... @@ -710,7 +714,7 @@
710 714 "font",
711 715 "icon"
712 716 ],
713   - "time": "2016-10-24T15:52:54+00:00"
  717 + "time": "2016-10-24 15:52:54"
714 718 },
715 719 {
716 720 "name": "google/apiclient",
... ... @@ -769,7 +773,7 @@
769 773 "keywords": [
770 774 "google"
771 775 ],
772   - "time": "2017-03-22T18:32:04+00:00"
  776 + "time": "2017-03-22 18:32:04"
773 777 },
774 778 {
775 779 "name": "google/apiclient-services",
... ... @@ -806,7 +810,7 @@
806 810 "keywords": [
807 811 "google"
808 812 ],
809   - "time": "2017-03-13T17:40:44+00:00"
  813 + "time": "2017-03-13 17:40:44"
810 814 },
811 815 {
812 816 "name": "google/auth",
... ... @@ -854,7 +858,7 @@
854 858 "google",
855 859 "oauth2"
856 860 ],
857   - "time": "2016-11-02T14:59:14+00:00"
  861 + "time": "2016-11-02 14:59:14"
858 862 },
859 863 {
860 864 "name": "guzzlehttp/guzzle",
... ... @@ -916,7 +920,7 @@
916 920 "rest",
917 921 "web service"
918 922 ],
919   - "time": "2017-02-28T22:50:30+00:00"
  923 + "time": "2017-02-28 22:50:30"
920 924 },
921 925 {
922 926 "name": "guzzlehttp/promises",
... ... @@ -967,7 +971,7 @@
967 971 "keywords": [
968 972 "promise"
969 973 ],
970   - "time": "2016-12-20T10:07:11+00:00"
  974 + "time": "2016-12-20 10:07:11"
971 975 },
972 976 {
973 977 "name": "guzzlehttp/psr7",
... ... @@ -1032,7 +1036,7 @@
1032 1036 "uri",
1033 1037 "url"
1034 1038 ],
1035   - "time": "2017-03-20T17:10:46+00:00"
  1039 + "time": "2017-03-20 17:10:46"
1036 1040 },
1037 1041 {
1038 1042 "name": "hiqdev/yii2-asset-icheck",
... ... @@ -1104,7 +1108,7 @@
1104 1108 "iCheck",
1105 1109 "yii2"
1106 1110 ],
1107   - "time": "2016-03-30T10:59:26+00:00"
  1111 + "time": "2016-03-30 10:59:26"
1108 1112 },
1109 1113 {
1110 1114 "name": "hiqdev/yii2-asset-pnotify",
... ... @@ -1166,7 +1170,7 @@
1166 1170 "pnotify",
1167 1171 "yii2"
1168 1172 ],
1169   - "time": "2015-09-09T15:16:38+00:00"
  1173 + "time": "2015-09-09 15:16:38"
1170 1174 },
1171 1175 {
1172 1176 "name": "imagine/imagine",
... ... @@ -1223,7 +1227,7 @@
1223 1227 "image manipulation",
1224 1228 "image processing"
1225 1229 ],
1226   - "time": "2015-09-19T16:54:05+00:00"
  1230 + "time": "2015-09-19 16:54:05"
1227 1231 },
1228 1232 {
1229 1233 "name": "kartik-v/bootstrap-fileinput",
... ... @@ -1276,7 +1280,7 @@
1276 1280 "progress",
1277 1281 "upload"
1278 1282 ],
1279   - "time": "2017-04-02T18:38:08+00:00"
  1283 + "time": "2017-04-02 18:38:08"
1280 1284 },
1281 1285 {
1282 1286 "name": "kartik-v/yii2-krajee-base",
... ... @@ -1327,7 +1331,61 @@
1327 1331 "widget",
1328 1332 "yii2"
1329 1333 ],
1330   - "time": "2017-02-22T05:58:53+00:00"
  1334 + "time": "2017-02-22 05:58:53"
  1335 + },
  1336 + {
  1337 + "name": "kartik-v/yii2-widget-colorinput",
  1338 + "version": "v1.0.3",
  1339 + "source": {
  1340 + "type": "git",
  1341 + "url": "https://github.com/kartik-v/yii2-widget-colorinput.git",
  1342 + "reference": "3f6e847ef72cf6e27e4d3b4870b00b8f80d51752"
  1343 + },
  1344 + "dist": {
  1345 + "type": "zip",
  1346 + "url": "https://api.github.com/repos/kartik-v/yii2-widget-colorinput/zipball/3f6e847ef72cf6e27e4d3b4870b00b8f80d51752",
  1347 + "reference": "3f6e847ef72cf6e27e4d3b4870b00b8f80d51752",
  1348 + "shasum": ""
  1349 + },
  1350 + "require": {
  1351 + "kartik-v/yii2-krajee-base": "*"
  1352 + },
  1353 + "type": "yii2-extension",
  1354 + "extra": {
  1355 + "branch-alias": {
  1356 + "dev-master": "1.0.x-dev"
  1357 + }
  1358 + },
  1359 + "autoload": {
  1360 + "psr-4": {
  1361 + "kartik\\color\\": ""
  1362 + }
  1363 + },
  1364 + "notification-url": "https://packagist.org/downloads/",
  1365 + "license": [
  1366 + "BSD 3-Clause"
  1367 + ],
  1368 + "authors": [
  1369 + {
  1370 + "name": "Kartik Visweswaran",
  1371 + "email": "kartikv2@gmail.com",
  1372 + "homepage": "http://www.krajee.com/"
  1373 + }
  1374 + ],
  1375 + "description": "An enhanced Yii 2 widget encapsulating the HTML 5 color input (sub repo split from yii2-widgets)",
  1376 + "homepage": "https://github.com/kartik-v/yii2-widget-colorinput",
  1377 + "keywords": [
  1378 + "HTML5",
  1379 + "color",
  1380 + "extension",
  1381 + "form",
  1382 + "input",
  1383 + "jquery",
  1384 + "plugin",
  1385 + "widget",
  1386 + "yii2"
  1387 + ],
  1388 + "time": "2016-01-14 11:15:49"
1331 1389 },
1332 1390 {
1333 1391 "name": "kartik-v/yii2-widget-fileinput",
... ... @@ -1382,7 +1440,7 @@
1382 1440 "widget",
1383 1441 "yii2"
1384 1442 ],
1385   - "time": "2016-06-16T06:53:01+00:00"
  1443 + "time": "2016-06-16 06:53:01"
1386 1444 },
1387 1445 {
1388 1446 "name": "kartik-v/yii2-widget-select2",
... ... @@ -1513,7 +1571,7 @@
1513 1571 "logging",
1514 1572 "psr-3"
1515 1573 ],
1516   - "time": "2017-03-13T07:08:03+00:00"
  1574 + "time": "2017-03-13 07:08:03"
1517 1575 },
1518 1576 {
1519 1577 "name": "noam148/yii2-image-manager",
... ... @@ -1562,7 +1620,7 @@
1562 1620 "widget",
1563 1621 "yii2"
1564 1622 ],
1565   - "time": "2017-04-23T15:41:45+00:00"
  1623 + "time": "2017-04-23 15:41:45"
1566 1624 },
1567 1625 {
1568 1626 "name": "noam148/yii2-image-resize",
... ... @@ -1608,7 +1666,7 @@
1608 1666 "resize",
1609 1667 "yii2"
1610 1668 ],
1611   - "time": "2016-11-29T18:17:37+00:00"
  1669 + "time": "2016-11-29 18:17:37"
1612 1670 },
1613 1671 {
1614 1672 "name": "phpoffice/phpexcel",
... ... @@ -1665,7 +1723,7 @@
1665 1723 "xls",
1666 1724 "xlsx"
1667 1725 ],
1668   - "time": "2015-05-01T07:00:55+00:00"
  1726 + "time": "2015-05-01 07:00:55"
1669 1727 },
1670 1728 {
1671 1729 "name": "phpseclib/phpseclib",
... ... @@ -1757,7 +1815,7 @@
1757 1815 "x.509",
1758 1816 "x509"
1759 1817 ],
1760   - "time": "2016-10-04T00:57:04+00:00"
  1818 + "time": "2016-10-04 00:57:04"
1761 1819 },
1762 1820 {
1763 1821 "name": "psr/cache",
... ... @@ -1803,7 +1861,7 @@
1803 1861 "psr",
1804 1862 "psr-6"
1805 1863 ],
1806   - "time": "2016-08-06T20:24:11+00:00"
  1864 + "time": "2016-08-06 20:24:11"
1807 1865 },
1808 1866 {
1809 1867 "name": "psr/http-message",
... ... @@ -1853,7 +1911,7 @@
1853 1911 "request",
1854 1912 "response"
1855 1913 ],
1856   - "time": "2016-08-06T14:39:51+00:00"
  1914 + "time": "2016-08-06 14:39:51"
1857 1915 },
1858 1916 {
1859 1917 "name": "psr/log",
... ... @@ -1900,7 +1958,7 @@
1900 1958 "psr",
1901 1959 "psr-3"
1902 1960 ],
1903   - "time": "2016-10-10T12:19:37+00:00"
  1961 + "time": "2016-10-10 12:19:37"
1904 1962 },
1905 1963 {
1906 1964 "name": "rmrevin/yii2-fontawesome",
... ... @@ -1952,7 +2010,7 @@
1952 2010 "font",
1953 2011 "yii"
1954 2012 ],
1955   - "time": "2017-01-11T14:05:47+00:00"
  2013 + "time": "2017-01-11 14:05:47"
1956 2014 },
1957 2015 {
1958 2016 "name": "speixoto/yii2-amcharts",
... ... @@ -1994,7 +2052,7 @@
1994 2052 "amcharts",
1995 2053 "yii"
1996 2054 ],
1997   - "time": "2016-08-23T13:52:28+00:00"
  2055 + "time": "2016-08-23 13:52:28"
1998 2056 },
1999 2057 {
2000 2058 "name": "swiftmailer/swiftmailer",
... ... @@ -2048,7 +2106,7 @@
2048 2106 "mail",
2049 2107 "mailer"
2050 2108 ],
2051   - "time": "2017-04-20T17:32:18+00:00"
  2109 + "time": "2017-04-20 17:32:18"
2052 2110 },
2053 2111 {
2054 2112 "name": "tinymce/tinymce",
... ... @@ -2094,7 +2152,7 @@
2094 2152 "tinymce",
2095 2153 "wysiwyg"
2096 2154 ],
2097   - "time": "2017-04-25T12:41:19+00:00"
  2155 + "time": "2017-04-25 12:41:19"
2098 2156 },
2099 2157 {
2100 2158 "name": "yii2tech/filedb",
... ... @@ -2142,7 +2200,7 @@
2142 2200 "static",
2143 2201 "yii2"
2144 2202 ],
2145   - "time": "2017-02-06T10:58:30+00:00"
  2203 + "time": "2017-02-06 10:58:30"
2146 2204 },
2147 2205 {
2148 2206 "name": "yiisoft/yii2",
... ... @@ -2242,7 +2300,7 @@
2242 2300 "framework",
2243 2301 "yii2"
2244 2302 ],
2245   - "time": "2017-02-08T09:04:32+00:00"
  2303 + "time": "2017-02-08 09:04:32"
2246 2304 },
2247 2305 {
2248 2306 "name": "yiisoft/yii2-bootstrap",
... ... @@ -2292,7 +2350,7 @@
2292 2350 "bootstrap",
2293 2351 "yii2"
2294 2352 ],
2295   - "time": "2016-03-17T03:29:28+00:00"
  2353 + "time": "2016-03-17 03:29:28"
2296 2354 },
2297 2355 {
2298 2356 "name": "yiisoft/yii2-composer",
... ... @@ -2342,7 +2400,7 @@
2342 2400 "extension installer",
2343 2401 "yii2"
2344 2402 ],
2345   - "time": "2016-12-20T13:26:02+00:00"
  2403 + "time": "2016-12-20 13:26:02"
2346 2404 },
2347 2405 {
2348 2406 "name": "yiisoft/yii2-imagine",
... ... @@ -2390,7 +2448,7 @@
2390 2448 "imagine",
2391 2449 "yii2"
2392 2450 ],
2393   - "time": "2016-11-03T19:28:39+00:00"
  2451 + "time": "2016-11-03 19:28:39"
2394 2452 },
2395 2453 {
2396 2454 "name": "yiisoft/yii2-swiftmailer",
... ... @@ -2440,7 +2498,7 @@
2440 2498 "swiftmailer",
2441 2499 "yii2"
2442 2500 ],
2443   - "time": "2016-09-09T11:48:11+00:00"
  2501 + "time": "2016-09-09 11:48:11"
2444 2502 },
2445 2503 {
2446 2504 "name": "yiister/yii2-gentelella",
... ... @@ -2498,7 +2556,7 @@
2498 2556 "theme",
2499 2557 "yii2"
2500 2558 ],
2501   - "time": "2017-03-21T14:59:58+00:00"
  2559 + "time": "2017-03-21 14:59:58"
2502 2560 }
2503 2561 ],
2504 2562 "packages-dev": [
... ... @@ -2559,7 +2617,7 @@
2559 2617 "gherkin",
2560 2618 "parser"
2561 2619 ],
2562   - "time": "2016-10-30T11:50:56+00:00"
  2620 + "time": "2016-10-30 11:50:56"
2563 2621 },
2564 2622 {
2565 2623 "name": "bower-asset/typeahead.js",
... ... @@ -2677,7 +2735,7 @@
2677 2735 "functional testing",
2678 2736 "unit testing"
2679 2737 ],
2680   - "time": "2017-03-25T03:34:50+00:00"
  2738 + "time": "2017-03-25 03:34:50"
2681 2739 },
2682 2740 {
2683 2741 "name": "codeception/verify",
... ... @@ -2713,7 +2771,7 @@
2713 2771 }
2714 2772 ],
2715 2773 "description": "BDD assertion library for PHPUnit",
2716   - "time": "2017-01-09T10:58:51+00:00"
  2774 + "time": "2017-01-09 10:58:51"
2717 2775 },
2718 2776 {
2719 2777 "name": "doctrine/instantiator",
... ... @@ -2767,7 +2825,7 @@
2767 2825 "constructor",
2768 2826 "instantiate"
2769 2827 ],
2770   - "time": "2015-06-14T21:17:01+00:00"
  2828 + "time": "2015-06-14 21:17:01"
2771 2829 },
2772 2830 {
2773 2831 "name": "fzaninotto/faker",
... ... @@ -2815,7 +2873,7 @@
2815 2873 "faker",
2816 2874 "fixtures"
2817 2875 ],
2818   - "time": "2016-04-29T12:21:54+00:00"
  2876 + "time": "2016-04-29 12:21:54"
2819 2877 },
2820 2878 {
2821 2879 "name": "myclabs/deep-copy",
... ... @@ -2857,7 +2915,7 @@
2857 2915 "object",
2858 2916 "object graph"
2859 2917 ],
2860   - "time": "2017-04-12T18:52:22+00:00"
  2918 + "time": "2017-04-12 18:52:22"
2861 2919 },
2862 2920 {
2863 2921 "name": "phpdocumentor/reflection-common",
... ... @@ -2911,7 +2969,7 @@
2911 2969 "reflection",
2912 2970 "static analysis"
2913 2971 ],
2914   - "time": "2015-12-27T11:43:31+00:00"
  2972 + "time": "2015-12-27 11:43:31"
2915 2973 },
2916 2974 {
2917 2975 "name": "phpdocumentor/reflection-docblock",
... ... @@ -2956,7 +3014,7 @@
2956 3014 }
2957 3015 ],
2958 3016 "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
2959   - "time": "2016-09-30T07:12:33+00:00"
  3017 + "time": "2016-09-30 07:12:33"
2960 3018 },
2961 3019 {
2962 3020 "name": "phpdocumentor/type-resolver",
... ... @@ -3003,7 +3061,7 @@
3003 3061 "email": "me@mikevanriel.com"
3004 3062 }
3005 3063 ],
3006   - "time": "2016-11-25T06:54:22+00:00"
  3064 + "time": "2016-11-25 06:54:22"
3007 3065 },
3008 3066 {
3009 3067 "name": "phpspec/php-diff",
... ... @@ -3041,7 +3099,7 @@
3041 3099 }
3042 3100 ],
3043 3101 "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
3044   - "time": "2016-04-07T12:29:16+00:00"
  3102 + "time": "2016-04-07 12:29:16"
3045 3103 },
3046 3104 {
3047 3105 "name": "phpspec/prophecy",
... ... @@ -3104,7 +3162,7 @@
3104 3162 "spy",
3105 3163 "stub"
3106 3164 ],
3107   - "time": "2017-03-02T20:05:34+00:00"
  3165 + "time": "2017-03-02 20:05:34"
3108 3166 },
3109 3167 {
3110 3168 "name": "phpunit/php-code-coverage",
... ... @@ -3167,7 +3225,7 @@
3167 3225 "testing",
3168 3226 "xunit"
3169 3227 ],
3170   - "time": "2017-04-02T07:44:40+00:00"
  3228 + "time": "2017-04-02 07:44:40"
3171 3229 },
3172 3230 {
3173 3231 "name": "phpunit/php-file-iterator",
... ... @@ -3214,7 +3272,7 @@
3214 3272 "filesystem",
3215 3273 "iterator"
3216 3274 ],
3217   - "time": "2016-10-03T07:40:28+00:00"
  3275 + "time": "2016-10-03 07:40:28"
3218 3276 },
3219 3277 {
3220 3278 "name": "phpunit/php-text-template",
... ... @@ -3255,7 +3313,7 @@
3255 3313 "keywords": [
3256 3314 "template"
3257 3315 ],
3258   - "time": "2015-06-21T13:50:34+00:00"
  3316 + "time": "2015-06-21 13:50:34"
3259 3317 },
3260 3318 {
3261 3319 "name": "phpunit/php-timer",
... ... @@ -3304,7 +3362,7 @@
3304 3362 "keywords": [
3305 3363 "timer"
3306 3364 ],
3307   - "time": "2017-02-26T11:10:40+00:00"
  3365 + "time": "2017-02-26 11:10:40"
3308 3366 },
3309 3367 {
3310 3368 "name": "phpunit/php-token-stream",
... ... @@ -3353,7 +3411,7 @@
3353 3411 "keywords": [
3354 3412 "tokenizer"
3355 3413 ],
3356   - "time": "2017-02-27T10:12:30+00:00"
  3414 + "time": "2017-02-27 10:12:30"
3357 3415 },
3358 3416 {
3359 3417 "name": "phpunit/phpunit",
... ... @@ -3435,7 +3493,7 @@
3435 3493 "testing",
3436 3494 "xunit"
3437 3495 ],
3438   - "time": "2017-04-03T02:22:27+00:00"
  3496 + "time": "2017-04-03 02:22:27"
3439 3497 },
3440 3498 {
3441 3499 "name": "phpunit/phpunit-mock-objects",
... ... @@ -3494,7 +3552,7 @@
3494 3552 "mock",
3495 3553 "xunit"
3496 3554 ],
3497   - "time": "2016-12-08T20:27:08+00:00"
  3555 + "time": "2016-12-08 20:27:08"
3498 3556 },
3499 3557 {
3500 3558 "name": "sebastian/code-unit-reverse-lookup",
... ... @@ -3539,7 +3597,7 @@
3539 3597 ],
3540 3598 "description": "Looks up which function or method a line of code belongs to",
3541 3599 "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
3542   - "time": "2017-03-04T06:30:41+00:00"
  3600 + "time": "2017-03-04 06:30:41"
3543 3601 },
3544 3602 {
3545 3603 "name": "sebastian/comparator",
... ... @@ -3603,7 +3661,7 @@
3603 3661 "compare",
3604 3662 "equality"
3605 3663 ],
3606   - "time": "2017-01-29T09:50:25+00:00"
  3664 + "time": "2017-01-29 09:50:25"
3607 3665 },
3608 3666 {
3609 3667 "name": "sebastian/diff",
... ... @@ -3655,7 +3713,7 @@
3655 3713 "keywords": [
3656 3714 "diff"
3657 3715 ],
3658   - "time": "2015-12-08T07:14:41+00:00"
  3716 + "time": "2015-12-08 07:14:41"
3659 3717 },
3660 3718 {
3661 3719 "name": "sebastian/environment",
... ... @@ -3705,7 +3763,7 @@
3705 3763 "environment",
3706 3764 "hhvm"
3707 3765 ],
3708   - "time": "2016-11-26T07:53:53+00:00"
  3766 + "time": "2016-11-26 07:53:53"
3709 3767 },
3710 3768 {
3711 3769 "name": "sebastian/exporter",
... ... @@ -3772,7 +3830,7 @@
3772 3830 "export",
3773 3831 "exporter"
3774 3832 ],
3775   - "time": "2016-11-19T08:54:04+00:00"
  3833 + "time": "2016-11-19 08:54:04"
3776 3834 },
3777 3835 {
3778 3836 "name": "sebastian/global-state",
... ... @@ -3823,7 +3881,7 @@
3823 3881 "keywords": [
3824 3882 "global state"
3825 3883 ],
3826   - "time": "2015-10-12T03:26:01+00:00"
  3884 + "time": "2015-10-12 03:26:01"
3827 3885 },
3828 3886 {
3829 3887 "name": "sebastian/object-enumerator",
... ... @@ -3869,7 +3927,7 @@
3869 3927 ],
3870 3928 "description": "Traverses array structures and object graphs to enumerate all referenced objects",
3871 3929 "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
3872   - "time": "2017-02-18T15:18:39+00:00"
  3930 + "time": "2017-02-18 15:18:39"
3873 3931 },
3874 3932 {
3875 3933 "name": "sebastian/recursion-context",
... ... @@ -3922,7 +3980,7 @@
3922 3980 ],
3923 3981 "description": "Provides functionality to recursively process PHP variables",
3924 3982 "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
3925   - "time": "2016-11-19T07:33:16+00:00"
  3983 + "time": "2016-11-19 07:33:16"
3926 3984 },
3927 3985 {
3928 3986 "name": "sebastian/resource-operations",
... ... @@ -3964,7 +4022,7 @@
3964 4022 ],
3965 4023 "description": "Provides a list of PHP built-in functions that operate on resources",
3966 4024 "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
3967   - "time": "2015-07-28T20:34:47+00:00"
  4025 + "time": "2015-07-28 20:34:47"
3968 4026 },
3969 4027 {
3970 4028 "name": "sebastian/version",
... ... @@ -4007,7 +4065,7 @@
4007 4065 ],
4008 4066 "description": "Library that helps with managing the version number of Git-hosted PHP projects",
4009 4067 "homepage": "https://github.com/sebastianbergmann/version",
4010   - "time": "2016-10-03T07:35:21+00:00"
  4068 + "time": "2016-10-03 07:35:21"
4011 4069 },
4012 4070 {
4013 4071 "name": "stecman/symfony-console-completion",
... ... @@ -4052,7 +4110,7 @@
4052 4110 }
4053 4111 ],
4054 4112 "description": "Automatic BASH completion for Symfony Console Component based applications.",
4055   - "time": "2016-02-24T05:08:54+00:00"
  4113 + "time": "2016-02-24 05:08:54"
4056 4114 },
4057 4115 {
4058 4116 "name": "symfony/browser-kit",
... ... @@ -4109,7 +4167,7 @@
4109 4167 ],
4110 4168 "description": "Symfony BrowserKit Component",
4111 4169 "homepage": "https://symfony.com",
4112   - "time": "2017-02-21T09:12:04+00:00"
  4170 + "time": "2017-02-21 09:12:04"
4113 4171 },
4114 4172 {
4115 4173 "name": "symfony/console",
... ... @@ -4172,7 +4230,7 @@
4172 4230 ],
4173 4231 "description": "Symfony Console Component",
4174 4232 "homepage": "https://symfony.com",
4175   - "time": "2017-04-04T14:33:42+00:00"
  4233 + "time": "2017-04-04 14:33:42"
4176 4234 },
4177 4235 {
4178 4236 "name": "symfony/css-selector",
... ... @@ -4225,7 +4283,7 @@
4225 4283 ],
4226 4284 "description": "Symfony CssSelector Component",
4227 4285 "homepage": "https://symfony.com",
4228   - "time": "2017-02-21T09:12:04+00:00"
  4286 + "time": "2017-02-21 09:12:04"
4229 4287 },
4230 4288 {
4231 4289 "name": "symfony/debug",
... ... @@ -4282,7 +4340,7 @@
4282 4340 ],
4283 4341 "description": "Symfony Debug Component",
4284 4342 "homepage": "https://symfony.com",
4285   - "time": "2017-03-28T21:38:24+00:00"
  4343 + "time": "2017-03-28 21:38:24"
4286 4344 },
4287 4345 {
4288 4346 "name": "symfony/dom-crawler",
... ... @@ -4338,7 +4396,7 @@
4338 4396 ],
4339 4397 "description": "Symfony DomCrawler Component",
4340 4398 "homepage": "https://symfony.com",
4341   - "time": "2017-02-21T09:12:04+00:00"
  4399 + "time": "2017-02-21 09:12:04"
4342 4400 },
4343 4401 {
4344 4402 "name": "symfony/event-dispatcher",
... ... @@ -4398,7 +4456,7 @@
4398 4456 ],
4399 4457 "description": "Symfony EventDispatcher Component",
4400 4458 "homepage": "https://symfony.com",
4401   - "time": "2017-04-04T07:26:27+00:00"
  4459 + "time": "2017-04-04 07:26:27"
4402 4460 },
4403 4461 {
4404 4462 "name": "symfony/finder",
... ... @@ -4447,7 +4505,7 @@
4447 4505 ],
4448 4506 "description": "Symfony Finder Component",
4449 4507 "homepage": "https://symfony.com",
4450   - "time": "2017-03-20T09:32:19+00:00"
  4508 + "time": "2017-03-20 09:32:19"
4451 4509 },
4452 4510 {
4453 4511 "name": "symfony/polyfill-mbstring",
... ... @@ -4506,7 +4564,7 @@
4506 4564 "portable",
4507 4565 "shim"
4508 4566 ],
4509   - "time": "2016-11-14T01:06:16+00:00"
  4567 + "time": "2016-11-14 01:06:16"
4510 4568 },
4511 4569 {
4512 4570 "name": "symfony/yaml",
... ... @@ -4561,7 +4619,7 @@
4561 4619 ],
4562 4620 "description": "Symfony Yaml Component",
4563 4621 "homepage": "https://symfony.com",
4564   - "time": "2017-03-20T09:45:15+00:00"
  4622 + "time": "2017-03-20 09:45:15"
4565 4623 },
4566 4624 {
4567 4625 "name": "webmozart/assert",
... ... @@ -4611,7 +4669,7 @@
4611 4669 "check",
4612 4670 "validate"
4613 4671 ],
4614   - "time": "2016-11-23T20:04:58+00:00"
  4672 + "time": "2016-11-23 20:04:58"
4615 4673 },
4616 4674 {
4617 4675 "name": "yiisoft/yii2-debug",
... ... @@ -4658,7 +4716,7 @@
4658 4716 "debugger",
4659 4717 "yii2"
4660 4718 ],
4661   - "time": "2017-02-21T10:30:50+00:00"
  4719 + "time": "2017-02-21 10:30:50"
4662 4720 },
4663 4721 {
4664 4722 "name": "yiisoft/yii2-faker",
... ... @@ -4705,7 +4763,7 @@
4705 4763 "faker",
4706 4764 "yii2"
4707 4765 ],
4708   - "time": "2015-03-01T06:22:44+00:00"
  4766 + "time": "2015-03-01 06:22:44"
4709 4767 },
4710 4768 {
4711 4769 "name": "yiisoft/yii2-gii",
... ... @@ -4758,7 +4816,7 @@
4758 4816 "gii",
4759 4817 "yii2"
4760 4818 ],
4761   - "time": "2016-03-18T14:09:46+00:00"
  4819 + "time": "2016-03-18 14:09:46"
4762 4820 }
4763 4821 ],
4764 4822 "aliases": [],
... ...
frontend/controllers/AccountController.php 0 → 100644
  1 +<?php
  2 +
  3 + namespace frontend\controllers;
  4 +
  5 + use artbox\order\models\Customer;
  6 + use yii\web\Controller;
  7 +
  8 + /**
  9 + * Class AccountController
  10 + *
  11 + * @package frontend\controllers
  12 + */
  13 + class AccountController extends Controller
  14 + {
  15 + public function actionIndex()
  16 + {
  17 + /**
  18 + * @var Customer $user
  19 + */
  20 + $user = \Yii::$app->user->identity;
  21 +
  22 + $orders = $user->getOrders()
  23 + ->with(
  24 + [
  25 + 'label',
  26 + 'orderProducts',
  27 + ]
  28 + )
  29 + ->orderBy(
  30 + [
  31 + 'id' => SORT_DESC,
  32 + ]
  33 + )
  34 + ->all();
  35 +
  36 + return $this->render(
  37 + 'index',
  38 + [
  39 + 'orders' => $orders,
  40 + ]
  41 + );
  42 + }
  43 + }
0 44 \ No newline at end of file
... ...
frontend/views/account/index.php 0 → 100644
  1 +<?php
  2 +
  3 + use artbox\order\models\Order;
  4 + use yii\web\View;
  5 +
  6 + /**
  7 + * @var View $this
  8 + * @var Order[] $orders
  9 + */
  10 +
  11 + $this->params[ 'breadcrumbs' ][] = \Yii::t('app', 'Мои заказы');
  12 +
  13 +?>
  14 +
  15 +<div id="content">
  16 + <div class="container">
  17 +
  18 +
  19 + <div class="row">
  20 +
  21 + <!-- *** LEFT COLUMN ***
  22 +_________________________________________________________ -->
  23 +
  24 + <div class="col-md-9" id="customer-orders">
  25 +
  26 + <p class="text-muted lead">Если у вас есть вопросы, пожалуйста,
  27 + <a href="contact.html">напишите нам</a>, наш центр обслуживания клиентов работает круглосуточно.</p>
  28 +
  29 + <div class="box">
  30 +
  31 + <div class="table-responsive">
  32 + <table class="table table-hover">
  33 + <thead>
  34 + <tr>
  35 + <th>Заказ</th>
  36 + <th>Дата</th>
  37 + <th>Сумма</th>
  38 + <th>Статус</th>
  39 + <th>Действие</th>
  40 + </tr>
  41 + </thead>
  42 + <tbody>
  43 +
  44 + <?php foreach ($orders as $order) {
  45 + $price = 0;
  46 + foreach ($order->orderProducts as $product) {
  47 + $price += $product->price * $product->count;
  48 + }
  49 + ?>
  50 + <tr>
  51 + <th>№<?= $order->id; ?></th>
  52 + <td><?= date('d.m.Y', $order->created_at); ?></td>
  53 + <td>150.00</td>
  54 + <td><span class="label label-info">Готовится</span>
  55 + </td>
  56 + <td><a href="customer-order.html" class="btn btn-template-main btn-sm">Посмотреть</a>
  57 + </td>
  58 + </tr>
  59 + <?php } ?>
  60 +
  61 + </tbody>
  62 + </table>
  63 + </div>
  64 + <!-- /.table-responsive -->
  65 +
  66 + </div>
  67 + <!-- /.box -->
  68 +
  69 + </div>
  70 + <!-- /.col-md-9 -->
  71 +
  72 + <!-- *** LEFT COLUMN END *** -->
  73 +
  74 + <!-- *** RIGHT COLUMN ***
  75 +_________________________________________________________ -->
  76 +
  77 + <div class="col-md-3">
  78 + <!-- *** CUSTOMER MENU ***
  79 +_________________________________________________________ -->
  80 + <div class="panel panel-default sidebar-menu">
  81 +
  82 + <div class="panel-heading">
  83 + <h3 class="panel-title">Раздел пользователя</h3>
  84 + </div>
  85 +
  86 + <div class="panel-body">
  87 +
  88 + <ul class="nav nav-pills nav-stacked">
  89 + <li class="active">
  90 + <a href="customer-orders.html"><i class="fa fa-list"></i> Мои заказы</a>
  91 + </li>
  92 + <li>
  93 + <a href="customer-wishlist.html"><i class="fa fa-heart"></i> Мои пожелания</a>
  94 + </li>
  95 + <li>
  96 + <a href="customer-account.html"><i class="fa fa-user"></i> Мой аккаунт</a>
  97 + </li>
  98 + <li>
  99 + <a href="index.html"><i class="fa fa-sign-out"></i> Выйти</a>
  100 + </li>
  101 + </ul>
  102 + </div>
  103 +
  104 + </div>
  105 + <!-- /.col-md-3 -->
  106 +
  107 + <!-- *** CUSTOMER MENU END *** -->
  108 + </div>
  109 +
  110 + <!-- *** RIGHT COLUMN END *** -->
  111 +
  112 + </div>
  113 +
  114 +
  115 + </div>
  116 + <!-- /.container -->
  117 +</div>
  118 +<!-- /#content -->
  119 +
  120 +
0 121 \ No newline at end of file
... ...