p4

Author: ivanproskuryakov

Aisel/app/AppKernel.php

@@ -21,7 +21,6 @@ public function registerBundles()
             new Stof\DoctrineExtensionsBundle\StofDoctrineExtensionsBundle(),
             new JMS\SerializerBundle\JMSSerializerBundle(),
             new FOS\RestBundle\FOSRestBundle(),
-            new Payum\Bundle\PayumBundle\PayumBundle(),
             new Nelmio\CorsBundle\NelmioCorsBundle(),
             new cspoo\Swiftmailer\MailgunBundle\cspooSwiftmailerMailgunBundle(),
 

Aisel/app/config/config.yml

@@ -4,7 +4,6 @@ imports:
     - { resource: twig.yml }
     - { resource: configs/doctrine.yml }
     - { resource: configs/aisel.yml }
-    - { resource: configs/payum.yml }
     - { resource: configs/cors.yml }
     - { resource: configs/mailgun.yml }
 

Aisel/app/config/configs/payum.yml

@@ -1,5 +1,2 @@
 _aisel:
-    resource: routings/aisel.yml
-
-_payum:
-    resource: routings/payum.yml
+    resource: routings/aisel.yml

Aisel/app/config/routing.yml

@@ -19,26 +19,21 @@
     },
     "require": {
         "php": ">=5.3.3",
-        "symfony/symfony": "2.7.*",
+        "symfony/symfony": "3.0.*",
 
-        "doctrine/orm": "=v2.4.2",
+        "doctrine/orm": "=v2.5.4",
         "doctrine/doctrine-bundle": "~1.3",
         "stof/doctrine-extensions-bundle": "1.2.*@dev",
         "doctrine/doctrine-fixtures-bundle": "2.2.*@dev",
         "twig/extensions": "~1.0",
         "symfony/assetic-bundle": "~2.3",
         "symfony/swiftmailer-bundle": "~2.3",
         "symfony/monolog-bundle": "~2.4",
-        "sensio/distribution-bundle": "~2.3",
+        "sensio/distribution-bundle": "5.0.*",
         "sensio/framework-extra-bundle": "~3.0",
-        "sensio/generator-bundle": "~2.3",
         "incenteev/composer-parameter-handler": "~2.0",
-        "friendsofsymfony/rest-bundle": "1.4.*@dev",
-
+        "friendsofsymfony/rest-bundle": "~1.7.8",
         "jms/serializer-bundle": "1.1.0",
-        "payum/payum-bundle": "0.15.*@dev",
-        "payum/offline": "0.15.*",
-        "payum/paypal-express-checkout-nvp": "0.15.*",
 
         "phpunit/phpunit": "4.6.4",
         "nelmio/cors-bundle": "~1.4",

Aisel/app/config/routings/payum.yml

@@ -56,6 +56,10 @@ body #loading-bar .peg {
 /***********
     Body
 ***********/
+body {
+    overflow-y: scroll;
+}
+
 body .website-content {
     color: #999;
 }

Aisel/composer.json

@@ -26,12 +26,9 @@ class ApiCartController extends BaseApiController
      */
     public function cartAction()
     {
-        $user = $this
-            ->get('aisel.user.manager')
-            ->getUser();
         $cart = $this
             ->get('aisel.cart.manager')
-            ->getUserCart($user);
+            ->getUserCart($this->getUser());
 
         return $this->filterMaxDepth($cart);
     }
@@ -46,13 +43,13 @@ public function cartAction()
      */
     public function productQtyUpdateAction($productId, $qty)
     {
-        $user = $this
-            ->get('aisel.user.manager')
-            ->getUser();
-
         $cartItem = $this
             ->get('aisel.cart.manager')
-            ->updateProductInCart($user, $productId, $qty);
+            ->updateProductInCart(
+                $this->getUser(),
+                $productId,
+                $qty
+            );
 
         if ($cartItem) {
             $response =
@@ -79,19 +76,19 @@ public function productQtyUpdateAction($productId, $qty)
      */
     public function productAddAction($productId, $qty)
     {
-        $user = $this
-            ->get('aisel.user.manager')
-            ->getUser();
-
         $cartItem = $this
             ->get('aisel.cart.manager')
-            ->addProductToCart($user, $productId, $qty);
+            ->addProductToCart(
+                $this->getUser(),
+                $productId,
+                $qty
+            );
 
         return array(
-                'status' => true,
-                'message' => 'Product was added',
-                'cartItem' => $cartItem
-            );
+            'status' => true,
+            'message' => 'Product was added',
+            'cartItem' => $cartItem
+        );
     }
 
 }