pagantis / woocommerce

controllers/notifyController.php

Indentation +2 added lines, -2 removed lines

@@ -199,8 +199,8 @@
         $this->woocommerceOrder->save();

         if ( ! $this->woocommerceOrder->has_status($isOrderStatusValid)) { // TO CONFIRM

             $logMessage = "WARNING checkMerchantOrderStatus." . " Merchant order id:" . $this->woocommerceOrder->get_id() . " Merchant order status:"

-                          . $this->woocommerceOrder->get_status() . " Pagantis order id:" . $this->pagantisOrder->getStatus()

-                          . " Pagantis order status:" . $this->pagantisOrder->getId();

+                            . $this->woocommerceOrder->get_status() . " Pagantis order id:" . $this->pagantisOrder->getStatus()

+                            . " Pagantis order status:" . $this->pagantisOrder->getId();

 

             $this->insertLog(null, $logMessage);

             $this->woocommerceOrder->add_order_note($logMessage);

controllers/paymentController.php

Indentation +27 added lines, -27 removed lines

@@ -196,15 +196,15 @@ 
                         ->setAddress($shippingAddress['address_1'] . " " . $shippingAddress['address_2']);

             $orderShippingAddress = new Address();

             $orderShippingAddress->setZipCode($shippingAddress['postcode'])

-                                 ->setFullName($shippingAddress['first_name'] . " " . $shippingAddress['last_name'])

-                                 ->setCountryCode($shippingAddress['country'] != '' ? strtoupper($shippingAddress['country'])

+                                    ->setFullName($shippingAddress['first_name'] . " " . $shippingAddress['last_name'])

+                                    ->setCountryCode($shippingAddress['country'] != '' ? strtoupper($shippingAddress['country'])

                                      : strtoupper($this->language))

-                                 ->setCity($shippingAddress['city'])

-                                 ->setAddress($shippingAddress['address_1'] . " " . $shippingAddress['address_2'])

-                                 ->setFixPhone($shippingAddress['phone'])

-                                 ->setMobilePhone($shippingAddress['phone'])

-                                 ->setNationalId($national_id)

-                                 ->setTaxId($tax_id);

+                                    ->setCity($shippingAddress['city'])

+                                    ->setAddress($shippingAddress['address_1'] . " " . $shippingAddress['address_2'])

+                                    ->setFixPhone($shippingAddress['phone'])

+                                    ->setMobilePhone($shippingAddress['phone'])

+                                    ->setNationalId($national_id)

+                                    ->setTaxId($tax_id);

             $orderBillingAddress = new Address();

             $orderBillingAddress->setZipCode($billingAddress['postcode'])

                                 ->setFullName($billingAddress['first_name'] . " " . $billingAddress['last_name'])

@@ -218,14 +218,14 @@ 
                                 ->setTaxId($tax_id);

             $orderUser = new User();

             $orderUser->setAddress($userAddress)

-                      ->setFullName($billingAddress['first_name'] . " " . $billingAddress['last_name'])

-                      ->setBillingAddress($orderBillingAddress)

-                      ->setEmail($billingAddress['email'])

-                      ->setFixPhone($billingAddress['phone'])

-                      ->setMobilePhone($billingAddress['phone'])

-                      ->setShippingAddress($orderShippingAddress)

-                      ->setNationalId($national_id)

-                      ->setTaxId($tax_id);

+                        ->setFullName($billingAddress['first_name'] . " " . $billingAddress['last_name'])

+                        ->setBillingAddress($orderBillingAddress)

+                        ->setEmail($billingAddress['email'])

+                        ->setFixPhone($billingAddress['phone'])

+                        ->setMobilePhone($billingAddress['phone'])

+                        ->setShippingAddress($orderShippingAddress)

+                        ->setNationalId($national_id)

+                        ->setTaxId($tax_id);

 

             $previousOrders = $this->getOrders($order->get_user(), $billingAddress['email']);

             foreach ($previousOrders as $previousOrder) {

@@ -277,9 +277,9 @@ 
 

             $orderShoppingCart = new ShoppingCart();

             $orderShoppingCart->setDetails($details)

-                              ->setOrderReference($order->get_id())

-                              ->setPromotedAmount($promotedAmount)

-                              ->setTotalAmount(intval(strval(100 * $order->total)));

+                                ->setOrderReference($order->get_id())

+                                ->setPromotedAmount($promotedAmount)

+                                ->setTotalAmount(intval(strval(100 * $order->total)));

             $orderConfigurationUrls = new Urls();

             $cancelUrl              = $this->getKoUrl($order);

             $callback_arg           = array(

@@ -298,10 +298,10 @@ 
             $callback_url_notif           = add_query_arg($callback_arg_notif, home_url('/'));

 

             $orderConfigurationUrls->setCancel($cancelUrl)

-                                   ->setKo($callback_url_user)

-                                   ->setAuthorizedNotificationCallback($callback_url_notif)

-                                   ->setRejectedNotificationCallback(null)

-                                   ->setOk($callback_url_user);

+                                    ->setKo($callback_url_user)

+                                    ->setAuthorizedNotificationCallback($callback_url_notif)

+                                    ->setRejectedNotificationCallback(null)

+                                    ->setOk($callback_url_user);

             $orderChannel = new Channel();

             $orderChannel->setAssistedSale(false)->setType(Channel::ONLINE);

 

@@ -316,9 +316,9 @@ 
 

             $orderApiClient = new Order();

             $orderApiClient->setConfiguration($orderConfiguration)

-                           ->setMetadata($metadataOrder)

-                           ->setShoppingCart($orderShoppingCart)

-                           ->setUser($orderUser);

+                            ->setMetadata($metadataOrder)

+                            ->setShoppingCart($orderShoppingCart)

+                            ->setUser($orderUser);

 

             if ($this->pagantis_public_key == '' || $this->pagantis_private_key == '') {

                 throw new \Exception('Public and Secret Key not found');

@@ -381,7 +381,7 @@ 
             $returnUrl = $this->getOkUrl($paymentOrder);

         } else {

             $returnUrl = $this->getKoUrl($paymentOrder);

-           $paymentOrder->delete($forceDelete = true);

+            $paymentOrder->delete($forceDelete = true);

         }

         wp_redirect($returnUrl);

         exit;