fix mapping product sold

This commit is contained in:
Kayn Ty 2018-04-17 13:53:29 +02:00
parent 8e4f494035
commit 155728eb78
15 changed files with 553 additions and 546 deletions

308
composer.lock generated
View File

@ -60,16 +60,16 @@
},
{
"name": "composer/ca-bundle",
"version": "1.1.0",
"version": "1.1.1",
"source": {
"type": "git",
"url": "https://github.com/composer/ca-bundle.git",
"reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288"
"reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/943b2c4fcad1ef178d16a713c2468bf7e579c288",
"reference": "943b2c4fcad1ef178d16a713c2468bf7e579c288",
"url": "https://api.github.com/repos/composer/ca-bundle/zipball/d2c0a83b7533d6912e8d516756ebd34f893e9169",
"reference": "d2c0a83b7533d6912e8d516756ebd34f893e9169",
"shasum": ""
},
"require": {
@ -78,7 +78,7 @@
"php": "^5.3.2 || ^7.0"
},
"require-dev": {
"phpunit/phpunit": "^4.8.35",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.5",
"psr/log": "^1.0",
"symfony/process": "^2.5 || ^3.0 || ^4.0"
},
@ -112,39 +112,39 @@
"ssl",
"tls"
],
"time": "2017-11-29T09:37:33+00:00"
"time": "2018-03-29T19:57:20+00:00"
},
{
"name": "doctrine/annotations",
"version": "v1.2.7",
"version": "v1.6.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/annotations.git",
"reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535"
"reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
"reference": "f25c8aab83e0c3e976fd7d19875f198ccf2f7535",
"url": "https://api.github.com/repos/doctrine/annotations/zipball/c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
"reference": "c7f2050c68a9ab0bdb0f98567ec08d80ea7d24d5",
"shasum": ""
},
"require": {
"doctrine/lexer": "1.*",
"php": ">=5.3.2"
"php": "^7.1"
},
"require-dev": {
"doctrine/cache": "1.*",
"phpunit/phpunit": "4.*"
"phpunit/phpunit": "^6.4"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.3.x-dev"
"dev-master": "1.6.x-dev"
}
},
"autoload": {
"psr-0": {
"Doctrine\\Common\\Annotations\\": "lib/"
"psr-4": {
"Doctrine\\Common\\Annotations\\": "lib/Doctrine/Common/Annotations"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -180,37 +180,41 @@
"docblock",
"parser"
],
"time": "2015-08-31T12:32:49+00:00"
"time": "2017-12-06T07:11:42+00:00"
},
{
"name": "doctrine/cache",
"version": "v1.6.2",
"version": "v1.7.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/cache.git",
"reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b"
"reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/cache/zipball/eb152c5100571c7a45470ff2a35095ab3f3b900b",
"reference": "eb152c5100571c7a45470ff2a35095ab3f3b900b",
"url": "https://api.github.com/repos/doctrine/cache/zipball/b3217d58609e9c8e661cd41357a54d926c4a2a1a",
"reference": "b3217d58609e9c8e661cd41357a54d926c4a2a1a",
"shasum": ""
},
"require": {
"php": "~5.5|~7.0"
"php": "~7.1"
},
"conflict": {
"doctrine/common": ">2.2,<2.4"
},
"require-dev": {
"phpunit/phpunit": "~4.8|~5.0",
"predis/predis": "~1.0",
"satooshi/php-coveralls": "~0.6"
"alcaeus/mongo-php-adapter": "^1.1",
"mongodb/mongodb": "^1.1",
"phpunit/phpunit": "^5.7",
"predis/predis": "~1.0"
},
"suggest": {
"alcaeus/mongo-php-adapter": "Required to use legacy MongoDB driver"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.6.x-dev"
"dev-master": "1.7.x-dev"
}
},
"autoload": {
@ -250,32 +254,33 @@
"cache",
"caching"
],
"time": "2017-07-22T12:49:21+00:00"
"time": "2017-08-25T07:02:50+00:00"
},
{
"name": "doctrine/collections",
"version": "v1.3.0",
"version": "v1.5.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/collections.git",
"reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a"
"reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/collections/zipball/6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
"reference": "6c1e4eef75f310ea1b3e30945e9f06e652128b8a",
"url": "https://api.github.com/repos/doctrine/collections/zipball/a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
"reference": "a01ee38fcd999f34d9bfbcee59dbda5105449cbf",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
"php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "~4.0"
"doctrine/coding-standard": "~0.1@dev",
"phpunit/phpunit": "^5.7"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.2.x-dev"
"dev-master": "1.3.x-dev"
}
},
"autoload": {
@ -316,20 +321,20 @@
"collections",
"iterator"
],
"time": "2015-04-14T22:21:58+00:00"
"time": "2017-07-22T10:37:32+00:00"
},
{
"name": "doctrine/common",
"version": "v2.6.2",
"version": "v2.8.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/common.git",
"reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3"
"reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/common/zipball/7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
"reference": "7bce00698899aa2c06fe7365c76e4d78ddb15fa3",
"url": "https://api.github.com/repos/doctrine/common/zipball/f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
"reference": "f68c297ce6455e8fd794aa8ffaf9fa458f6ade66",
"shasum": ""
},
"require": {
@ -338,15 +343,15 @@
"doctrine/collections": "1.*",
"doctrine/inflector": "1.*",
"doctrine/lexer": "1.*",
"php": "~5.5|~7.0"
"php": "~7.1"
},
"require-dev": {
"phpunit/phpunit": "~4.8|~5.0"
"phpunit/phpunit": "^5.7"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.7.x-dev"
"dev-master": "2.8.x-dev"
}
},
"autoload": {
@ -389,29 +394,33 @@
"persistence",
"spl"
],
"time": "2016-11-30T16:50:46+00:00"
"time": "2017-08-31T08:43:38+00:00"
},
{
"name": "doctrine/dbal",
"version": "v2.5.13",
"version": "v2.7.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/dbal.git",
"reference": "729340d8d1eec8f01bff708e12e449a3415af873"
"reference": "11037b4352c008373561dc6fc836834eed80c3b5"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/729340d8d1eec8f01bff708e12e449a3415af873",
"reference": "729340d8d1eec8f01bff708e12e449a3415af873",
"url": "https://api.github.com/repos/doctrine/dbal/zipball/11037b4352c008373561dc6fc836834eed80c3b5",
"reference": "11037b4352c008373561dc6fc836834eed80c3b5",
"shasum": ""
},
"require": {
"doctrine/common": ">=2.4,<2.8-dev",
"php": ">=5.3.2"
"doctrine/common": "^2.7.1",
"ext-pdo": "*",
"php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "4.*",
"symfony/console": "2.*||^3.0"
"doctrine/coding-standard": "^4.0",
"phpunit/phpunit": "^7.0",
"phpunit/phpunit-mock-objects": "!=3.2.4,!=3.2.5",
"symfony/console": "^2.0.5||^3.0",
"symfony/phpunit-bridge": "^3.4.5|^4.0.5"
},
"suggest": {
"symfony/console": "For helpful console commands such as SQL execution and import of files."
@ -422,7 +431,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "2.5.x-dev"
"dev-master": "2.7.x-dev"
}
},
"autoload": {
@ -460,7 +469,7 @@
"persistence",
"queryobject"
],
"time": "2017-07-22T20:44:48+00:00"
"time": "2018-04-07T18:44:18+00:00"
},
{
"name": "doctrine/doctrine-bundle",
@ -549,39 +558,39 @@
},
{
"name": "doctrine/doctrine-cache-bundle",
"version": "1.3.2",
"version": "1.3.3",
"source": {
"type": "git",
"url": "https://github.com/doctrine/DoctrineCacheBundle.git",
"reference": "9baecbd6bfdd1123b0cf8c1b88fee0170a84ddd1"
"reference": "4c8e363f96427924e7e519c5b5119b4f54512697"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/9baecbd6bfdd1123b0cf8c1b88fee0170a84ddd1",
"reference": "9baecbd6bfdd1123b0cf8c1b88fee0170a84ddd1",
"url": "https://api.github.com/repos/doctrine/DoctrineCacheBundle/zipball/4c8e363f96427924e7e519c5b5119b4f54512697",
"reference": "4c8e363f96427924e7e519c5b5119b4f54512697",
"shasum": ""
},
"require": {
"doctrine/cache": "^1.4.2",
"doctrine/inflector": "~1.0",
"php": ">=5.3.2",
"symfony/doctrine-bridge": "~2.2|~3.0|~4.0"
"symfony/doctrine-bridge": "~2.7|~3.3|~4.0"
},
"require-dev": {
"instaclick/coding-standard": "~1.1",
"instaclick/object-calisthenics-sniffs": "dev-master",
"instaclick/symfony2-coding-standard": "dev-remaster",
"phpunit/phpunit": "~4",
"phpunit/phpunit": "~4|~5",
"predis/predis": "~0.8",
"satooshi/php-coveralls": "^1.0",
"squizlabs/php_codesniffer": "~1.5",
"symfony/console": "~2.2|~3.0|~4.0",
"symfony/finder": "~2.2|~3.0|~4.0",
"symfony/framework-bundle": "~2.2|~3.0|~4.0",
"symfony/phpunit-bridge": "~2.7|~3.0|~4.0",
"symfony/security-acl": "~2.3|~3.0",
"symfony/validator": "~2.2|~3.0|~4.0",
"symfony/yaml": "~2.2|~3.0|~4.0"
"symfony/console": "~2.7|~3.3|~4.0",
"symfony/finder": "~2.7|~3.3|~4.0",
"symfony/framework-bundle": "~2.7|~3.3|~4.0",
"symfony/phpunit-bridge": "~2.7|~3.3|~4.0",
"symfony/security-acl": "~2.7|~3.3",
"symfony/validator": "~2.7|~3.3|~4.0",
"symfony/yaml": "~2.7|~3.3|~4.0"
},
"suggest": {
"symfony/security-acl": "For using this bundle to cache ACLs"
@ -633,37 +642,37 @@
"cache",
"caching"
],
"time": "2017-10-12T17:23:29+00:00"
"time": "2018-03-27T09:22:12+00:00"
},
{
"name": "doctrine/inflector",
"version": "v1.1.0",
"version": "v1.3.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/inflector.git",
"reference": "90b2128806bfde671b6952ab8bea493942c1fdae"
"reference": "5527a48b7313d15261292c149e55e26eae771b0a"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/90b2128806bfde671b6952ab8bea493942c1fdae",
"reference": "90b2128806bfde671b6952ab8bea493942c1fdae",
"url": "https://api.github.com/repos/doctrine/inflector/zipball/5527a48b7313d15261292c149e55e26eae771b0a",
"reference": "5527a48b7313d15261292c149e55e26eae771b0a",
"shasum": ""
},
"require": {
"php": ">=5.3.2"
"php": "^7.1"
},
"require-dev": {
"phpunit/phpunit": "4.*"
"phpunit/phpunit": "^6.2"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.1.x-dev"
"dev-master": "1.3.x-dev"
}
},
"autoload": {
"psr-0": {
"Doctrine\\Common\\Inflector\\": "lib/"
"psr-4": {
"Doctrine\\Common\\Inflector\\": "lib/Doctrine/Common/Inflector"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -700,36 +709,36 @@
"singularize",
"string"
],
"time": "2015-11-06T14:35:42+00:00"
"time": "2018-01-09T20:05:19+00:00"
},
{
"name": "doctrine/instantiator",
"version": "1.0.5",
"version": "1.1.0",
"source": {
"type": "git",
"url": "https://github.com/doctrine/instantiator.git",
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d"
"reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/8e884e78f9f0eb1329e445619e04456e64d8051d",
"reference": "8e884e78f9f0eb1329e445619e04456e64d8051d",
"url": "https://api.github.com/repos/doctrine/instantiator/zipball/185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
"reference": "185b8868aa9bf7159f5f953ed5afb2d7fcdc3bda",
"shasum": ""
},
"require": {
"php": ">=5.3,<8.0-DEV"
"php": "^7.1"
},
"require-dev": {
"athletic/athletic": "~0.1.8",
"ext-pdo": "*",
"ext-phar": "*",
"phpunit/phpunit": "~4.0",
"squizlabs/php_codesniffer": "~2.0"
"phpunit/phpunit": "^6.2.3",
"squizlabs/php_codesniffer": "^3.0.2"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.0.x-dev"
"dev-master": "1.2.x-dev"
}
},
"autoload": {
@ -754,7 +763,7 @@
"constructor",
"instantiate"
],
"time": "2015-06-14T21:17:01+00:00"
"time": "2017-07-22T11:58:36+00:00"
},
{
"name": "doctrine/lexer",
@ -812,38 +821,40 @@
},
{
"name": "doctrine/orm",
"version": "v2.5.14",
"version": "v2.6.1",
"source": {
"type": "git",
"url": "https://github.com/doctrine/doctrine2.git",
"reference": "810a7baf81462a5ddf10e8baa8cb94b6eec02754"
"reference": "87ee409783a4a322b5597ebaae558661404055a7"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/810a7baf81462a5ddf10e8baa8cb94b6eec02754",
"reference": "810a7baf81462a5ddf10e8baa8cb94b6eec02754",
"url": "https://api.github.com/repos/doctrine/doctrine2/zipball/87ee409783a4a322b5597ebaae558661404055a7",
"reference": "87ee409783a4a322b5597ebaae558661404055a7",
"shasum": ""
},
"require": {
"doctrine/cache": "~1.4",
"doctrine/collections": "~1.2",
"doctrine/common": ">=2.5-dev,<2.9-dev",
"doctrine/dbal": ">=2.5-dev,<2.7-dev",
"doctrine/instantiator": "^1.0.1",
"doctrine/annotations": "~1.5",
"doctrine/cache": "~1.6",
"doctrine/collections": "^1.4",
"doctrine/common": "^2.7.1",
"doctrine/dbal": "^2.6",
"doctrine/instantiator": "~1.1",
"ext-pdo": "*",
"php": ">=5.4",
"symfony/console": "~2.5|~3.0|~4.0"
"php": "^7.1",
"symfony/console": "~3.0|~4.0"
},
"require-dev": {
"phpunit/phpunit": "~4.0",
"symfony/yaml": "~2.3|~3.0|~4.0"
"doctrine/coding-standard": "^1.0",
"phpunit/phpunit": "^6.5",
"squizlabs/php_codesniffer": "^3.2",
"symfony/yaml": "~3.4|~4.0"
},
"suggest": {
"symfony/yaml": "If you want to use YAML Metadata Mapping Driver"
},
"bin": [
"bin/doctrine",
"bin/doctrine.php"
"bin/doctrine"
],
"type": "library",
"extra": {
@ -852,8 +863,8 @@
}
},
"autoload": {
"psr-0": {
"Doctrine\\ORM\\": "lib/"
"psr-4": {
"Doctrine\\ORM\\": "lib/Doctrine/ORM"
}
},
"notification-url": "https://packagist.org/downloads/",
@ -876,6 +887,10 @@
{
"name": "Jonathan Wage",
"email": "jonwage@gmail.com"
},
{
"name": "Marco Pivetta",
"email": "ocramius@gmail.com"
}
],
"description": "Object-Relational-Mapper for PHP",
@ -884,7 +899,7 @@
"database",
"orm"
],
"time": "2017-12-17T02:57:51+00:00"
"time": "2018-02-27T07:30:56+00:00"
},
{
"name": "fig/link-util",
@ -1018,16 +1033,16 @@
},
{
"name": "guzzlehttp/guzzle",
"version": "6.3.0",
"version": "6.3.2",
"source": {
"type": "git",
"url": "https://github.com/guzzle/guzzle.git",
"reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699"
"reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/f4db5a78a5ea468d4831de7f0bf9d9415e348699",
"reference": "f4db5a78a5ea468d4831de7f0bf9d9415e348699",
"url": "https://api.github.com/repos/guzzle/guzzle/zipball/68d0ea14d5a3f42a20e87632a5f84931e2709c90",
"reference": "68d0ea14d5a3f42a20e87632a5f84931e2709c90",
"shasum": ""
},
"require": {
@ -1037,7 +1052,7 @@
},
"require-dev": {
"ext-curl": "*",
"phpunit/phpunit": "^4.0 || ^5.0",
"phpunit/phpunit": "^4.8.35 || ^5.7 || ^6.4",
"psr/log": "^1.0"
},
"suggest": {
@ -1046,7 +1061,7 @@
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "6.2-dev"
"dev-master": "6.3-dev"
}
},
"autoload": {
@ -1079,7 +1094,7 @@
"rest",
"web service"
],
"time": "2017-06-22T18:50:49+00:00"
"time": "2018-03-26T16:33:04+00:00"
},
{
"name": "guzzlehttp/promises",
@ -1199,16 +1214,16 @@
},
{
"name": "hwi/oauth-bundle",
"version": "0.6.1",
"version": "0.6.2",
"source": {
"type": "git",
"url": "https://github.com/hwi/HWIOAuthBundle.git",
"reference": "e9e1c4d08d32e31aed53341d27d950be7bb2ac66"
"reference": "d94181ac3d90509a557e3ea2bf6a85fcc8cd67b6"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/e9e1c4d08d32e31aed53341d27d950be7bb2ac66",
"reference": "e9e1c4d08d32e31aed53341d27d950be7bb2ac66",
"url": "https://api.github.com/repos/hwi/HWIOAuthBundle/zipball/d94181ac3d90509a557e3ea2bf6a85fcc8cd67b6",
"reference": "d94181ac3d90509a557e3ea2bf6a85fcc8cd67b6",
"shasum": ""
},
"require": {
@ -1353,7 +1368,7 @@
"yandex",
"youtube"
],
"time": "2018-01-23T14:29:00+00:00"
"time": "2018-03-28T16:21:10+00:00"
},
{
"name": "incenteev/composer-parameter-handler",
@ -1536,16 +1551,16 @@
},
{
"name": "paragonie/random_compat",
"version": "v2.0.11",
"version": "v2.0.12",
"source": {
"type": "git",
"url": "https://github.com/paragonie/random_compat.git",
"reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8"
"reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/5da4d3c796c275c55f057af5a643ae297d96b4d8",
"reference": "5da4d3c796c275c55f057af5a643ae297d96b4d8",
"url": "https://api.github.com/repos/paragonie/random_compat/zipball/258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
"reference": "258c89a6b97de7dfaf5b8c7607d0478e236b04fb",
"shasum": ""
},
"require": {
@ -1580,7 +1595,7 @@
"pseudorandom",
"random"
],
"time": "2017-09-27T21:40:39+00:00"
"time": "2018-04-04T21:24:14+00:00"
},
{
"name": "php-http/cache-plugin",
@ -1879,16 +1894,16 @@
},
{
"name": "php-http/httplug-bundle",
"version": "1.9.0",
"version": "1.10.0",
"source": {
"type": "git",
"url": "https://github.com/php-http/HttplugBundle.git",
"reference": "75c85e19e50b320d81d6e1ef6af53927934fa99f"
"reference": "c91eef51db2c2b778946c1dd931e9aa87ac6b1e4"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/php-http/HttplugBundle/zipball/75c85e19e50b320d81d6e1ef6af53927934fa99f",
"reference": "75c85e19e50b320d81d6e1ef6af53927934fa99f",
"url": "https://api.github.com/repos/php-http/HttplugBundle/zipball/c91eef51db2c2b778946c1dd931e9aa87ac6b1e4",
"reference": "c91eef51db2c2b778946c1dd931e9aa87ac6b1e4",
"shasum": ""
},
"require": {
@ -1941,7 +1956,7 @@
"type": "symfony-bundle",
"extra": {
"branch-alias": {
"dev-master": "1.9-dev"
"dev-master": "1.10-dev"
}
},
"autoload": {
@ -1975,7 +1990,7 @@
"message",
"php-http"
],
"time": "2018-03-06T08:57:33+00:00"
"time": "2018-03-27T07:08:16+00:00"
},
{
"name": "php-http/logger-plugin",
@ -3230,16 +3245,16 @@
},
{
"name": "symfony/symfony",
"version": "v3.4.6",
"version": "v3.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/symfony.git",
"reference": "874d4d659774d7bab90538072c83ed532dd17dc5"
"reference": "5304a36c5efbb01af7efe2bb5b1953dbaeebc293"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/symfony/zipball/874d4d659774d7bab90538072c83ed532dd17dc5",
"reference": "874d4d659774d7bab90538072c83ed532dd17dc5",
"url": "https://api.github.com/repos/symfony/symfony/zipball/5304a36c5efbb01af7efe2bb5b1953dbaeebc293",
"reference": "5304a36c5efbb01af7efe2bb5b1953dbaeebc293",
"shasum": ""
},
"require": {
@ -3380,11 +3395,11 @@
"keywords": [
"framework"
],
"time": "2018-03-05T20:02:01+00:00"
"time": "2018-04-06T15:20:04+00:00"
},
{
"name": "symfony/templating",
"version": "v4.0.6",
"version": "v4.0.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/templating.git",
@ -3439,30 +3454,31 @@
},
{
"name": "twig/twig",
"version": "v1.35.2",
"version": "v2.4.8",
"source": {
"type": "git",
"url": "https://github.com/twigphp/Twig.git",
"reference": "9c24f2cd39dc1906b76879e099970b7e53724601"
"reference": "7b604c89da162034bdf4bb66310f358d313dd16d"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/9c24f2cd39dc1906b76879e099970b7e53724601",
"reference": "9c24f2cd39dc1906b76879e099970b7e53724601",
"url": "https://api.github.com/repos/twigphp/Twig/zipball/7b604c89da162034bdf4bb66310f358d313dd16d",
"reference": "7b604c89da162034bdf4bb66310f358d313dd16d",
"shasum": ""
},
"require": {
"php": ">=5.3.3"
"php": "^7.0",
"symfony/polyfill-mbstring": "~1.0"
},
"require-dev": {
"psr/container": "^1.0",
"symfony/debug": "~2.7",
"symfony/phpunit-bridge": "~3.3@dev"
"symfony/debug": "^2.7",
"symfony/phpunit-bridge": "^3.3"
},
"type": "library",
"extra": {
"branch-alias": {
"dev-master": "1.35-dev"
"dev-master": "2.4-dev"
}
},
"autoload": {
@ -3500,7 +3516,7 @@
"keywords": [
"templating"
],
"time": "2018-03-03T16:21:29+00:00"
"time": "2018-04-02T09:24:19+00:00"
}
],
"packages-dev": [
@ -3560,16 +3576,16 @@
},
{
"name": "symfony/phpunit-bridge",
"version": "v3.4.6",
"version": "v3.4.8",
"source": {
"type": "git",
"url": "https://github.com/symfony/phpunit-bridge.git",
"reference": "32b06d2b0babf3216e55acfce42249321a304f03"
"reference": "48c669ec1a2b0425d4a82c7ad4bce2f5b947b95e"
},
"dist": {
"type": "zip",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/32b06d2b0babf3216e55acfce42249321a304f03",
"reference": "32b06d2b0babf3216e55acfce42249321a304f03",
"url": "https://api.github.com/repos/symfony/phpunit-bridge/zipball/48c669ec1a2b0425d4a82c7ad4bce2f5b947b95e",
"reference": "48c669ec1a2b0425d4a82c7ad4bce2f5b947b95e",
"shasum": ""
},
"require": {
@ -3622,7 +3638,7 @@
],
"description": "Symfony PHPUnit Bridge",
"homepage": "https://symfony.com",
"time": "2018-02-14T23:24:28+00:00"
"time": "2018-04-04T15:02:59+00:00"
}
],
"aliases": [],

View File

@ -11,6 +11,6 @@
"angular": "1.5",
"bootstrap": "^4.0.0",
"font-awesome": "^4.7.0",
"jquery": "1.19"
"jquery": "1.12.2"
}
}

View File

@ -120,7 +120,26 @@ class DefaultController extends Controller {
* @return JsonResponse
*/
public function addSellingAction( Request $request ) {
$json = json_decode( $request->getContent(), true );
// $mockJson = "{
// 'paidByClient': 20,
// 'sellingComment': 'sellingComment',
// 'activeSelling': [
// {
// 'id': 1,
// 'name': 'aaaaaa',
// 'category': 1,
// 'price': 1
// }
// ],
// 'activeFestival': {
// 'name': 'le festival',
// 'dateCreation': '2018-04-17T10:32:00.910Z',
// 'commentaire': 'le com de festival'
// }
//}";
$json = json_decode( $request->getContent(), true );
// $json = json_decode( $mockJson, true );
$currentUser = $this->getUser();
$m = $this->getDoctrine()->getManager();
$newSellRecord = new SellRecord();
@ -139,27 +158,27 @@ class DefaultController extends Controller {
$sumAmount = 0;
foreach ( $json[ 'activeSelling' ] as $record ) {
var_dump( $record[ 'category' ] );
var_dump( $categoriesByID[ $record[ 'category' ] ]->getName() );
$productModel = $productsModelsByID[ $record[ 'id' ] ];
$newProductSold = new ProductSold();
// $newProductSold->setCategory( $productModel->getCategory() );
// $newProductSold->setCategory( 1 );
$newProductSold->setName( $record[ 'name' ] );
$newProductSold->setImage( "image mock" );
$newProductSold->setUser( $currentUser );
$newProductSold->setPrice( $record[ 'price' ] );
$sumAmount += $record[ 'price' ];
// $newProductSold->setProduct( $productsModelsByID[ $record[ 'id' ] ] );
$newProductSold->setUser( $currentUser->getId() );
$newProductSold->setComment( "default comment" );
$newProductSold->setProduct( $productModel );
$newProductSold->setSellRecords( $newSellRecord );
// link selling record with user, festival
// $currentUser->addProductsSold( $newProductSold );
$currentUser->addProductsSold( $newProductSold );
// persist all
$m->persist( $newProductSold );
$sumAmount += $record[ 'price' ];
}
// $newSellRecord->setPaidByClient( 0 );
$newSellRecord->setAmount( $sumAmount );
$newSellRecord->setDate( new \DateTime() );
$newSellRecord->setPaidByClient( $json[ 'paidByClient' ] );
// $newSellRecord->setUser( $currentUser );
$newSellRecord->setComment( $json[ 'sellingComment' ] );
$currentUser->addSellRecords( $newSellRecord );
@ -171,7 +190,7 @@ class DefaultController extends Controller {
// fetch back history of selling
$sellingRepo = $m->getRepository( 'AppBundle:SellRecord' );
$lastSellings = $sellingRepo->find( [], [ 'id' => 'desc' ], 0, 3 );
$lastSellings = $sellingRepo->findBy( [], [ 'id' => 'desc' ], 0, 3 );
// return var_dump( $request->getContent() );
return new JsonResponse( [

0
src/AppBundle/Entity/Festival.php Executable file → Normal file
View File

4
src/AppBundle/Entity/Product.php Executable file → Normal file
View File

@ -11,9 +11,9 @@ use Doctrine\ORM\Mapping as ORM;
*/
class Product {
/**
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;

View File

@ -11,9 +11,9 @@ use Doctrine\ORM\Mapping as ORM;
*/
class Product {
/**
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;

0
src/AppBundle/Entity/ProductCategory.php Executable file → Normal file
View File

174
src/AppBundle/Entity/ProductSold.php Executable file → Normal file
View File

@ -2,19 +2,35 @@
namespace AppBundle\Entity;
use AppBundle\Traits\Commentable;
use AppBundle\Traits\Sellable;
use Doctrine\ORM\Mapping as ORM;
/**
* @ORM\Entity(repositoryClass="AppBundle\Repository\ProductRepository")
*/
class ProductSold extends Product {
class ProductSold {
/**
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
* @ORM\Column(type="string", length=100)
*/
private $name;
/**
* @ORM\Column(type="string", length=256)
*/
private $image;
/**
* @ORM\ManyToOne(targetEntity="AppBundle\Entity\User", inversedBy="productsSold")
*/
private $user;
/**
* the stack of products for one client at one time
@ -22,106 +38,132 @@ class ProductSold extends Product {
*/
public $sellRecords;
/**
* person who recorded the sell
* @ORM\ManyToOne(targetEntity="AppBundle\Entity\User", inversedBy="productsSold")
*/
private $user;
/**
* references the product from whom this line is inspired
* @ORM\ManyToOne(targetEntity="AppBundle\Entity\Product", inversedBy="productsSold")
*/
private $product;
/**
* @ORM\ManyToOne(targetEntity="ProductCategory", inversedBy="products")
*/
private $category;
use Sellable;
use Commentable;
/**
* @return mixed
*/
public function getId() {
return $this->id;
}
/**
* @param mixed $id
*/
public function setId( $id ) {
$this->id = $id;
}
/**
* @return mixed
*/
public function getUser() {
return $this->user;
}
/**
* @param mixed $user
*/
public function setUser( $user ) {
$this->user = $user;
}
/**
* @return mixed
*/
public function getCategory() {
return $this->category;
}
/**
* @param mixed $category
*/
public function setCategory( ProductCategory $category ) {
$this->category = $category;
}
/**
* Set sellRecords
* Set sellRecords.
*
* @param \AppBundle\Entity\SellRecord $sellRecords
* @param \AppBundle\Entity\SellRecord|null $sellRecords
*
* @return ProductSold
*/
public function setSellRecords( SellRecord $sellRecords = null ) {
public function setSellRecords( \AppBundle\Entity\SellRecord $sellRecords = null ) {
$this->sellRecords = $sellRecords;
return $this;
}
/**
* Get sellRecords
* Get sellRecords.
*
* @return \AppBundle\Entity\SellRecord
* @return \AppBundle\Entity\SellRecord|null
*/
public function getSellRecords() {
return $this->sellRecords;
}
/**
* Set product
* Set product.
*
* @param \AppBundle\Entity\Product $product
* @param \AppBundle\Entity\Product|null $product
*
* @return ProductSold
*/
public function setProduct( Product $product = null ) {
public function setProduct( \AppBundle\Entity\Product $product = null ) {
$this->product = $product;
return $this;
}
/**
* Get product
* Get product.
*
* @return \AppBundle\Entity\Product
* @return \AppBundle\Entity\Product|null
*/
public function getProduct() {
return $this->product;
}
/**
* Get id.
*
* @return int
*/
public function getId() {
return $this->id;
}
/**
* Set name.
*
* @param string $name
*
* @return ProductSold
*/
public function setName( $name ) {
$this->name = $name;
return $this;
}
/**
* Get name.
*
* @return string
*/
public function getName() {
return $this->name;
}
/**
* Set image.
*
* @param string $image
*
* @return ProductSold
*/
public function setImage( $image ) {
$this->image = $image;
return $this;
}
/**
* Get image.
*
* @return string
*/
public function getImage() {
return $this->image;
}
/**
* Set user.
*
* @param \AppBundle\Entity\User|null $user
*
* @return ProductSold
*/
public function setUser( \AppBundle\Entity\User $user = null ) {
$this->user = $user;
return $this;
}
/**
* Get user.
*
* @return \AppBundle\Entity\User|null
*/
public function getUser() {
return $this->user;
}
}

View File

@ -2,74 +2,57 @@
namespace AppBundle\Entity;
use AppBundle\Traits\Commentable;
use AppBundle\Traits\Sellable;
use Doctrine\ORM\Mapping as ORM;
/**
* @ORM\Entity(repositoryClass="AppBundle\Repository\ProductRepository")
*/
class ProductSold extends Product {
class ProductSold {
/**
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
* @ORM\Column(type="string", length=100)
*/
private $name;
/**
* @ORM\Column(type="string", length=256)
*/
private $image;
/**
* @ORM\ManyToOne(targetEntity="AppBundle\Entity\User", inversedBy="products")
*/
private $user;
/**
* the stack of products for one client at one time
* @ORM\ManyToOne(targetEntity="SellRecord", inversedBy="productsSold")
*/
public $sellRecords;
/**
* person who recorded the sell
* @ORM\ManyToOne(targetEntity="AppBundle\Entity\User", inversedBy="productsSold")
*/
private $user;
/**
* references the product from whom this line is inspired
* @ORM\ManyToOne(targetEntity="AppBundle\Entity\Product", inversedBy="productsSold")
*/
private $product;
/**
* @ORM\ManyToOne(targetEntity="ProductCategory", inversedBy="products")
*/
private $category;
use Sellable;
use Commentable;
/**
* @return mixed
*/
public function getUser() {
return $this->user;
}
/**
* @param mixed $user
*/
public function setUser( $user ) {
$this->user = $user;
}
/**
* @return mixed
*/
public function getCategory() {
return $this->category;
}
/**
* @param mixed $category
*/
public function setCategory( $category ) {
$this->category = $category;
}
/**
* Set sellRecords
* Set sellRecords.
*
* @param \AppBundle\Entity\SellRecord $sellRecords
* @param \AppBundle\Entity\SellRecord|null $sellRecords
*
* @return ProductSold
*/
@ -80,18 +63,18 @@ class ProductSold extends Product {
}
/**
* Get sellRecords
* Get sellRecords.
*
* @return \AppBundle\Entity\SellRecord
* @return \AppBundle\Entity\SellRecord|null
*/
public function getSellRecords() {
return $this->sellRecords;
}
/**
* Set product
* Set product.
*
* @param \AppBundle\Entity\Product $product
* @param \AppBundle\Entity\Product|null $product
*
* @return ProductSold
*/
@ -102,9 +85,9 @@ class ProductSold extends Product {
}
/**
* Get product
* Get product.
*
* @return \AppBundle\Entity\Product
* @return \AppBundle\Entity\Product|null
*/
public function getProduct() {
return $this->product;

206
src/AppBundle/Entity/SellRecord.php Executable file → Normal file
View File

@ -12,9 +12,9 @@ class SellRecord {
use Commentable;
/**
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
@ -55,88 +55,10 @@ class SellRecord {
/**
* @return mixed
* Constructor
*/
public function getPaidByClient() {
return $this->paidByClient;
}
/**
* @param mixed $paidByClient
*/
public function setPaidByClient( $paidByClient ) {
$this->paidByClient = $paidByClient;
}
/**
* @return mixed
*/
public function getComment() {
return $this->comment;
}
/**
* @param mixed $comment
*/
public function setComment( $comment ) {
$this->comment = $comment;
}
/**
* @return mixed
*/
public function getProductsSold() {
return $this->productsSold;
}
/**
* @param mixed $productsSold
*/
public function setProductsSold( $productsSold ) {
$this->productsSold = $productsSold;
}
/**
* @return mixed
*/
public function getFestival() {
return $this->festival;
}
/**
* @param mixed $festival
*/
public function setFestival( $festival ) {
$this->festival = $festival;
}
/**
* @return mixed
*/
public function getUser() {
return $this->user;
}
/**
* @param mixed $user
*/
public function setUser( $user ) {
$this->user = $user;
}
/**
* @return mixed
*/
public function getAmount() {
return $this->amount;
}
/**
* @param mixed $amount
*/
public function setAmount( $amount ) {
$this->amount = $amount;
public function __construct() {
$this->productsSold = new \Doctrine\Common\Collections\ArrayCollection();
}
/**
@ -154,38 +76,69 @@ class SellRecord {
}
/**
* @return mixed
* Set date
*
* @param \DateTime $date
*
* @return SellRecord
*/
public function getProducts() {
return $this->products;
public function setDate( $date ) {
$this->date = $date;
return $this;
}
/**
* @param mixed $products
*/
public function setProducts( $products ) {
$this->products = $products;
}
/**
* @return mixed
* Get date
*
* @return \DateTime
*/
public function getDate() {
return $this->date;
}
/**
* @param \DateTime $date
* Set amount
*
* @param string $amount
*
* @return SellRecord
*/
public function setDate( \DateTime $date ) {
$this->date = $date;
public function setAmount( $amount ) {
$this->amount = $amount;
return $this;
}
/**
* Constructor
* Get amount
*
* @return string
*/
public function __construct() {
$this->productsSold = new \Doctrine\Common\Collections\ArrayCollection();
public function getAmount() {
return $this->amount;
}
/**
* Set paidByClient
*
* @param string $paidByClient
*
* @return SellRecord
*/
public function setPaidByClient( $paidByClient ) {
$this->paidByClient = $paidByClient;
return $this;
}
/**
* Get paidByClient
*
* @return string
*/
public function getPaidByClient() {
return $this->paidByClient;
}
/**
@ -209,4 +162,57 @@ class SellRecord {
public function removeProductsSold( \AppBundle\Entity\ProductSold $productsSold ) {
$this->productsSold->removeElement( $productsSold );
}
/**
* Get productsSold
*
* @return \Doctrine\Common\Collections\Collection
*/
public function getProductsSold() {
return $this->productsSold;
}
/**
* Set festival
*
* @param \AppBundle\Entity\Festival $festival
*
* @return SellRecord
*/
public function setFestival( \AppBundle\Entity\Festival $festival = null ) {
$this->festival = $festival;
return $this;
}
/**
* Get festival
*
* @return \AppBundle\Entity\Festival
*/
public function getFestival() {
return $this->festival;
}
/**
* Set user
*
* @param \AppBundle\Entity\User $user
*
* @return SellRecord
*/
public function setUser( \AppBundle\Entity\User $user = null ) {
$this->user = $user;
return $this;
}
/**
* Get user
*
* @return \AppBundle\Entity\User
*/
public function getUser() {
return $this->user;
}
}

View File

@ -12,9 +12,9 @@ class SellRecord {
use Commentable;
/**
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue
* @ORM\Column(type="integer")
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
@ -55,88 +55,10 @@ class SellRecord {
/**
* @return mixed
* Constructor
*/
public function getPaidByClient() {
return $this->paidByClient;
}
/**
* @param mixed $paidByClient
*/
public function setPaidByClient( $paidByClient ) {
$this->paidByClient = $paidByClient;
}
/**
* @return mixed
*/
public function getComment() {
return $this->comment;
}
/**
* @param mixed $comment
*/
public function setComment( $comment ) {
$this->comment = $comment;
}
/**
* @return mixed
*/
public function getProductsSold() {
return $this->productsSold;
}
/**
* @param mixed $productsSold
*/
public function setProductsSold( $productsSold ) {
$this->productsSold = $productsSold;
}
/**
* @return mixed
*/
public function getFestival() {
return $this->festival;
}
/**
* @param mixed $festival
*/
public function setFestival( $festival ) {
$this->festival = $festival;
}
/**
* @return mixed
*/
public function getUser() {
return $this->user;
}
/**
* @param mixed $user
*/
public function setUser( $user ) {
$this->user = $user;
}
/**
* @return mixed
*/
public function getAmount() {
return $this->amount;
}
/**
* @param mixed $amount
*/
public function setAmount( $amount ) {
$this->amount = $amount;
public function __construct() {
$this->productsSold = new \Doctrine\Common\Collections\ArrayCollection();
}
/**
@ -154,38 +76,69 @@ class SellRecord {
}
/**
* @return mixed
* Set date
*
* @param \DateTime $date
*
* @return SellRecord
*/
public function getProducts() {
return $this->products;
public function setDate( $date ) {
$this->date = $date;
return $this;
}
/**
* @param mixed $products
*/
public function setProducts( $products ) {
$this->products = $products;
}
/**
* @return mixed
* Get date
*
* @return \DateTime
*/
public function getDate() {
return $this->date;
}
/**
* @param \DateTime $date
* Set amount
*
* @param string $amount
*
* @return SellRecord
*/
public function setDate( \DateTime $date ) {
$this->date = $date;
public function setAmount( $amount ) {
$this->amount = $amount;
return $this;
}
/**
* Constructor
* Get amount
*
* @return string
*/
public function __construct() {
$this->productsSold = new \Doctrine\Common\Collections\ArrayCollection();
public function getAmount() {
return $this->amount;
}
/**
* Set paidByClient
*
* @param string $paidByClient
*
* @return SellRecord
*/
public function setPaidByClient( $paidByClient ) {
$this->paidByClient = $paidByClient;
return $this;
}
/**
* Get paidByClient
*
* @return string
*/
public function getPaidByClient() {
return $this->paidByClient;
}
/**
@ -209,4 +162,57 @@ class SellRecord {
public function removeProductsSold( \AppBundle\Entity\ProductSold $productsSold ) {
$this->productsSold->removeElement( $productsSold );
}
/**
* Get productsSold
*
* @return \Doctrine\Common\Collections\Collection
*/
public function getProductsSold() {
return $this->productsSold;
}
/**
* Set festival
*
* @param \AppBundle\Entity\Festival $festival
*
* @return SellRecord
*/
public function setFestival( \AppBundle\Entity\Festival $festival = null ) {
$this->festival = $festival;
return $this;
}
/**
* Get festival
*
* @return \AppBundle\Entity\Festival
*/
public function getFestival() {
return $this->festival;
}
/**
* Set user
*
* @param \AppBundle\Entity\User $user
*
* @return SellRecord
*/
public function setUser( \AppBundle\Entity\User $user = null ) {
$this->user = $user;
return $this;
}
/**
* Get user
*
* @return \AppBundle\Entity\User
*/
public function getUser() {
return $this->user;
}
}

View File

@ -1,65 +0,0 @@
<?php
namespace AppBundle\Entity;
use Doctrine\ORM\Mapping as ORM;
/**
* Stuff
*
* @ORM\Table(name="stuff")
* @ORM\Entity(repositoryClass="AppBundle\Repository\StuffRepository")
*/
class Stuff
{
/**
* @var int
*
* @ORM\Column(name="id", type="integer")
* @ORM\Id
* @ORM\GeneratedValue(strategy="AUTO")
*/
private $id;
/**
* @var string
*
* @ORM\Column(name="truc", type="string", length=255)
*/
private $truc;
/**
* Get id
*
* @return int
*/
public function getId()
{
return $this->id;
}
/**
* Set truc
*
* @param string $truc
*
* @return Stuff
*/
public function setTruc($truc)
{
$this->truc = $truc;
return $this;
}
/**
* Get truc
*
* @return string
*/
public function getTruc()
{
return $this->truc;
}
}

0
src/AppBundle/Entity/User.php Executable file → Normal file
View File

0
web/config.php Executable file → Normal file
View File

View File

@ -2947,9 +2947,9 @@ isstream@~0.1.2:
version "0.1.2"
resolved "https://registry.yarnpkg.com/isstream/-/isstream-0.1.2.tgz#47e63f7af55afa6f92e1500e690eb8b8529c099a"
jquery@1.19:
version "3.3.1"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-3.3.1.tgz#958ce29e81c9790f31be7792df5d4d95fc57fbca"
jquery@1.12.2:
version "1.12.2"
resolved "https://registry.yarnpkg.com/jquery/-/jquery-1.12.2.tgz#b8a8b45937312a19eebbcf5a0589b0311c8220bb"
js-base64@^2.1.8, js-base64@^2.1.9:
version "2.4.3"