Merge branch 'master' into feature/te-751/master-enabling-step-3

spryker · Jan 23, 2019 · 92cde2c · 92cde2c
2 parents 8989aa5 + 1c163cf
commit 92cde2c
Show file tree

Hide file tree

Showing 9 changed files with 1,093 additions and 1,199 deletions.
diff --git a/composer.json b/composer.json
@@ -41,7 +41,7 @@
     "symfony/serializer": "^2.6.13 || ^3.0.0",
     "symfony/stopwatch": "^3.0.0 || ^4.0.0",
     "symfony/translation": "^2.6.13 || ^3.0.0",
-    "symfony/twig-bridge": "^2.7.0 || ^3.0.0 || ^4.0.0",
+    "symfony/twig-bridge": "^3.2.0 || ^4.0.0",
     "symfony/validator": "^2.6.13 || ^3.0.0",
     "symfony/yaml": "^2.6.13 || ^3.0.0",
     "swiftmailer/swiftmailer": "^6.1",

diff --git a/composer.lock b/composer.lock
diff --git a/config/Shared/ci/travis/config_ci.php b/config/Shared/ci/travis/config_ci.php
@@ -18,7 +18,6 @@
 use Spryker\Shared\ProductManagement\ProductManagementConstants;
 use Spryker\Shared\Propel\PropelConstants;
 use Spryker\Shared\RabbitMq\RabbitMqEnv;
-use Spryker\Shared\Ratepay\RatepayConstants;
 use Spryker\Shared\Search\SearchConstants;
 use Spryker\Shared\Session\SessionConstants;
 use Spryker\Shared\Setup\SetupConstants;
@@ -135,14 +134,6 @@
 // ---------- Email
 $config[MailConstants::MAILCATCHER_GUI] = 'http://' . $config[ApplicationConstants::HOST_ZED] . ':1080';
 
-// ---------- Ratepay
-$config[RatepayConstants::PROFILE_ID] = '';
-$config[RatepayConstants::SECURITY_CODE] = '';
-$config[RatepayConstants::SNIPPET_ID] = 'ratepay';
-$config[RatepayConstants::SHOP_ID] = '';
-$config[RatepayConstants::SYSTEM_ID] = 'Spryker ' . $config[ApplicationConstants::HOST_YVES];
-$config[RatepayConstants::API_URL] = 'https://gateway-int.ratepay.com/api/xml/1_0';
-
 // ---------- Propel
 $config[PropelConstants::ZED_DB_DATABASE] = 'DE_test_zed';
 

diff --git a/config/Zed/navigation.xml b/config/Zed/navigation.xml
@@ -12,7 +12,6 @@
     <navigation/>
     <tax/>
     <shipment/>
-    <payment/>
     <acl/>
     <maintenance/>
 </config>