Merge pull request #185 in PLUG_OPEN/swagpaymentpaypalunified from pt…

…-10562/5.2/remove-mail-handling to master * commit '042def2aac4dab6e25a2188055ee83df1533d87a': PT-10562 - Do not interfere mail sending in error case
shopware5 · Jun 25, 2019 · ca6395b · ca6395b
2 parents 143612c + 042def2
commit ca6395b
Show file tree

Hide file tree

Showing 4 changed files with 20 additions and 109 deletions.
diff --git a/Controllers/Backend/PaypalUnified.php b/Controllers/Backend/PaypalUnified.php
@@ -7,9 +7,11 @@
  */
 
 use Doctrine\DBAL\Connection;
+use Doctrine\ORM\Query\Expr\Join;
 use Shopware\Components\Model\QueryBuilder;
 use Shopware\Models\Order\Order;
 use Shopware\Models\Order\Status;
+use Shopware\Models\Shop\Repository as ShopRepository;
 use Shopware\Models\Shop\Shop;
 use SwagPaymentPayPalUnified\Components\ExceptionHandlerServiceInterface;
 use SwagPaymentPayPalUnified\Components\PaymentMethodProvider;
@@ -463,7 +465,7 @@ protected function getList($offset, $limit, $sort = [], $filter = [], array $who
         $orderStatusNamespace = $this->container->get('snippets')->getNamespace('backend/static/order_status');
         $paymentStatusNamespace = $this->container->get('snippets')->getNamespace('backend/static/payment_status');
 
-        $orderList['data'] = array_map(function ($order) use ($orderStatusNamespace, $paymentStatusNamespace) {
+        $orderList['data'] = array_map(static function ($order) use ($orderStatusNamespace, $paymentStatusNamespace) {
             if (!isset($order['orderStatus']['description'])) {
                 $order['orderStatus']['description'] = $orderStatusNamespace->get($order['orderStatus']['name']);
             }
@@ -543,22 +545,22 @@ private function prepareOrderQueryBuilder(QueryBuilder $builder)
         $builder->innerJoin(
             'sOrder.payment',
             'payment',
-            \Doctrine\ORM\Query\Expr\Join::WITH,
+            Join::WITH,
             'payment.id IN (:paymentIds)'
         )->setParameter('paymentIds', $paymentIds, Connection::PARAM_INT_ARRAY);
 
         $builder->leftJoin('sOrder.languageSubShop', 'languageSubShop')
-                ->leftJoin('sOrder.customer', 'customer')
-                ->leftJoin('sOrder.orderStatus', 'orderStatus')
-                ->leftJoin('sOrder.paymentStatus', 'paymentStatus')
-                ->leftJoin('sOrder.attribute', 'attribute')
-
-                ->addSelect('languageSubShop')
-                ->addSelect('payment')
-                ->addSelect('customer')
-                ->addSelect('orderStatus')
-                ->addSelect('paymentStatus')
-                ->addSelect('attribute');
+            ->leftJoin('sOrder.customer', 'customer')
+            ->leftJoin('sOrder.orderStatus', 'orderStatus')
+            ->leftJoin('sOrder.paymentStatus', 'paymentStatus')
+            ->leftJoin('sOrder.attribute', 'attribute')
+            ->addSelect('languageSubShop')
+            ->addSelect('payment')
+            ->addSelect('customer')
+            ->addSelect('orderStatus')
+            ->addSelect('paymentStatus')
+            ->addSelect('attribute')
+            ->andWhere("sOrder.transactionId != ''");
 
         return $builder;
     }
@@ -568,7 +570,7 @@ private function prepareOrderQueryBuilder(QueryBuilder $builder)
      */
     private function registerShopResource($shopId = null)
     {
-        /** @var \Shopware\Models\Shop\Repository $shopRepository */
+        /** @var ShopRepository $shopRepository */
         $shopRepository = $this->get('models')->getRepository(Shop::class);
 
         if ($shopId === null) {
@@ -632,14 +634,16 @@ private function prepareUnifiedDetails($paymentId)
     private function updatePaymentStatus(array $refundData)
     {
         /** @var Order $orderModel */
-        $orderModel = $this->getModelManager()->getRepository(Order::class)->findOneBy(['temporaryId' => $refundData['parent_payment']]);
+        $orderModel = $this->getModelManager()->getRepository(Order::class)
+            ->findOneBy(['temporaryId' => $refundData['parent_payment']]);
 
         if (!($orderModel instanceof Order)) {
             return;
         }
 
         /** @var Status $orderStatusModel */
-        $orderStatusModel = $this->getModelManager()->getRepository(Status::class)->find(PaymentStatus::PAYMENT_STATUS_REFUNDED);
+        $orderStatusModel = $this->getModelManager()->getRepository(Status::class)
+            ->find(PaymentStatus::PAYMENT_STATUS_REFUNDED);
 
         $orderModel->setPaymentStatus($orderStatusModel);
 

diff --git a/Controllers/Frontend/PaypalUnified.php b/Controllers/Frontend/PaypalUnified.php
@@ -271,7 +271,6 @@ public function returnAction()
         } catch (RequestException $exception) {
             $errorCode = ErrorCodes::COMMUNICATION_FAILURE;
             if ($sendOrderNumber) {
-                $session->offsetUnset('paypalUnifiedFinishOrderSendMailVariables');
                 $orderDataService->setOrderState($orderNumber, PaymentStatus::ORDER_STATUS_CLARIFICATION_REQUIRED);
                 $orderDataService->removeTransactionId($orderNumber);
                 $errorCode = ErrorCodes::COMMUNICATION_FAILURE_FINISH;
@@ -319,8 +318,6 @@ public function returnAction()
 
         $orderDataService->applyPaymentTypeAttribute($orderNumber, $response, $isExpressCheckout);
 
-        $this->sendOrderMail($session);
-
         $redirectParameter = [
             'module' => 'frontend',
             'controller' => 'checkout',
@@ -507,19 +504,4 @@ private function noDispatchForOrder()
 
         return !empty($this->shopwareConfig->get('premiumShippingNoOrder')) && (empty($session['sDispatch']) || empty($session['sCountry']));
     }
-
-    private function sendOrderMail(Enlight_Components_Session_Namespace $session)
-    {
-        if (!$session->offsetExists('paypalUnifiedFinishOrderSendMailVariables')) {
-            return;
-        }
-
-        $sendMailOrderVariables = $session->get('paypalUnifiedFinishOrderSendMailVariables');
-        $sendMailOrderVariables['paypalUnifiedSendMail'] = true;
-        /** @var sOrder $sOrder */
-        $sOrder = $this->get('paypal_unified.dependency_provider')->getModule('order');
-        $sOrder->sendMail($sendMailOrderVariables);
-
-        $session->offsetUnset('paypalUnifiedFinishOrderSendMailVariables');
-    }
 }
diff --git a/Resources/services/subscribers.xml b/Resources/services/subscribers.xml
@@ -108,13 +108,6 @@
             <tag name="shopware.event_subscriber"/>
         </service>
 
-        <service id="swag_payment_pay_pal_unified.subscriber.order"
-                 class="SwagPaymentPayPalUnified\Subscriber\Order">
-            <argument type="service" id="dbal_connection"/>
-            <argument type="service" id="paypal_unified.dependency_provider"/>
-            <tag name="shopware.event_subscriber"/>
-        </service>
-
         <service id="paypal_unified.subscriber.payment_means"
                  class="SwagPaymentPayPalUnified\Subscriber\PaymentMeans">
             <argument type="service" id="dbal_connection"/>

diff --git a/Subscriber/Order.php b/Subscriber/Order.php