Skip to content
This repository has been archived by the owner on May 30, 2019. It is now read-only.

Commit

Permalink
Merge pull request #673 from elcodi/feature/paymentsuite-2-0
Browse files Browse the repository at this point in the history
Updated for PaymentSuite ^2.0.2
  • Loading branch information
mmoreram committed Jan 20, 2016
2 parents 7efb034 + 859e52a commit c77e769
Show file tree
Hide file tree
Showing 86 changed files with 1,009 additions and 510 deletions.
2 changes: 1 addition & 1 deletion LICENSE
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
The MIT License (MIT)

Copyright (c) 2012-2015 Room Social Networks S.L.
Copyright (c) 2012-2016 Room Social Networks S.L.

Permission is hereby granted, free of charge, to any person obtaining a copy of
this software and associated documentation files (the "Software"), to deal in
Expand Down
1 change: 1 addition & 0 deletions app/AppKernel.php
Original file line number Diff line number Diff line change
Expand Up @@ -159,6 +159,7 @@ public function registerBundles()
'Elcodi\Plugin\FreePaymentBundle\ElcodiFreePaymentBundle',
'Elcodi\Plugin\StripeBundle\ElcodiStripeBundle',
'Elcodi\Plugin\CustomShippingBundle\ElcodiCustomShippingBundle',
'Elcodi\Plugin\BankwireBundle\ElcodiBankwireBundle',
];

if (in_array($this->getEnvironment(), ['dev', 'test'])) {
Expand Down
8 changes: 0 additions & 8 deletions cache

This file was deleted.

8 changes: 3 additions & 5 deletions composer.json
Original file line number Diff line number Diff line change
Expand Up @@ -48,7 +48,7 @@
"doctrine/doctrine-fixtures-bundle": "^2.2",
"doctrine/doctrine-migrations-bundle": "^1.0",

"twig/twig": "^1.18",
"twig/twig": "^1.23",
"twig/extensions": "^1.0",
"sensio/distribution-bundle": "^3.0",
"sensio/framework-extra-bundle": "^3.0",
Expand All @@ -58,9 +58,6 @@
"guzzlehttp/guzzle": "^5.2",
"ornicar/gravatar-bundle" : "1.1.3",
"knplabs/knp-gaufrette-bundle": "^0.1.7",
"paymentsuite/paypal-web-checkout-bundle": "^1.5.2",
"paymentsuite/stripe-bundle": "^1.5.2",
"paymentsuite/free-payment-bundle": "^1.5.2",
"incenteev/composer-parameter-handler": "^2.0",
"hwi/oauth-bundle": "^0.4.0",
"snc/redis-bundle": "^1.1.9",
Expand All @@ -73,7 +70,8 @@
"mmoreram/http-headers-bundle": "1.0.0",
"mmoreram/symfony-bundle-dependencies": "^1.1.1",

"elcodi/elcodi": "^1.0.13"
"elcodi/elcodi": "^1.0.13",
"paymentsuite/paymentsuite": "^2.0.2"
},
"replace": {
"elcodi-templates/template": "self.version",
Expand Down
Loading

0 comments on commit c77e769

Please sign in to comment.