@@ -512,7 +512,7 @@ discard block |
||
512 | 512 | |
513 | 513 | if( $rvals['ACK'] !== 'Success' ) |
514 | 514 | { |
515 | - $msg = 'PayPal Express: method = ' . $method . ', order ID = ' . $orderid . ', response = ' . print_r( $rvals, true ); |
|
515 | + $msg = 'PayPal Express: method = '.$method.', order ID = '.$orderid.', response = '.print_r( $rvals, true ); |
|
516 | 516 | $this->getContext()->getLogger()->log( $msg, \Aimeos\MW\Logger\Base::WARN ); |
517 | 517 | |
518 | 518 | if( $rvals['ACK'] !== 'SuccessWithWarning' ) |
@@ -591,7 +591,7 @@ discard block |
||
591 | 591 | break; |
592 | 592 | } |
593 | 593 | |
594 | - $str = 'PayPal Express: order ID = ' . $invoice->getId() . ', PENDINGREASON = ' . $response['PENDINGREASON']; |
|
594 | + $str = 'PayPal Express: order ID = '.$invoice->getId().', PENDINGREASON = '.$response['PENDINGREASON']; |
|
595 | 595 | $this->getContext()->getLogger()->log( $str, \Aimeos\MW\Logger\Base::INFO ); |
596 | 596 | } |
597 | 597 | |
@@ -625,7 +625,7 @@ discard block |
||
625 | 625 | break; |
626 | 626 | |
627 | 627 | default: |
628 | - $str = 'PayPal Express: order ID = ' . $invoice->getId() . ', response = ' . print_r( $response, true ); |
|
628 | + $str = 'PayPal Express: order ID = '.$invoice->getId().', response = '.print_r( $response, true ); |
|
629 | 629 | $this->getContext()->getLogger()->log( $str, \Aimeos\MW\Logger\Base::INFO ); |
630 | 630 | } |
631 | 631 | } |
@@ -649,14 +649,14 @@ discard block |
||
649 | 649 | /* setting up the address details */ |
650 | 650 | $values['NOSHIPPING'] = $this->getConfigValue( array( 'paypalexpress.NoShipping' ), 1 ); |
651 | 651 | $values['ADDROVERRIDE'] = $this->getConfigValue( array( 'paypalexpress.AddrOverride' ), 0 ); |
652 | - $values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName() . ' ' . $orderAddressDelivery->getLastName(); |
|
653 | - $values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1() . ' ' . $orderAddressDelivery->getAddress2() . ' ' . $orderAddressDelivery->getAddress3(); |
|
652 | + $values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName().' '.$orderAddressDelivery->getLastName(); |
|
653 | + $values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1().' '.$orderAddressDelivery->getAddress2().' '.$orderAddressDelivery->getAddress3(); |
|
654 | 654 | $values['PAYMENTREQUEST_0_SHIPTOCITY'] = $orderAddressDelivery->getCity(); |
655 | 655 | $values['PAYMENTREQUEST_0_SHIPTOSTATE'] = $orderAddressDelivery->getState(); |
656 | 656 | $values['PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE'] = $orderAddressDelivery->getCountryId(); |
657 | 657 | $values['PAYMENTREQUEST_0_SHIPTOZIP'] = $orderAddressDelivery->getPostal(); |
658 | 658 | } |
659 | - catch( \Exception $e ) { ; } // If no address is available |
|
659 | + catch( \Exception $e ) {; } // If no address is available |
|
660 | 660 | |
661 | 661 | |
662 | 662 | $lastPos = 0; |
@@ -666,10 +666,10 @@ discard block |
||
666 | 666 | $lastPos = $product->getPosition() - 1; |
667 | 667 | $deliveryPrice->setCosts( $deliveryPrice->getCosts() + $price->getCosts() * $product->getQuantity() ); |
668 | 668 | |
669 | - $values['L_PAYMENTREQUEST_0_NUMBER' . $lastPos] = $product->getId(); |
|
670 | - $values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $product->getName(); |
|
671 | - $values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = $product->getQuantity(); |
|
672 | - $values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $this->getAmount( $price, false ); |
|
669 | + $values['L_PAYMENTREQUEST_0_NUMBER'.$lastPos] = $product->getId(); |
|
670 | + $values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $product->getName(); |
|
671 | + $values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = $product->getQuantity(); |
|
672 | + $values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $this->getAmount( $price, false ); |
|
673 | 673 | } |
674 | 674 | |
675 | 675 | |
@@ -677,9 +677,9 @@ discard block |
||
677 | 677 | if( ( $paymentCosts = $this->getAmount( $price ) ) > '0.00' ) |
678 | 678 | { |
679 | 679 | $lastPos++; |
680 | - $values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' ); |
|
681 | - $values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = '1'; |
|
682 | - $values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $paymentCosts; |
|
680 | + $values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' ); |
|
681 | + $values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = '1'; |
|
682 | + $values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $paymentCosts; |
|
683 | 683 | } |
684 | 684 | |
685 | 685 | |
@@ -696,7 +696,7 @@ discard block |
||
696 | 696 | $values['L_SHIPPINGOPTIONNAME0'] = $orderServiceDeliveryItem->getName(); |
697 | 697 | $values['L_SHIPPINGOPTIONISDEFAULT0'] = 'true'; |
698 | 698 | } |
699 | - catch( \Exception $e ) { ; } // If no delivery service is available |
|
699 | + catch( \Exception $e ) {; } // If no delivery service is available |
|
700 | 700 | |
701 | 701 | |
702 | 702 | $price = $orderBase->getPrice(); |
@@ -656,7 +656,9 @@ discard block |
||
656 | 656 | $values['PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE'] = $orderAddressDelivery->getCountryId(); |
657 | 657 | $values['PAYMENTREQUEST_0_SHIPTOZIP'] = $orderAddressDelivery->getPostal(); |
658 | 658 | } |
659 | - catch( \Exception $e ) { ; } // If no address is available |
|
659 | + catch( \Exception $e ) |
|
660 | + { |
|
661 | +; } // If no address is available |
|
660 | 662 | |
661 | 663 | |
662 | 664 | $lastPos = 0; |
@@ -696,7 +698,9 @@ discard block |
||
696 | 698 | $values['L_SHIPPINGOPTIONNAME0'] = $orderServiceDeliveryItem->getName(); |
697 | 699 | $values['L_SHIPPINGOPTIONISDEFAULT0'] = 'true'; |
698 | 700 | } |
699 | - catch( \Exception $e ) { ; } // If no delivery service is available |
|
701 | + catch( \Exception $e ) |
|
702 | + { |
|
703 | +; } // If no delivery service is available |
|
700 | 704 | |
701 | 705 | |
702 | 706 | $price = $orderBase->getPrice(); |