@@ -506,7 +506,7 @@ discard block |
||
506 | 506 | |
507 | 507 | if( $rvals['ACK'] !== 'Success' ) |
508 | 508 | { |
509 | - $msg = 'PayPal Express: method = ' . $method . ', order ID = ' . $orderid . ', response = ' . print_r( $rvals, true ); |
|
509 | + $msg = 'PayPal Express: method = '.$method.', order ID = '.$orderid.', response = '.print_r( $rvals, true ); |
|
510 | 510 | $this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN, 'core/service/payment' ); |
511 | 511 | |
512 | 512 | if( $rvals['ACK'] !== 'SuccessWithWarning' ) |
@@ -585,7 +585,7 @@ discard block |
||
585 | 585 | break; |
586 | 586 | } |
587 | 587 | |
588 | - $str = 'PayPal Express: order ID = ' . $invoice->getId() . ', PENDINGREASON = ' . $response['PENDINGREASON']; |
|
588 | + $str = 'PayPal Express: order ID = '.$invoice->getId().', PENDINGREASON = '.$response['PENDINGREASON']; |
|
589 | 589 | $this->getContext()->getLogger()->log( $str, \Aimeos\MW\Logger\Base::INFO, 'core/service/payment' ); |
590 | 590 | } |
591 | 591 | |
@@ -619,7 +619,7 @@ discard block |
||
619 | 619 | break; |
620 | 620 | |
621 | 621 | default: |
622 | - $str = 'PayPal Express: order ID = ' . $invoice->getId() . ', response = ' . print_r( $response, true ); |
|
622 | + $str = 'PayPal Express: order ID = '.$invoice->getId().', response = '.print_r( $response, true ); |
|
623 | 623 | $this->getContext()->getLogger()->log( $str, \Aimeos\MW\Logger\Base::INFO, 'core/service/payment' ); |
624 | 624 | } |
625 | 625 | } |
@@ -647,14 +647,14 @@ discard block |
||
647 | 647 | /* setting up the address details */ |
648 | 648 | $values['NOSHIPPING'] = $this->getConfigValue( array( 'paypalexpress.NoShipping' ), 1 ); |
649 | 649 | $values['ADDROVERRIDE'] = $this->getConfigValue( array( 'paypalexpress.AddrOverride' ), 0 ); |
650 | - $values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName() . ' ' . $orderAddressDelivery->getLastName(); |
|
651 | - $values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1() . ' ' . $orderAddressDelivery->getAddress2() . ' ' . $orderAddressDelivery->getAddress3(); |
|
650 | + $values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName().' '.$orderAddressDelivery->getLastName(); |
|
651 | + $values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1().' '.$orderAddressDelivery->getAddress2().' '.$orderAddressDelivery->getAddress3(); |
|
652 | 652 | $values['PAYMENTREQUEST_0_SHIPTOCITY'] = $orderAddressDelivery->getCity(); |
653 | 653 | $values['PAYMENTREQUEST_0_SHIPTOSTATE'] = $orderAddressDelivery->getState(); |
654 | 654 | $values['PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE'] = $orderAddressDelivery->getCountryId(); |
655 | 655 | $values['PAYMENTREQUEST_0_SHIPTOZIP'] = $orderAddressDelivery->getPostal(); |
656 | 656 | } |
657 | - catch( \Exception $e ) { ; } // If no address is available |
|
657 | + catch( \Exception $e ) {; } // If no address is available |
|
658 | 658 | } |
659 | 659 | |
660 | 660 | |
@@ -669,10 +669,10 @@ discard block |
||
669 | 669 | $deliveryPrice = clone $price; |
670 | 670 | $deliveryPrices = $this->addPrice( $deliveryPrices, $deliveryPrice->setValue( '0.00' ), $product->getQuantity() ); |
671 | 671 | |
672 | - $values['L_PAYMENTREQUEST_0_NUMBER' . $lastPos] = $product->getId(); |
|
673 | - $values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $product->getName(); |
|
674 | - $values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = $product->getQuantity(); |
|
675 | - $values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $this->getAmount( $price, false ); |
|
672 | + $values['L_PAYMENTREQUEST_0_NUMBER'.$lastPos] = $product->getId(); |
|
673 | + $values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $product->getName(); |
|
674 | + $values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = $product->getQuantity(); |
|
675 | + $values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $this->getAmount( $price, false ); |
|
676 | 676 | } |
677 | 677 | } |
678 | 678 | |
@@ -683,9 +683,9 @@ discard block |
||
683 | 683 | if( ( $paymentCosts = $this->getAmount( $price ) ) > '0.00' ) |
684 | 684 | { |
685 | 685 | $lastPos++; |
686 | - $values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' ); |
|
687 | - $values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = '1'; |
|
688 | - $values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $paymentCosts; |
|
686 | + $values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' ); |
|
687 | + $values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = '1'; |
|
688 | + $values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $paymentCosts; |
|
689 | 689 | } |
690 | 690 | |
691 | 691 | try |
@@ -703,7 +703,7 @@ discard block |
||
703 | 703 | $values['L_SHIPPINGOPTIONNAME0'] = $orderServiceDeliveryItem->getName(); |
704 | 704 | $values['L_SHIPPINGOPTIONISDEFAULT0'] = 'true'; |
705 | 705 | } |
706 | - catch( \Exception $e ) { ; } // If no delivery service is available |
|
706 | + catch( \Exception $e ) {; } // If no delivery service is available |
|
707 | 707 | } |
708 | 708 | |
709 | 709 |
@@ -654,7 +654,9 @@ discard block |
||
654 | 654 | $values['PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE'] = $orderAddressDelivery->getCountryId(); |
655 | 655 | $values['PAYMENTREQUEST_0_SHIPTOZIP'] = $orderAddressDelivery->getPostal(); |
656 | 656 | } |
657 | - catch( \Exception $e ) { ; } // If no address is available |
|
657 | + catch( \Exception $e ) |
|
658 | + { |
|
659 | +; } // If no address is available |
|
658 | 660 | } |
659 | 661 | |
660 | 662 | |
@@ -703,7 +705,9 @@ discard block |
||
703 | 705 | $values['L_SHIPPINGOPTIONNAME0'] = $orderServiceDeliveryItem->getName(); |
704 | 706 | $values['L_SHIPPINGOPTIONISDEFAULT0'] = 'true'; |
705 | 707 | } |
706 | - catch( \Exception $e ) { ; } // If no delivery service is available |
|
708 | + catch( \Exception $e ) |
|
709 | + { |
|
710 | +; } // If no delivery service is available |
|
707 | 711 | } |
708 | 712 | |
709 | 713 |