From 46c64d3a3c6786b7d464aea78454181a8962d3a3 Mon Sep 17 00:00:00 2001 From: Volodymyr Lunov Date: Fri, 9 Nov 2018 22:34:03 +0100 Subject: [PATCH 1/5] Fixed repository name. --- composer.json | 2 +- package.json | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index c1237f515f..86b673ce35 100644 --- a/composer.json +++ b/composer.json @@ -1,5 +1,5 @@ { - "name": "spryker-shop/suite-b2c-internal", + "name": "spryker-shop/b2c-demo-shop", "description": "Spryker B2C Demo Shop", "license": "proprietary", "require": { diff --git a/package.json b/package.json index 43d49ebea0..ccd0ace9c3 100644 --- a/package.json +++ b/package.json @@ -1,6 +1,6 @@ { "private": true, - "name": "spryker-suite-b2c-internal", + "name": "spryker-b2c-demo-shop", "description": "Spryker B2C Demo Shop project", "author": { "name": "Spryker Systems GmbH", From 7a13fdd7a257d7f2ebb8ea0230abb525f274ace2 Mon Sep 17 00:00:00 2001 From: Alexander Veselov Date: Fri, 9 Nov 2018 21:52:09 +0000 Subject: [PATCH 2/5] update composer --- composer.json | 9 +- composer.lock | 248 ++++++++++++++++++++++++++++++++++++++++---------- 2 files changed, 204 insertions(+), 53 deletions(-) diff --git a/composer.json b/composer.json index c1237f515f..aa3819c669 100644 --- a/composer.json +++ b/composer.json @@ -45,6 +45,7 @@ "spryker-feature/persistent-cart": "~2018.11.0", "spryker-feature/prices": "~2018.11.0", "spryker-feature/product": "~2018.11.0", + "spryker-feature/product-barcode": "^2018.11", "spryker-feature/product-bundles": "~2018.11.0", "spryker-feature/product-groups": "~2018.11.0", "spryker-feature/product-image-management": "~2018.11.0", @@ -75,7 +76,6 @@ "spryker-shop/cms-content-widget-product-set-connector": "^1.0.0", "spryker/assertion": "*", "spryker/availability-cart-connector": "^4.2", - "spryker/barcode": "*", "spryker/cart-currency-connector": "^1.1", "spryker/cart-note-product-bundle-connector": "^0.1.0", "spryker/catalog-price-product-connector": "^1.2", @@ -97,7 +97,6 @@ "spryker/oms-discount-connector": "^3.0", "spryker/payment-cart-connector": "^1.0", "spryker/price-cart-connector": "^4.5", - "spryker/price-product-volume-gui": "^1.0.0", "spryker/product-alternative-product-label-connector": "^1.0", "spryker/product-cart-connector": "^4.3", "spryker/product-category": "^4.6", @@ -112,6 +111,7 @@ "spryker/shipment-checkout-connector": "^1.0.0", "spryker/stock-sales-connector": "^3.0", "spryker/symfony": "3.2.0", + "stecman/symfony-console-completion": "^0.7.0", "swiftmailer/swiftmailer": "^5.4.5" }, "require-dev": { @@ -143,7 +143,6 @@ "spryker/testify": "^3.0.0", "spryker/web-profiler": "1.1.1", "squizlabs/php_codesniffer": "~3.3.0", - "stecman/symfony-console-completion": "^0.7.0", "symfony/var-dumper": "*", "symfony/web-profiler-bundle": "*" }, @@ -234,10 +233,6 @@ "type": "git", "url": "https://github.com/spryker-feature/content-based-shop-navigation.git" }, - { - "type": "git", - "url": "https://github.com/spryker-feature/customer-access.git" - }, { "type": "git", "url": "https://github.com/spryker-feature/customer-account-management.git" diff --git a/composer.lock b/composer.lock index 4747b5a2b6..eb96ee9b8b 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "77010acd56480a1d94ce4c12e552d239", + "content-hash": "3600abc9789b7f9849879e5570ac9cac", "packages": [ { "name": "codeitnowin/barcode", @@ -2884,6 +2884,28 @@ "description": "Product [feature]", "time": "2018-11-09T17:58:50+00:00" }, + { + "name": "spryker-feature/product-barcode", + "version": "2018.11.0", + "source": { + "type": "git", + "url": "https://github.com/spryker-feature/product-barcode.git", + "reference": "b63eef7d794273cf55f698975bc10f867d5a32d9" + }, + "require": { + "php": ">=7.1", + "spryker-feature/product": "~2018.11.0", + "spryker-shop/product-barcode-widget": "^1.1.0", + "spryker/product-barcode": "^1.1.0", + "spryker/product-barcode-gui": "^1.0.0" + }, + "type": "metapackage", + "license": [ + "proprietary" + ], + "description": "Product Barcode [feature]", + "time": "2018-11-09T17:58:42+00:00" + }, { "name": "spryker-feature/product-bundles", "version": "2018.11.0", @@ -5162,6 +5184,52 @@ "description": "ProductAlternativeWidget module", "time": "2018-10-10T14:15:13+00:00" }, + { + "name": "spryker-shop/product-barcode-widget", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/spryker-shop/product-barcode-widget.git", + "reference": "5b08bd83393322619418a8eb1c7b97d57a9d77ee" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker-shop/product-barcode-widget/zipball/5b08bd83393322619418a8eb1c7b97d57a9d77ee", + "reference": "5b08bd83393322619418a8eb1c7b97d57a9d77ee", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "spryker-shop/shop-ui": "^1.0.0", + "spryker/kernel": "^3.24.0", + "spryker/product-barcode": "^1.0.0" + }, + "require-dev": { + "spryker-shop/shopping-list-page": "*", + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "suggest": { + "spryker-shop/shopping-list-page": "If you want see ProductBarcodeWidget in action" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "SprykerShop\\": "src/SprykerShop/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "ProductBarcodeWidget module", + "time": "2018-10-10T14:15:13+00:00" + }, { "name": "spryker-shop/product-bundle-widget", "version": "1.3.0", @@ -15129,6 +15197,94 @@ "description": "ProductAvailabilitiesRestApi module", "time": "2018-10-25T16:21:30+00:00" }, + { + "name": "spryker/product-barcode", + "version": "1.1.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/product-barcode.git", + "reference": "9ad32e1752ba7970a479b5386fe3b0235be63b52" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/product-barcode/zipball/9ad32e1752ba7970a479b5386fe3b0235be63b52", + "reference": "9ad32e1752ba7970a479b5386fe3b0235be63b52", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "spryker/barcode": "^1.0.0", + "spryker/kernel": "^3.1.0", + "spryker/product": "^6.0.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/", + "SprykerTest\\Zed\\ProductBarcode\\Helper\\": "tests/SprykerTest/Zed/ProductBarcode/_support/Helper/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "ProductBarcode module", + "time": "2018-06-08T06:44:22+00:00" + }, + { + "name": "spryker/product-barcode-gui", + "version": "1.0.0", + "source": { + "type": "git", + "url": "https://github.com/spryker/product-barcode-gui.git", + "reference": "9048ce15399d51060337979362f164aaca9dd01f" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/spryker/product-barcode-gui/zipball/9048ce15399d51060337979362f164aaca9dd01f", + "reference": "9048ce15399d51060337979362f164aaca9dd01f", + "shasum": "" + }, + "require": { + "php": ">=7.1", + "spryker/gui": "^3.0.0", + "spryker/kernel": "^3.0.0", + "spryker/locale": "^3.0.0", + "spryker/product": "^6.0.0", + "spryker/product-barcode": "^1.0.0", + "spryker/symfony": "^3.1.0" + }, + "require-dev": { + "spryker/code-sniffer": "*", + "spryker/testify": "*" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "1.0.x-dev" + } + }, + "autoload": { + "psr-4": { + "Spryker\\": "src/Spryker/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "proprietary" + ], + "description": "ProductBarcodeGui module", + "time": "2018-05-16T13:57:10+00:00" + }, { "name": "spryker/product-bundle", "version": "4.7.4", @@ -21526,6 +21682,51 @@ "description": "Zend module", "time": "2017-08-02T16:31:17+00:00" }, + { + "name": "stecman/symfony-console-completion", + "version": "0.7.0", + "source": { + "type": "git", + "url": "https://github.com/stecman/symfony-console-completion.git", + "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb" + }, + "dist": { + "type": "zip", + "url": "https://api.github.com/repos/stecman/symfony-console-completion/zipball/5461d43e53092b3d3b9dbd9d999f2054730f4bbb", + "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb", + "shasum": "" + }, + "require": { + "php": ">=5.3.2", + "symfony/console": "~2.3 || ~3.0" + }, + "require-dev": { + "phpunit/phpunit": "~4.4" + }, + "type": "library", + "extra": { + "branch-alias": { + "dev-master": "0.6.x-dev" + } + }, + "autoload": { + "psr-4": { + "Stecman\\Component\\Symfony\\Console\\BashCompletion\\": "src/" + } + }, + "notification-url": "https://packagist.org/downloads/", + "license": [ + "MIT" + ], + "authors": [ + { + "name": "Stephen Holdaway", + "email": "stephen@stecman.co.nz" + } + ], + "description": "Automatic BASH completion for Symfony Console Component based applications.", + "time": "2016-02-24T05:08:54+00:00" + }, { "name": "swiftmailer/swiftmailer", "version": "v5.4.12", @@ -26917,51 +27118,6 @@ ], "time": "2018-09-23T23:08:17+00:00" }, - { - "name": "stecman/symfony-console-completion", - "version": "0.7.0", - "source": { - "type": "git", - "url": "https://github.com/stecman/symfony-console-completion.git", - "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb" - }, - "dist": { - "type": "zip", - "url": "https://api.github.com/repos/stecman/symfony-console-completion/zipball/5461d43e53092b3d3b9dbd9d999f2054730f4bbb", - "reference": "5461d43e53092b3d3b9dbd9d999f2054730f4bbb", - "shasum": "" - }, - "require": { - "php": ">=5.3.2", - "symfony/console": "~2.3 || ~3.0" - }, - "require-dev": { - "phpunit/phpunit": "~4.4" - }, - "type": "library", - "extra": { - "branch-alias": { - "dev-master": "0.6.x-dev" - } - }, - "autoload": { - "psr-4": { - "Stecman\\Component\\Symfony\\Console\\BashCompletion\\": "src/" - } - }, - "notification-url": "https://packagist.org/downloads/", - "license": [ - "MIT" - ], - "authors": [ - { - "name": "Stephen Holdaway", - "email": "stephen@stecman.co.nz" - } - ], - "description": "Automatic BASH completion for Symfony Console Component based applications.", - "time": "2016-02-24T05:08:54+00:00" - }, { "name": "symfony/browser-kit", "version": "v4.1.7", From cd4227ad4bb2137dc717a291e817d7985b23977a Mon Sep 17 00:00:00 2001 From: Alexander Veselov Date: Fri, 9 Nov 2018 22:17:26 +0000 Subject: [PATCH 3/5] update composer --- composer.json | 2 +- composer.lock | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/composer.json b/composer.json index aa3819c669..cdd17f7909 100644 --- a/composer.json +++ b/composer.json @@ -45,7 +45,7 @@ "spryker-feature/persistent-cart": "~2018.11.0", "spryker-feature/prices": "~2018.11.0", "spryker-feature/product": "~2018.11.0", - "spryker-feature/product-barcode": "^2018.11", + "spryker-feature/product-barcode": "~2018.11", "spryker-feature/product-bundles": "~2018.11.0", "spryker-feature/product-groups": "~2018.11.0", "spryker-feature/product-image-management": "~2018.11.0", diff --git a/composer.lock b/composer.lock index eb96ee9b8b..aebba3348d 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "3600abc9789b7f9849879e5570ac9cac", + "content-hash": "23ec894aac957ce4e8cd7060935a4e3f", "packages": [ { "name": "codeitnowin/barcode", From ae8626e1ad45706b9ac02a39af5177e9ba95891e Mon Sep 17 00:00:00 2001 From: Alexander Veselov Date: Fri, 9 Nov 2018 23:25:42 +0000 Subject: [PATCH 4/5] update composer --- composer.lock | 16 ++++++++-------- 1 file changed, 8 insertions(+), 8 deletions(-) diff --git a/composer.lock b/composer.lock index aebba3348d..902b435964 100644 --- a/composer.lock +++ b/composer.lock @@ -2300,14 +2300,14 @@ "source": { "type": "git", "url": "https://github.com/spryker-feature/category-management.git", - "reference": "9cbb0f858d75f99674f5101308af803909bb1def" + "reference": "eddd560e9f131d1c11479c6ec21108b07493f248" }, "require": { "php": ">=7.1", "spryker-feature/spryker-core": "~2018.11.0", "spryker-shop/category-widget": "^1.0.2", "spryker/categories-rest-api": "^1.1.1", - "spryker/category": "^4.9.0", + "spryker/category": "^4.8.0", "spryker/category-data-feed": "^0.2.1", "spryker/category-data-import": "^0.2.1", "spryker/category-exporter": "^3.0.2", @@ -2319,7 +2319,7 @@ "proprietary" ], "description": "Category Management [feature]", - "time": "2018-11-09T17:57:35+00:00" + "time": "2018-11-09T23:06:13+00:00" }, { "name": "spryker-feature/checkout", @@ -8253,16 +8253,16 @@ }, { "name": "spryker/category", - "version": "4.9.0", + "version": "4.8.0", "source": { "type": "git", "url": "https://github.com/spryker/category.git", - "reference": "253afc760982667527a3f7d7a75f8094f3139d6c" + "reference": "96f0efca793cf6ad2360f09bff767f95d4244597" }, "dist": { "type": "zip", - "url": "https://api.github.com/repos/spryker/category/zipball/253afc760982667527a3f7d7a75f8094f3139d6c", - "reference": "253afc760982667527a3f7d7a75f8094f3139d6c", + "url": "https://api.github.com/repos/spryker/category/zipball/96f0efca793cf6ad2360f09bff767f95d4244597", + "reference": "96f0efca793cf6ad2360f09bff767f95d4244597", "shasum": "" }, "require": { @@ -8306,7 +8306,7 @@ "proprietary" ], "description": "Category module", - "time": "2018-11-01T14:58:18+00:00" + "time": "2018-09-27T10:25:38+00:00" }, { "name": "spryker/category-data-feed", From 23271aee9d0c22184fcd4d36c78e9dad766b06b3 Mon Sep 17 00:00:00 2001 From: Alexander Veselov Date: Fri, 9 Nov 2018 23:51:57 +0000 Subject: [PATCH 5/5] update composer --- composer.json | 1 + composer.lock | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/composer.json b/composer.json index cdd17f7909..fa7377b34b 100644 --- a/composer.json +++ b/composer.json @@ -81,6 +81,7 @@ "spryker/catalog-price-product-connector": "^1.2", "spryker/category-navigation-connector": "^1.0.0", "spryker/chart": "*", + "spryker/category": "4.8.0", "spryker/cms-navigation-connector": "^1.0.0", "spryker/cms-user-connector": "^1.0", "spryker/code-it-now": "^1.0", diff --git a/composer.lock b/composer.lock index 902b435964..6a29b8eacb 100644 --- a/composer.lock +++ b/composer.lock @@ -4,7 +4,7 @@ "Read more about it at https://getcomposer.org/doc/01-basic-usage.md#composer-lock-the-lock-file", "This file is @generated automatically" ], - "content-hash": "23ec894aac957ce4e8cd7060935a4e3f", + "content-hash": "2bd77cbc2ab223525c14cb7b8012d5e8", "packages": [ { "name": "codeitnowin/barcode",