Commit 35b13e82956505db8ee7487d1d111c01ac7b7e25

Authored by Yarik
1 parent aa61d143

Fixes

composer.lock
... ... @@ -4,7 +4,6 @@
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   - "hash": "b18802ddb055188c55f12e121f5e14cf",
8 7 "content-hash": "74adfbddeb0bd9b6f951a699924afa86",
9 8 "packages": [
10 9 {
... ... @@ -65,7 +64,7 @@
65 64 "yii 2",
66 65 "yii2"
67 66 ],
68   - "time": "2015-03-28 21:53:43"
  67 + "time": "2015-03-28T21:53:43+00:00"
69 68 },
70 69 {
71 70 "name": "bower-asset/amcharts",
... ... @@ -103,10 +102,7 @@
103 102 },
104 103 "type": "bower-asset-library",
105 104 "extra": {
106   - "bower-asset-main": "./dist/amcharts/amcharts.js",
107   - "branch-alias": {
108   - "dev-master": "3.13.0-dev"
109   - }
  105 + "bower-asset-main": "./dist/amcharts/amcharts.js"
110 106 },
111 107 "time": "2015-01-28 07:40:20"
112 108 },
... ... @@ -125,7 +121,7 @@
125 121 "shasum": ""
126 122 },
127 123 "require": {
128   - "bower-asset/jquery": ">=1.9.1,<=3"
  124 + "bower-asset/jquery": ">=1.9.1,<4.0"
129 125 },
130 126 "type": "bower-asset-library",
131 127 "extra": {
... ... @@ -336,16 +332,16 @@
336 332 },
337 333 {
338 334 "name": "bower-asset/jquery.inputmask",
339   - "version": "3.3.5",
  335 + "version": "3.3.6",
340 336 "source": {
341 337 "type": "git",
342 338 "url": "https://github.com/RobinHerbots/Inputmask.git",
343   - "reference": "ed27356d1b22366be48c4e7b8d038b9649bd4ab0"
  339 + "reference": "e42852f4afa01a80815394a5b2f9ce504c1a8d0b"
344 340 },
345 341 "dist": {
346 342 "type": "zip",
347   - "url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/ed27356d1b22366be48c4e7b8d038b9649bd4ab0",
348   - "reference": "ed27356d1b22366be48c4e7b8d038b9649bd4ab0",
  343 + "url": "https://api.github.com/repos/RobinHerbots/Inputmask/zipball/e42852f4afa01a80815394a5b2f9ce504c1a8d0b",
  344 + "reference": "e42852f4afa01a80815394a5b2f9ce504c1a8d0b",
349 345 "shasum": ""
350 346 },
351 347 "require": {
... ... @@ -359,7 +355,6 @@
359 355 "./dist/inputmask/inputmask.date.extensions.js",
360 356 "./dist/inputmask/inputmask.numeric.extensions.js",
361 357 "./dist/inputmask/inputmask.phone.extensions.js",
362   - "./dist/inputmask/inputmask.regex.extensions.js",
363 358 "./dist/inputmask/jquery.inputmask.js",
364 359 "./dist/inputmask/global/document.js",
365 360 "./dist/inputmask/global/window.js",
... ... @@ -384,7 +379,7 @@
384 379 "license": [
385 380 "http://opensource.org/licenses/mit-license.php"
386 381 ],
387   - "description": "jquery.inputmask is a jquery plugin which create an input mask.",
  382 + "description": "Inputmask is a javascript library which creates an input mask. Inputmask can run against vanilla javascript, jQuery and jqlite.",
388 383 "keywords": [
389 384 "form",
390 385 "input",
... ... @@ -576,7 +571,7 @@
576 571 "markdown",
577 572 "markdown-extra"
578 573 ],
579   - "time": "2016-09-14 20:40:20"
  574 + "time": "2016-09-14T20:40:20+00:00"
580 575 },
581 576 {
582 577 "name": "ezyang/htmlpurifier",
... ... @@ -623,7 +618,7 @@
623 618 "keywords": [
624 619 "html"
625 620 ],
626   - "time": "2017-03-13 06:30:53"
  621 + "time": "2017-03-13T06:30:53+00:00"
627 622 },
628 623 {
629 624 "name": "firebase/php-jwt",
... ... @@ -666,7 +661,7 @@
666 661 ],
667 662 "description": "A simple library to encode and decode JSON Web Tokens (JWT) in PHP. Should conform to the current spec.",
668 663 "homepage": "https://github.com/firebase/php-jwt",
669   - "time": "2016-07-18 04:51:16"
  664 + "time": "2016-07-18T04:51:16+00:00"
670 665 },
671 666 {
672 667 "name": "fortawesome/font-awesome",
... ... @@ -714,7 +709,7 @@
714 709 "font",
715 710 "icon"
716 711 ],
717   - "time": "2016-10-24 15:52:54"
  712 + "time": "2016-10-24T15:52:54+00:00"
718 713 },
719 714 {
720 715 "name": "google/apiclient",
... ... @@ -773,7 +768,7 @@
773 768 "keywords": [
774 769 "google"
775 770 ],
776   - "time": "2017-03-22 18:32:04"
  771 + "time": "2017-03-22T18:32:04+00:00"
777 772 },
778 773 {
779 774 "name": "google/apiclient-services",
... ... @@ -810,7 +805,7 @@
810 805 "keywords": [
811 806 "google"
812 807 ],
813   - "time": "2017-03-13 17:40:44"
  808 + "time": "2017-03-13T17:40:44+00:00"
814 809 },
815 810 {
816 811 "name": "google/auth",
... ... @@ -858,7 +853,7 @@
858 853 "google",
859 854 "oauth2"
860 855 ],
861   - "time": "2016-11-02 14:59:14"
  856 + "time": "2016-11-02T14:59:14+00:00"
862 857 },
863 858 {
864 859 "name": "guzzlehttp/guzzle",
... ... @@ -920,7 +915,7 @@
920 915 "rest",
921 916 "web service"
922 917 ],
923   - "time": "2017-02-28 22:50:30"
  918 + "time": "2017-02-28T22:50:30+00:00"
924 919 },
925 920 {
926 921 "name": "guzzlehttp/promises",
... ... @@ -971,7 +966,7 @@
971 966 "keywords": [
972 967 "promise"
973 968 ],
974   - "time": "2016-12-20 10:07:11"
  969 + "time": "2016-12-20T10:07:11+00:00"
975 970 },
976 971 {
977 972 "name": "guzzlehttp/psr7",
... ... @@ -1036,7 +1031,7 @@
1036 1031 "uri",
1037 1032 "url"
1038 1033 ],
1039   - "time": "2017-03-20 17:10:46"
  1034 + "time": "2017-03-20T17:10:46+00:00"
1040 1035 },
1041 1036 {
1042 1037 "name": "hiqdev/yii2-asset-icheck",
... ... @@ -1108,7 +1103,7 @@
1108 1103 "iCheck",
1109 1104 "yii2"
1110 1105 ],
1111   - "time": "2016-03-30 10:59:26"
  1106 + "time": "2016-03-30T10:59:26+00:00"
1112 1107 },
1113 1108 {
1114 1109 "name": "hiqdev/yii2-asset-pnotify",
... ... @@ -1170,7 +1165,7 @@
1170 1165 "pnotify",
1171 1166 "yii2"
1172 1167 ],
1173   - "time": "2015-09-09 15:16:38"
  1168 + "time": "2015-09-09T15:16:38+00:00"
1174 1169 },
1175 1170 {
1176 1171 "name": "imagine/imagine",
... ... @@ -1227,7 +1222,7 @@
1227 1222 "image manipulation",
1228 1223 "image processing"
1229 1224 ],
1230   - "time": "2015-09-19 16:54:05"
  1225 + "time": "2015-09-19T16:54:05+00:00"
1231 1226 },
1232 1227 {
1233 1228 "name": "kartik-v/bootstrap-fileinput",
... ... @@ -1280,7 +1275,7 @@
1280 1275 "progress",
1281 1276 "upload"
1282 1277 ],
1283   - "time": "2017-04-02 18:38:08"
  1278 + "time": "2017-04-02T18:38:08+00:00"
1284 1279 },
1285 1280 {
1286 1281 "name": "kartik-v/yii2-krajee-base",
... ... @@ -1331,7 +1326,7 @@
1331 1326 "widget",
1332 1327 "yii2"
1333 1328 ],
1334   - "time": "2017-02-22 05:58:53"
  1329 + "time": "2017-02-22T05:58:53+00:00"
1335 1330 },
1336 1331 {
1337 1332 "name": "kartik-v/yii2-widget-colorinput",
... ... @@ -1385,7 +1380,7 @@
1385 1380 "widget",
1386 1381 "yii2"
1387 1382 ],
1388   - "time": "2016-01-14 11:15:49"
  1383 + "time": "2016-01-14T11:15:49+00:00"
1389 1384 },
1390 1385 {
1391 1386 "name": "kartik-v/yii2-widget-datepicker",
... ... @@ -1494,7 +1489,7 @@
1494 1489 "widget",
1495 1490 "yii2"
1496 1491 ],
1497   - "time": "2016-06-16 06:53:01"
  1492 + "time": "2016-06-16T06:53:01+00:00"
1498 1493 },
1499 1494 {
1500 1495 "name": "kartik-v/yii2-widget-select2",
... ... @@ -1625,20 +1620,20 @@
1625 1620 "logging",
1626 1621 "psr-3"
1627 1622 ],
1628   - "time": "2017-03-13 07:08:03"
  1623 + "time": "2017-03-13T07:08:03+00:00"
1629 1624 },
1630 1625 {
1631 1626 "name": "noam148/yii2-image-manager",
1632   - "version": "1.2.2",
  1627 + "version": "1.2.3",
1633 1628 "source": {
1634 1629 "type": "git",
1635 1630 "url": "https://github.com/noam148/yii2-image-manager.git",
1636   - "reference": "4b44a4929661a24e3e133f9e38f409966d313940"
  1631 + "reference": "82466e453b5b68e2567d3dae6f8af0ab687ae098"
1637 1632 },
1638 1633 "dist": {
1639 1634 "type": "zip",
1640   - "url": "https://api.github.com/repos/noam148/yii2-image-manager/zipball/4b44a4929661a24e3e133f9e38f409966d313940",
1641   - "reference": "4b44a4929661a24e3e133f9e38f409966d313940",
  1635 + "url": "https://api.github.com/repos/noam148/yii2-image-manager/zipball/82466e453b5b68e2567d3dae6f8af0ab687ae098",
  1636 + "reference": "82466e453b5b68e2567d3dae6f8af0ab687ae098",
1642 1637 "shasum": ""
1643 1638 },
1644 1639 "require": {
... ... @@ -1674,7 +1669,7 @@
1674 1669 "widget",
1675 1670 "yii2"
1676 1671 ],
1677   - "time": "2017-04-23 15:41:45"
  1672 + "time": "2017-05-10T19:29:49+00:00"
1678 1673 },
1679 1674 {
1680 1675 "name": "noam148/yii2-image-resize",
... ... @@ -1720,7 +1715,7 @@
1720 1715 "resize",
1721 1716 "yii2"
1722 1717 ],
1723   - "time": "2016-11-29 18:17:37"
  1718 + "time": "2016-11-29T18:17:37+00:00"
1724 1719 },
1725 1720 {
1726 1721 "name": "phpoffice/phpexcel",
... ... @@ -1777,20 +1772,20 @@
1777 1772 "xls",
1778 1773 "xlsx"
1779 1774 ],
1780   - "time": "2015-05-01 07:00:55"
  1775 + "time": "2015-05-01T07:00:55+00:00"
1781 1776 },
1782 1777 {
1783 1778 "name": "phpseclib/phpseclib",
1784   - "version": "2.0.4",
  1779 + "version": "2.0.5",
1785 1780 "source": {
1786 1781 "type": "git",
1787 1782 "url": "https://github.com/phpseclib/phpseclib.git",
1788   - "reference": "ab8028c93c03cc8d9c824efa75dc94f1db2369bf"
  1783 + "reference": "f8dd0e18d2328c447dd4190fecd11ef52680d968"
1789 1784 },
1790 1785 "dist": {
1791 1786 "type": "zip",
1792   - "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/ab8028c93c03cc8d9c824efa75dc94f1db2369bf",
1793   - "reference": "ab8028c93c03cc8d9c824efa75dc94f1db2369bf",
  1787 + "url": "https://api.github.com/repos/phpseclib/phpseclib/zipball/f8dd0e18d2328c447dd4190fecd11ef52680d968",
  1788 + "reference": "f8dd0e18d2328c447dd4190fecd11ef52680d968",
1794 1789 "shasum": ""
1795 1790 },
1796 1791 "require": {
... ... @@ -1869,7 +1864,7 @@
1869 1864 "x.509",
1870 1865 "x509"
1871 1866 ],
1872   - "time": "2016-10-04 00:57:04"
  1867 + "time": "2017-05-08T05:58:35+00:00"
1873 1868 },
1874 1869 {
1875 1870 "name": "psr/cache",
... ... @@ -1915,7 +1910,7 @@
1915 1910 "psr",
1916 1911 "psr-6"
1917 1912 ],
1918   - "time": "2016-08-06 20:24:11"
  1913 + "time": "2016-08-06T20:24:11+00:00"
1919 1914 },
1920 1915 {
1921 1916 "name": "psr/http-message",
... ... @@ -1965,7 +1960,7 @@
1965 1960 "request",
1966 1961 "response"
1967 1962 ],
1968   - "time": "2016-08-06 14:39:51"
  1963 + "time": "2016-08-06T14:39:51+00:00"
1969 1964 },
1970 1965 {
1971 1966 "name": "psr/log",
... ... @@ -2012,7 +2007,7 @@
2012 2007 "psr",
2013 2008 "psr-3"
2014 2009 ],
2015   - "time": "2016-10-10 12:19:37"
  2010 + "time": "2016-10-10T12:19:37+00:00"
2016 2011 },
2017 2012 {
2018 2013 "name": "rmrevin/yii2-fontawesome",
... ... @@ -2064,7 +2059,7 @@
2064 2059 "font",
2065 2060 "yii"
2066 2061 ],
2067   - "time": "2017-01-11 14:05:47"
  2062 + "time": "2017-01-11T14:05:47+00:00"
2068 2063 },
2069 2064 {
2070 2065 "name": "speixoto/yii2-amcharts",
... ... @@ -2106,20 +2101,20 @@
2106 2101 "amcharts",
2107 2102 "yii"
2108 2103 ],
2109   - "time": "2016-08-23 13:52:28"
  2104 + "time": "2016-08-23T13:52:28+00:00"
2110 2105 },
2111 2106 {
2112 2107 "name": "swiftmailer/swiftmailer",
2113   - "version": "v5.4.7",
  2108 + "version": "v5.4.8",
2114 2109 "source": {
2115 2110 "type": "git",
2116 2111 "url": "https://github.com/swiftmailer/swiftmailer.git",
2117   - "reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4"
  2112 + "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517"
2118 2113 },
2119 2114 "dist": {
2120 2115 "type": "zip",
2121   - "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4",
2122   - "reference": "56db4ed32a6d5c9824c3ecc1d2e538f663f47eb4",
  2116 + "url": "https://api.github.com/repos/swiftmailer/swiftmailer/zipball/9a06dc570a0367850280eefd3f1dc2da45aef517",
  2117 + "reference": "9a06dc570a0367850280eefd3f1dc2da45aef517",
2123 2118 "shasum": ""
2124 2119 },
2125 2120 "require": {
... ... @@ -2160,20 +2155,20 @@
2160 2155 "mail",
2161 2156 "mailer"
2162 2157 ],
2163   - "time": "2017-04-20 17:32:18"
  2158 + "time": "2017-05-01T15:54:03+00:00"
2164 2159 },
2165 2160 {
2166 2161 "name": "tinymce/tinymce",
2167   - "version": "4.5.7",
  2162 + "version": "4.6.1",
2168 2163 "source": {
2169 2164 "type": "git",
2170 2165 "url": "https://github.com/tinymce/tinymce-dist.git",
2171   - "reference": "9f00447e1dd5b99d47810c84c66c39950663c129"
  2166 + "reference": "a4129cbcaea6d4e9c26b103f11e2215dd85b8cb7"
2172 2167 },
2173 2168 "dist": {
2174 2169 "type": "zip",
2175   - "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/9f00447e1dd5b99d47810c84c66c39950663c129",
2176   - "reference": "9f00447e1dd5b99d47810c84c66c39950663c129",
  2170 + "url": "https://api.github.com/repos/tinymce/tinymce-dist/zipball/a4129cbcaea6d4e9c26b103f11e2215dd85b8cb7",
  2171 + "reference": "a4129cbcaea6d4e9c26b103f11e2215dd85b8cb7",
2177 2172 "shasum": ""
2178 2173 },
2179 2174 "type": "component",
... ... @@ -2206,7 +2201,7 @@
2206 2201 "tinymce",
2207 2202 "wysiwyg"
2208 2203 ],
2209   - "time": "2017-04-25 12:41:19"
  2204 + "time": "2017-05-10T13:42:57+00:00"
2210 2205 },
2211 2206 {
2212 2207 "name": "yii2tech/filedb",
... ... @@ -2254,7 +2249,7 @@
2254 2249 "static",
2255 2250 "yii2"
2256 2251 ],
2257   - "time": "2017-02-06 10:58:30"
  2252 + "time": "2017-02-06T10:58:30+00:00"
2258 2253 },
2259 2254 {
2260 2255 "name": "yiisoft/yii2",
... ... @@ -2354,7 +2349,7 @@
2354 2349 "framework",
2355 2350 "yii2"
2356 2351 ],
2357   - "time": "2017-02-08 09:04:32"
  2352 + "time": "2017-02-08T09:04:32+00:00"
2358 2353 },
2359 2354 {
2360 2355 "name": "yiisoft/yii2-bootstrap",
... ... @@ -2404,7 +2399,7 @@
2404 2399 "bootstrap",
2405 2400 "yii2"
2406 2401 ],
2407   - "time": "2016-03-17 03:29:28"
  2402 + "time": "2016-03-17T03:29:28+00:00"
2408 2403 },
2409 2404 {
2410 2405 "name": "yiisoft/yii2-composer",
... ... @@ -2454,7 +2449,7 @@
2454 2449 "extension installer",
2455 2450 "yii2"
2456 2451 ],
2457   - "time": "2016-12-20 13:26:02"
  2452 + "time": "2016-12-20T13:26:02+00:00"
2458 2453 },
2459 2454 {
2460 2455 "name": "yiisoft/yii2-imagine",
... ... @@ -2502,20 +2497,20 @@
2502 2497 "imagine",
2503 2498 "yii2"
2504 2499 ],
2505   - "time": "2016-11-03 19:28:39"
  2500 + "time": "2016-11-03T19:28:39+00:00"
2506 2501 },
2507 2502 {
2508 2503 "name": "yiisoft/yii2-swiftmailer",
2509   - "version": "2.0.6",
  2504 + "version": "2.0.7",
2510 2505 "source": {
2511 2506 "type": "git",
2512 2507 "url": "https://github.com/yiisoft/yii2-swiftmailer.git",
2513   - "reference": "26b900767f1031ff3a4668dfa36c10595875f0a5"
  2508 + "reference": "8a03a62cbcb82e7697d3002eb43a8d2637f566ec"
2514 2509 },
2515 2510 "dist": {
2516 2511 "type": "zip",
2517   - "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/26b900767f1031ff3a4668dfa36c10595875f0a5",
2518   - "reference": "26b900767f1031ff3a4668dfa36c10595875f0a5",
  2512 + "url": "https://api.github.com/repos/yiisoft/yii2-swiftmailer/zipball/8a03a62cbcb82e7697d3002eb43a8d2637f566ec",
  2513 + "reference": "8a03a62cbcb82e7697d3002eb43a8d2637f566ec",
2519 2514 "shasum": ""
2520 2515 },
2521 2516 "require": {
... ... @@ -2552,7 +2547,7 @@
2552 2547 "swiftmailer",
2553 2548 "yii2"
2554 2549 ],
2555   - "time": "2016-09-09 11:48:11"
  2550 + "time": "2017-05-01T08:29:00+00:00"
2556 2551 },
2557 2552 {
2558 2553 "name": "yiister/yii2-gentelella",
... ... @@ -2610,7 +2605,7 @@
2610 2605 "theme",
2611 2606 "yii2"
2612 2607 ],
2613   - "time": "2017-03-21 14:59:58"
  2608 + "time": "2017-03-21T14:59:58+00:00"
2614 2609 }
2615 2610 ],
2616 2611 "packages-dev": [
... ... @@ -2671,7 +2666,7 @@
2671 2666 "gherkin",
2672 2667 "parser"
2673 2668 ],
2674   - "time": "2016-10-30 11:50:56"
  2669 + "time": "2016-10-30T11:50:56+00:00"
2675 2670 },
2676 2671 {
2677 2672 "name": "bower-asset/typeahead.js",
... ... @@ -2702,16 +2697,16 @@
2702 2697 },
2703 2698 {
2704 2699 "name": "codeception/base",
2705   - "version": "2.2.10",
  2700 + "version": "2.2.11",
2706 2701 "source": {
2707 2702 "type": "git",
2708 2703 "url": "https://github.com/Codeception/base.git",
2709   - "reference": "99142344c1c3ea147d2908473ee96bfef81a2349"
  2704 + "reference": "eea7d29115390772363a4f7744396927b33bf4f3"
2710 2705 },
2711 2706 "dist": {
2712 2707 "type": "zip",
2713   - "url": "https://api.github.com/repos/Codeception/base/zipball/99142344c1c3ea147d2908473ee96bfef81a2349",
2714   - "reference": "99142344c1c3ea147d2908473ee96bfef81a2349",
  2708 + "url": "https://api.github.com/repos/Codeception/base/zipball/eea7d29115390772363a4f7744396927b33bf4f3",
  2709 + "reference": "eea7d29115390772363a4f7744396927b33bf4f3",
2715 2710 "shasum": ""
2716 2711 },
2717 2712 "require": {
... ... @@ -2720,9 +2715,10 @@
2720 2715 "ext-mbstring": "*",
2721 2716 "guzzlehttp/psr7": "~1.0",
2722 2717 "php": ">=5.4.0 <8.0",
2723   - "phpunit/php-code-coverage": ">=2.2.4 <5.0",
  2718 + "phpunit/php-code-coverage": ">=2.2.4 <6.0",
2724 2719 "phpunit/phpunit": ">4.8.20 <6.0",
2725   - "sebastian/comparator": "~1.1",
  2720 + "phpunit/phpunit-mock-objects": ">2.3 <5.0",
  2721 + "sebastian/comparator": ">1.1 <3.0",
2726 2722 "sebastian/diff": "^1.4",
2727 2723 "stecman/symfony-console-completion": "^0.7.0",
2728 2724 "symfony/browser-kit": ">=2.7 <4.0",
... ... @@ -2789,7 +2785,7 @@
2789 2785 "functional testing",
2790 2786 "unit testing"
2791 2787 ],
2792   - "time": "2017-03-25 03:34:50"
  2788 + "time": "2017-05-11T21:58:39+00:00"
2793 2789 },
2794 2790 {
2795 2791 "name": "codeception/verify",
... ... @@ -2825,7 +2821,7 @@
2825 2821 }
2826 2822 ],
2827 2823 "description": "BDD assertion library for PHPUnit",
2828   - "time": "2017-01-09 10:58:51"
  2824 + "time": "2017-01-09T10:58:51+00:00"
2829 2825 },
2830 2826 {
2831 2827 "name": "doctrine/instantiator",
... ... @@ -2879,7 +2875,7 @@
2879 2875 "constructor",
2880 2876 "instantiate"
2881 2877 ],
2882   - "time": "2015-06-14 21:17:01"
  2878 + "time": "2015-06-14T21:17:01+00:00"
2883 2879 },
2884 2880 {
2885 2881 "name": "fzaninotto/faker",
... ... @@ -2927,7 +2923,7 @@
2927 2923 "faker",
2928 2924 "fixtures"
2929 2925 ],
2930   - "time": "2016-04-29 12:21:54"
  2926 + "time": "2016-04-29T12:21:54+00:00"
2931 2927 },
2932 2928 {
2933 2929 "name": "myclabs/deep-copy",
... ... @@ -2969,7 +2965,7 @@
2969 2965 "object",
2970 2966 "object graph"
2971 2967 ],
2972   - "time": "2017-04-12 18:52:22"
  2968 + "time": "2017-04-12T18:52:22+00:00"
2973 2969 },
2974 2970 {
2975 2971 "name": "phpdocumentor/reflection-common",
... ... @@ -3023,7 +3019,7 @@
3023 3019 "reflection",
3024 3020 "static analysis"
3025 3021 ],
3026   - "time": "2015-12-27 11:43:31"
  3022 + "time": "2015-12-27T11:43:31+00:00"
3027 3023 },
3028 3024 {
3029 3025 "name": "phpdocumentor/reflection-docblock",
... ... @@ -3068,7 +3064,7 @@
3068 3064 }
3069 3065 ],
3070 3066 "description": "With this component, a library can provide support for annotations via DocBlocks or otherwise retrieve information that is embedded in a DocBlock.",
3071   - "time": "2016-09-30 07:12:33"
  3067 + "time": "2016-09-30T07:12:33+00:00"
3072 3068 },
3073 3069 {
3074 3070 "name": "phpdocumentor/type-resolver",
... ... @@ -3115,7 +3111,7 @@
3115 3111 "email": "me@mikevanriel.com"
3116 3112 }
3117 3113 ],
3118   - "time": "2016-11-25 06:54:22"
  3114 + "time": "2016-11-25T06:54:22+00:00"
3119 3115 },
3120 3116 {
3121 3117 "name": "phpspec/php-diff",
... ... @@ -3153,7 +3149,7 @@
3153 3149 }
3154 3150 ],
3155 3151 "description": "A comprehensive library for generating differences between two hashable objects (strings or arrays).",
3156   - "time": "2016-04-07 12:29:16"
  3152 + "time": "2016-04-07T12:29:16+00:00"
3157 3153 },
3158 3154 {
3159 3155 "name": "phpspec/prophecy",
... ... @@ -3216,7 +3212,7 @@
3216 3212 "spy",
3217 3213 "stub"
3218 3214 ],
3219   - "time": "2017-03-02 20:05:34"
  3215 + "time": "2017-03-02T20:05:34+00:00"
3220 3216 },
3221 3217 {
3222 3218 "name": "phpunit/php-code-coverage",
... ... @@ -3279,7 +3275,7 @@
3279 3275 "testing",
3280 3276 "xunit"
3281 3277 ],
3282   - "time": "2017-04-02 07:44:40"
  3278 + "time": "2017-04-02T07:44:40+00:00"
3283 3279 },
3284 3280 {
3285 3281 "name": "phpunit/php-file-iterator",
... ... @@ -3326,7 +3322,7 @@
3326 3322 "filesystem",
3327 3323 "iterator"
3328 3324 ],
3329   - "time": "2016-10-03 07:40:28"
  3325 + "time": "2016-10-03T07:40:28+00:00"
3330 3326 },
3331 3327 {
3332 3328 "name": "phpunit/php-text-template",
... ... @@ -3367,7 +3363,7 @@
3367 3363 "keywords": [
3368 3364 "template"
3369 3365 ],
3370   - "time": "2015-06-21 13:50:34"
  3366 + "time": "2015-06-21T13:50:34+00:00"
3371 3367 },
3372 3368 {
3373 3369 "name": "phpunit/php-timer",
... ... @@ -3416,7 +3412,7 @@
3416 3412 "keywords": [
3417 3413 "timer"
3418 3414 ],
3419   - "time": "2017-02-26 11:10:40"
  3415 + "time": "2017-02-26T11:10:40+00:00"
3420 3416 },
3421 3417 {
3422 3418 "name": "phpunit/php-token-stream",
... ... @@ -3465,7 +3461,7 @@
3465 3461 "keywords": [
3466 3462 "tokenizer"
3467 3463 ],
3468   - "time": "2017-02-27 10:12:30"
  3464 + "time": "2017-02-27T10:12:30+00:00"
3469 3465 },
3470 3466 {
3471 3467 "name": "phpunit/phpunit",
... ... @@ -3547,7 +3543,7 @@
3547 3543 "testing",
3548 3544 "xunit"
3549 3545 ],
3550   - "time": "2017-04-03 02:22:27"
  3546 + "time": "2017-04-03T02:22:27+00:00"
3551 3547 },
3552 3548 {
3553 3549 "name": "phpunit/phpunit-mock-objects",
... ... @@ -3606,7 +3602,7 @@
3606 3602 "mock",
3607 3603 "xunit"
3608 3604 ],
3609   - "time": "2016-12-08 20:27:08"
  3605 + "time": "2016-12-08T20:27:08+00:00"
3610 3606 },
3611 3607 {
3612 3608 "name": "sebastian/code-unit-reverse-lookup",
... ... @@ -3651,7 +3647,7 @@
3651 3647 ],
3652 3648 "description": "Looks up which function or method a line of code belongs to",
3653 3649 "homepage": "https://github.com/sebastianbergmann/code-unit-reverse-lookup/",
3654   - "time": "2017-03-04 06:30:41"
  3650 + "time": "2017-03-04T06:30:41+00:00"
3655 3651 },
3656 3652 {
3657 3653 "name": "sebastian/comparator",
... ... @@ -3715,7 +3711,7 @@
3715 3711 "compare",
3716 3712 "equality"
3717 3713 ],
3718   - "time": "2017-01-29 09:50:25"
  3714 + "time": "2017-01-29T09:50:25+00:00"
3719 3715 },
3720 3716 {
3721 3717 "name": "sebastian/diff",
... ... @@ -3767,7 +3763,7 @@
3767 3763 "keywords": [
3768 3764 "diff"
3769 3765 ],
3770   - "time": "2015-12-08 07:14:41"
  3766 + "time": "2015-12-08T07:14:41+00:00"
3771 3767 },
3772 3768 {
3773 3769 "name": "sebastian/environment",
... ... @@ -3817,7 +3813,7 @@
3817 3813 "environment",
3818 3814 "hhvm"
3819 3815 ],
3820   - "time": "2016-11-26 07:53:53"
  3816 + "time": "2016-11-26T07:53:53+00:00"
3821 3817 },
3822 3818 {
3823 3819 "name": "sebastian/exporter",
... ... @@ -3884,7 +3880,7 @@
3884 3880 "export",
3885 3881 "exporter"
3886 3882 ],
3887   - "time": "2016-11-19 08:54:04"
  3883 + "time": "2016-11-19T08:54:04+00:00"
3888 3884 },
3889 3885 {
3890 3886 "name": "sebastian/global-state",
... ... @@ -3935,7 +3931,7 @@
3935 3931 "keywords": [
3936 3932 "global state"
3937 3933 ],
3938   - "time": "2015-10-12 03:26:01"
  3934 + "time": "2015-10-12T03:26:01+00:00"
3939 3935 },
3940 3936 {
3941 3937 "name": "sebastian/object-enumerator",
... ... @@ -3981,7 +3977,7 @@
3981 3977 ],
3982 3978 "description": "Traverses array structures and object graphs to enumerate all referenced objects",
3983 3979 "homepage": "https://github.com/sebastianbergmann/object-enumerator/",
3984   - "time": "2017-02-18 15:18:39"
  3980 + "time": "2017-02-18T15:18:39+00:00"
3985 3981 },
3986 3982 {
3987 3983 "name": "sebastian/recursion-context",
... ... @@ -4034,7 +4030,7 @@
4034 4030 ],
4035 4031 "description": "Provides functionality to recursively process PHP variables",
4036 4032 "homepage": "http://www.github.com/sebastianbergmann/recursion-context",
4037   - "time": "2016-11-19 07:33:16"
  4033 + "time": "2016-11-19T07:33:16+00:00"
4038 4034 },
4039 4035 {
4040 4036 "name": "sebastian/resource-operations",
... ... @@ -4076,7 +4072,7 @@
4076 4072 ],
4077 4073 "description": "Provides a list of PHP built-in functions that operate on resources",
4078 4074 "homepage": "https://www.github.com/sebastianbergmann/resource-operations",
4079   - "time": "2015-07-28 20:34:47"
  4075 + "time": "2015-07-28T20:34:47+00:00"
4080 4076 },
4081 4077 {
4082 4078 "name": "sebastian/version",
... ... @@ -4119,7 +4115,7 @@
4119 4115 ],
4120 4116 "description": "Library that helps with managing the version number of Git-hosted PHP projects",
4121 4117 "homepage": "https://github.com/sebastianbergmann/version",
4122   - "time": "2016-10-03 07:35:21"
  4118 + "time": "2016-10-03T07:35:21+00:00"
4123 4119 },
4124 4120 {
4125 4121 "name": "stecman/symfony-console-completion",
... ... @@ -4164,20 +4160,20 @@
4164 4160 }
4165 4161 ],
4166 4162 "description": "Automatic BASH completion for Symfony Console Component based applications.",
4167   - "time": "2016-02-24 05:08:54"
  4163 + "time": "2016-02-24T05:08:54+00:00"
4168 4164 },
4169 4165 {
4170 4166 "name": "symfony/browser-kit",
4171   - "version": "v3.2.7",
  4167 + "version": "v3.2.8",
4172 4168 "source": {
4173 4169 "type": "git",
4174 4170 "url": "https://github.com/symfony/browser-kit.git",
4175   - "reference": "2fe0caa60c1a1dfeefd0425741182687a9b382b8"
  4171 + "reference": "9fab1ab6f77b77f3df5fc5250fc6956811699b57"
4176 4172 },
4177 4173 "dist": {
4178 4174 "type": "zip",
4179   - "url": "https://api.github.com/repos/symfony/browser-kit/zipball/2fe0caa60c1a1dfeefd0425741182687a9b382b8",
4180   - "reference": "2fe0caa60c1a1dfeefd0425741182687a9b382b8",
  4175 + "url": "https://api.github.com/repos/symfony/browser-kit/zipball/9fab1ab6f77b77f3df5fc5250fc6956811699b57",
  4176 + "reference": "9fab1ab6f77b77f3df5fc5250fc6956811699b57",
4181 4177 "shasum": ""
4182 4178 },
4183 4179 "require": {
... ... @@ -4221,20 +4217,20 @@
4221 4217 ],
4222 4218 "description": "Symfony BrowserKit Component",
4223 4219 "homepage": "https://symfony.com",
4224   - "time": "2017-02-21 09:12:04"
  4220 + "time": "2017-04-12T14:13:17+00:00"
4225 4221 },
4226 4222 {
4227 4223 "name": "symfony/console",
4228   - "version": "v3.2.7",
  4224 + "version": "v3.2.8",
4229 4225 "source": {
4230 4226 "type": "git",
4231 4227 "url": "https://github.com/symfony/console.git",
4232   - "reference": "c30243cc51f726812be3551316b109a2f5deaf8d"
  4228 + "reference": "a7a17e0c6c3c4d70a211f80782e4b90ddadeaa38"
4233 4229 },
4234 4230 "dist": {
4235 4231 "type": "zip",
4236   - "url": "https://api.github.com/repos/symfony/console/zipball/c30243cc51f726812be3551316b109a2f5deaf8d",
4237   - "reference": "c30243cc51f726812be3551316b109a2f5deaf8d",
  4232 + "url": "https://api.github.com/repos/symfony/console/zipball/a7a17e0c6c3c4d70a211f80782e4b90ddadeaa38",
  4233 + "reference": "a7a17e0c6c3c4d70a211f80782e4b90ddadeaa38",
4238 4234 "shasum": ""
4239 4235 },
4240 4236 "require": {
... ... @@ -4284,20 +4280,20 @@
4284 4280 ],
4285 4281 "description": "Symfony Console Component",
4286 4282 "homepage": "https://symfony.com",
4287   - "time": "2017-04-04 14:33:42"
  4283 + "time": "2017-04-26T01:39:17+00:00"
4288 4284 },
4289 4285 {
4290 4286 "name": "symfony/css-selector",
4291   - "version": "v3.2.7",
  4287 + "version": "v3.2.8",
4292 4288 "source": {
4293 4289 "type": "git",
4294 4290 "url": "https://github.com/symfony/css-selector.git",
4295   - "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c"
  4291 + "reference": "02983c144038e697c959e6b06ef6666de759ccbc"
4296 4292 },
4297 4293 "dist": {
4298 4294 "type": "zip",
4299   - "url": "https://api.github.com/repos/symfony/css-selector/zipball/a48f13dc83c168f1253a5d2a5a4fb46c36244c4c",
4300   - "reference": "a48f13dc83c168f1253a5d2a5a4fb46c36244c4c",
  4295 + "url": "https://api.github.com/repos/symfony/css-selector/zipball/02983c144038e697c959e6b06ef6666de759ccbc",
  4296 + "reference": "02983c144038e697c959e6b06ef6666de759ccbc",
4301 4297 "shasum": ""
4302 4298 },
4303 4299 "require": {
... ... @@ -4337,20 +4333,20 @@
4337 4333 ],
4338 4334 "description": "Symfony CssSelector Component",
4339 4335 "homepage": "https://symfony.com",
4340   - "time": "2017-02-21 09:12:04"
  4336 + "time": "2017-05-01T14:55:58+00:00"
4341 4337 },
4342 4338 {
4343 4339 "name": "symfony/debug",
4344   - "version": "v3.2.7",
  4340 + "version": "v3.2.8",
4345 4341 "source": {
4346 4342 "type": "git",
4347 4343 "url": "https://github.com/symfony/debug.git",
4348   - "reference": "56f613406446a4a0a031475cfd0a01751de22659"
  4344 + "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686"
4349 4345 },
4350 4346 "dist": {
4351 4347 "type": "zip",
4352   - "url": "https://api.github.com/repos/symfony/debug/zipball/56f613406446a4a0a031475cfd0a01751de22659",
4353   - "reference": "56f613406446a4a0a031475cfd0a01751de22659",
  4348 + "url": "https://api.github.com/repos/symfony/debug/zipball/fd6eeee656a5a7b384d56f1072243fe1c0e81686",
  4349 + "reference": "fd6eeee656a5a7b384d56f1072243fe1c0e81686",
4354 4350 "shasum": ""
4355 4351 },
4356 4352 "require": {
... ... @@ -4394,20 +4390,20 @@
4394 4390 ],
4395 4391 "description": "Symfony Debug Component",
4396 4392 "homepage": "https://symfony.com",
4397   - "time": "2017-03-28 21:38:24"
  4393 + "time": "2017-04-19T20:17:50+00:00"
4398 4394 },
4399 4395 {
4400 4396 "name": "symfony/dom-crawler",
4401   - "version": "v3.2.7",
  4397 + "version": "v3.2.8",
4402 4398 "source": {
4403 4399 "type": "git",
4404 4400 "url": "https://github.com/symfony/dom-crawler.git",
4405   - "reference": "403944e294cf4ceb3b8447f54cbad88ea7b99cee"
  4401 + "reference": "f1ad34e8af09ed17570e027cf0c58a12eddec286"
4406 4402 },
4407 4403 "dist": {
4408 4404 "type": "zip",
4409   - "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/403944e294cf4ceb3b8447f54cbad88ea7b99cee",
4410   - "reference": "403944e294cf4ceb3b8447f54cbad88ea7b99cee",
  4405 + "url": "https://api.github.com/repos/symfony/dom-crawler/zipball/f1ad34e8af09ed17570e027cf0c58a12eddec286",
  4406 + "reference": "f1ad34e8af09ed17570e027cf0c58a12eddec286",
4411 4407 "shasum": ""
4412 4408 },
4413 4409 "require": {
... ... @@ -4450,20 +4446,20 @@
4450 4446 ],
4451 4447 "description": "Symfony DomCrawler Component",
4452 4448 "homepage": "https://symfony.com",
4453   - "time": "2017-02-21 09:12:04"
  4449 + "time": "2017-04-12T14:13:17+00:00"
4454 4450 },
4455 4451 {
4456 4452 "name": "symfony/event-dispatcher",
4457   - "version": "v3.2.7",
  4453 + "version": "v3.2.8",
4458 4454 "source": {
4459 4455 "type": "git",
4460 4456 "url": "https://github.com/symfony/event-dispatcher.git",
4461   - "reference": "154bb1ef7b0e42ccc792bd53edbce18ed73440ca"
  4457 + "reference": "b8a401f733b43251e1d088c589368b2a94155e40"
4462 4458 },
4463 4459 "dist": {
4464 4460 "type": "zip",
4465   - "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/154bb1ef7b0e42ccc792bd53edbce18ed73440ca",
4466   - "reference": "154bb1ef7b0e42ccc792bd53edbce18ed73440ca",
  4461 + "url": "https://api.github.com/repos/symfony/event-dispatcher/zipball/b8a401f733b43251e1d088c589368b2a94155e40",
  4462 + "reference": "b8a401f733b43251e1d088c589368b2a94155e40",
4467 4463 "shasum": ""
4468 4464 },
4469 4465 "require": {
... ... @@ -4510,20 +4506,20 @@
4510 4506 ],
4511 4507 "description": "Symfony EventDispatcher Component",
4512 4508 "homepage": "https://symfony.com",
4513   - "time": "2017-04-04 07:26:27"
  4509 + "time": "2017-05-01T14:58:48+00:00"
4514 4510 },
4515 4511 {
4516 4512 "name": "symfony/finder",
4517   - "version": "v3.2.7",
  4513 + "version": "v3.2.8",
4518 4514 "source": {
4519 4515 "type": "git",
4520 4516 "url": "https://github.com/symfony/finder.git",
4521   - "reference": "b20900ce5ea164cd9314af52725b0bb5a758217a"
  4517 + "reference": "9cf076f8f492f4b1ffac40aae9c2d287b4ca6930"
4522 4518 },
4523 4519 "dist": {
4524 4520 "type": "zip",
4525   - "url": "https://api.github.com/repos/symfony/finder/zipball/b20900ce5ea164cd9314af52725b0bb5a758217a",
4526   - "reference": "b20900ce5ea164cd9314af52725b0bb5a758217a",
  4521 + "url": "https://api.github.com/repos/symfony/finder/zipball/9cf076f8f492f4b1ffac40aae9c2d287b4ca6930",
  4522 + "reference": "9cf076f8f492f4b1ffac40aae9c2d287b4ca6930",
4527 4523 "shasum": ""
4528 4524 },
4529 4525 "require": {
... ... @@ -4559,7 +4555,7 @@
4559 4555 ],
4560 4556 "description": "Symfony Finder Component",
4561 4557 "homepage": "https://symfony.com",
4562   - "time": "2017-03-20 09:32:19"
  4558 + "time": "2017-04-12T14:13:17+00:00"
4563 4559 },
4564 4560 {
4565 4561 "name": "symfony/polyfill-mbstring",
... ... @@ -4618,20 +4614,20 @@
4618 4614 "portable",
4619 4615 "shim"
4620 4616 ],
4621   - "time": "2016-11-14 01:06:16"
  4617 + "time": "2016-11-14T01:06:16+00:00"
4622 4618 },
4623 4619 {
4624 4620 "name": "symfony/yaml",
4625   - "version": "v3.2.7",
  4621 + "version": "v3.2.8",
4626 4622 "source": {
4627 4623 "type": "git",
4628 4624 "url": "https://github.com/symfony/yaml.git",
4629   - "reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621"
  4625 + "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6"
4630 4626 },
4631 4627 "dist": {
4632 4628 "type": "zip",
4633   - "url": "https://api.github.com/repos/symfony/yaml/zipball/62b4cdb99d52cb1ff253c465eb1532a80cebb621",
4634   - "reference": "62b4cdb99d52cb1ff253c465eb1532a80cebb621",
  4629 + "url": "https://api.github.com/repos/symfony/yaml/zipball/acec26fcf7f3031e094e910b94b002fa53d4e4d6",
  4630 + "reference": "acec26fcf7f3031e094e910b94b002fa53d4e4d6",
4635 4631 "shasum": ""
4636 4632 },
4637 4633 "require": {
... ... @@ -4673,7 +4669,7 @@
4673 4669 ],
4674 4670 "description": "Symfony Yaml Component",
4675 4671 "homepage": "https://symfony.com",
4676   - "time": "2017-03-20 09:45:15"
  4672 + "time": "2017-05-01T14:55:58+00:00"
4677 4673 },
4678 4674 {
4679 4675 "name": "webmozart/assert",
... ... @@ -4723,7 +4719,7 @@
4723 4719 "check",
4724 4720 "validate"
4725 4721 ],
4726   - "time": "2016-11-23 20:04:58"
  4722 + "time": "2016-11-23T20:04:58+00:00"
4727 4723 },
4728 4724 {
4729 4725 "name": "yiisoft/yii2-debug",
... ... @@ -4770,7 +4766,7 @@
4770 4766 "debugger",
4771 4767 "yii2"
4772 4768 ],
4773   - "time": "2017-02-21 10:30:50"
  4769 + "time": "2017-02-21T10:30:50+00:00"
4774 4770 },
4775 4771 {
4776 4772 "name": "yiisoft/yii2-faker",
... ... @@ -4817,7 +4813,7 @@
4817 4813 "faker",
4818 4814 "yii2"
4819 4815 ],
4820   - "time": "2015-03-01 06:22:44"
  4816 + "time": "2015-03-01T06:22:44+00:00"
4821 4817 },
4822 4818 {
4823 4819 "name": "yiisoft/yii2-gii",
... ... @@ -4870,7 +4866,7 @@
4870 4866 "gii",
4871 4867 "yii2"
4872 4868 ],
4873   - "time": "2016-03-18 14:09:46"
  4869 + "time": "2016-03-18T14:09:46+00:00"
4874 4870 }
4875 4871 ],
4876 4872 "aliases": [],
... ...
frontend/controllers/CheckoutController.php
... ... @@ -3,6 +3,7 @@
3 3 namespace frontend\controllers;
4 4  
5 5 use artbox\catalog\models\Product;
  6 + use artbox\catalog\models\Variant;
6 7 use artbox\order\models\Delivery;
7 8 use artbox\order\models\OrderProduct;
8 9 use artbox\order\models\Payment;
... ... @@ -91,10 +92,10 @@
91 92 return $this->redirect([ 'info' ]);
92 93 }
93 94 $deliveries = Delivery::find()
94   - ->with('lang')
95   - ->where([ 'status' => true ])
96   - ->orderBy([ 'sort' => SORT_ASC ])
97   - ->all();
  95 + ->with('lang')
  96 + ->where([ 'status' => true ])
  97 + ->orderBy([ 'sort' => SORT_ASC ])
  98 + ->all();
98 99 return $this->render(
99 100 'delivery',
100 101 [
... ... @@ -123,10 +124,10 @@
123 124 return $this->redirect('confirm');
124 125 } else {
125 126 $payments = Payment::find()
126   - ->with('lang')
127   - ->where([ 'status' => true ])
128   - ->orderBy([ 'sort' => SORT_ASC ])
129   - ->all();
  127 + ->with('lang')
  128 + ->where([ 'status' => true ])
  129 + ->orderBy([ 'sort' => SORT_ASC ])
  130 + ->all();
130 131 return $this->render(
131 132 'payment',
132 133 [
... ... @@ -192,8 +193,6 @@
192 193 public function actionFast()
193 194 {
194 195 $this->enableCsrfValidation = false;
195   - $response = \Yii::$app->response;
196   - $response->format = $response::FORMAT_JSON;
197 196 $model = new Order(
198 197 [
199 198 'scenario' => Order::SCENARIO_FAST,
... ... @@ -204,15 +203,33 @@
204 203 $model->delivery_id = 5;
205 204 $model->payment_id = 3;
206 205 if ($model->save()) {
207   - return [
208   - 'success' => true,
209   - 'msg' => \Yii::t(
  206 + /**
  207 + * @var Variant $variant
  208 + */
  209 + $variant = Variant::find()
  210 + ->where([ 'id' => $model->variantId ])
  211 + ->one();
  212 + ( new OrderProduct(
  213 + [
  214 + 'order_id' => $model->id,
  215 + 'variant_id' => $model->variantId,
  216 + 'sku' => $variant->sku,
  217 + 'price' => $variant->price,
  218 + 'count' => 1,
  219 + ]
  220 + ) )->save(false);
  221 + \Yii::$app->session->setFlash(
  222 + 'success',
  223 + \Yii::t(
210 224 'app',
211   - 'Заказ успешно оформлен. Вашему заказу присвоен номер ' . $model->id . '.'
212   - ),
213   - ];
  225 + 'Заказ успешно оформлен. Ваш номер заказ: ' . $model->id . '.'
  226 + )
  227 + );
  228 + return $this->redirect($model->returnUrl ? : [ 'site/index' ]);
214 229 }
215 230 }
  231 + $response = \Yii::$app->response;
  232 + $response->format = $response::FORMAT_JSON;
216 233 return $model->getErrors();
217 234 }
218 235  
... ...
frontend/controllers/SiteController.php
... ... @@ -185,15 +185,22 @@
185 185 if (empty(Yii::$app->request->post())) {
186 186 throw new BadRequestHttpException();
187 187 } else {
188   - $model = new Feedback();
  188 + $model = new Feedback(
  189 + [
  190 + 'scenario' => Feedback::SCENARIO_CALLBACK,
  191 + ]
  192 + );
189 193 if ($model->load(Yii::$app->request->post()) && $model->save()) {
190 194 return [
191 195 'success' => true,
192   - 'message' => 'Success message',
  196 + 'message' => \Yii::t('app', 'Заявка успешно отправлена'),
193 197 'alert' => '<div class="alert alert-success">
194   - <h3>Success</h3>
  198 + <h3>' . \Yii::t('app', 'Заявка успешно отправлена') . '</h3>
195 199 <p>
196   - Success text
  200 + ' . \Yii::t(
  201 + 'app',
  202 + 'Спасибо, Ваша заявка успешно отправлена. Наши менеджеры свяжутся с Вами в ближайшее время'
  203 + ) . 'Success text
197 204 </p>
198 205 </div>',
199 206 ];
... ...
frontend/models/Order.php
... ... @@ -10,6 +10,7 @@
10 10 class Order extends \artbox\order\models\Order
11 11 {
12 12 public $variantId;
  13 + public $returnUrl;
13 14  
14 15 const SCENARIO_INFO = 'info';
15 16 const SCENARIO_DELIVERY = 'delivery';
... ... @@ -43,6 +44,7 @@
43 44 'name',
44 45 'phone',
45 46 'variantId',
  47 + 'returnUrl',
46 48 ],
47 49 ]
48 50 );
... ... @@ -89,6 +91,7 @@
89 91 [
90 92 [
91 93 'comment',
  94 + 'returnUrl',
92 95 ],
93 96 'string',
94 97 ],
... ...
frontend/views/category/view.php
... ... @@ -117,7 +117,7 @@ _________________________________________________________ --&gt;
117 117 'category' => $model->lang->alias->value,
118 118 ],
119 119 [
120   - 'class' => 'btn btn-xs btn-danger',
  120 + 'class' => 'btn btn-xs btn-danger reset-filters',
121 121 ]
122 122 );
123 123 }
... ... @@ -127,10 +127,6 @@ _________________________________________________________ --&gt;
127 127 $brands = $filterHelper->getBrands($model);
128 128 if (!empty($brands)) {
129 129 ?>
130   - <a class="btn btn-xs btn-danger reset-filters" href="#">
131   - <i class="fa fa-times-circle"></i>
132   - <span class="hidden-sm">Сбросить все фильтры</span>
133   - </a>
134 130 <div class="panel-heading">
135 131 <h3 class="panel-title"><?php echo \Yii::t('app', 'Бренды'); ?></h3>
136 132 </div>
... ...
frontend/views/layouts/main.php
... ... @@ -392,7 +392,7 @@ _________________________________________________________ --&gt;
392 392 ->checkbox();
393 393 ?>
394 394 <div class="text-center">
395   - <?
  395 + <?php
396 396 echo Html::submitButton(
397 397 \Yii::t('app', 'Login'),
398 398 [
... ...
frontend/views/product/view.php
... ... @@ -98,11 +98,11 @@
98 98 }
99 99 if ($model->is('top')) {
100 100 ?>
101   - <div class="ribbon top">
102   - <div class="theribbon">TOP</div>
103   - <div class="ribbon-background"></div>
104   - </div>
105   - <!-- /.ribbon -->
  101 + <div class="ribbon top">
  102 + <div class="theribbon">TOP</div>
  103 + <div class="ribbon-background"></div>
  104 + </div>
  105 + <!-- /.ribbon -->
106 106 <?php
107 107 }
108 108 ?>
... ... @@ -392,6 +392,7 @@
392 392 [
393 393 'scenario' => Order::SCENARIO_FAST,
394 394 'variantId' => $variant->id,
  395 + 'returnUrl' => \Yii::$app->request->absoluteUrl,
395 396 ]
396 397 );
397 398 $form = ActiveForm::begin(
... ... @@ -403,6 +404,9 @@
403 404 echo $form->field($order, 'variantId')
404 405 ->label(false)
405 406 ->hiddenInput();
  407 + echo $form->field($order, 'returnUrl')
  408 + ->label(false)
  409 + ->hiddenInput();
406 410 echo $form->field($order, 'name')
407 411 ->label(false)
408 412 ->textInput(
... ...