@@ -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 | } |
@@ -650,14 +650,14 @@ discard block |
||
650 | 650 | /* setting up the address details */ |
651 | 651 | $values['NOSHIPPING'] = $this->getConfigValue( array( 'paypalexpress.NoShipping' ), 1 ); |
652 | 652 | $values['ADDROVERRIDE'] = $this->getConfigValue( array( 'paypalexpress.AddrOverride' ), 0 ); |
653 | - $values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName() . ' ' . $orderAddressDelivery->getLastName(); |
|
654 | - $values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1() . ' ' . $orderAddressDelivery->getAddress2() . ' ' . $orderAddressDelivery->getAddress3(); |
|
653 | + $values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName().' '.$orderAddressDelivery->getLastName(); |
|
654 | + $values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1().' '.$orderAddressDelivery->getAddress2().' '.$orderAddressDelivery->getAddress3(); |
|
655 | 655 | $values['PAYMENTREQUEST_0_SHIPTOCITY'] = $orderAddressDelivery->getCity(); |
656 | 656 | $values['PAYMENTREQUEST_0_SHIPTOSTATE'] = $orderAddressDelivery->getState(); |
657 | 657 | $values['PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE'] = $orderAddressDelivery->getCountryId(); |
658 | 658 | $values['PAYMENTREQUEST_0_SHIPTOZIP'] = $orderAddressDelivery->getPostal(); |
659 | 659 | } |
660 | - catch( \Exception $e ) { ; } // If no address is available |
|
660 | + catch( \Exception $e ) {; } // If no address is available |
|
661 | 661 | |
662 | 662 | |
663 | 663 | $lastPos = 0; |
@@ -669,10 +669,10 @@ discard block |
||
669 | 669 | $deliveryPrice = clone $price; |
670 | 670 | $deliveryPrices = $this->addPrice( $deliveryPrices, $deliveryPrice->setValue( '0.00' ) ); |
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 | |
@@ -680,9 +680,9 @@ discard block |
||
680 | 680 | if( ( $paymentCosts = $this->getAmount( $price ) ) > '0.00' ) |
681 | 681 | { |
682 | 682 | $lastPos++; |
683 | - $values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' ); |
|
684 | - $values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = '1'; |
|
685 | - $values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $paymentCosts; |
|
683 | + $values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' ); |
|
684 | + $values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = '1'; |
|
685 | + $values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $paymentCosts; |
|
686 | 686 | } |
687 | 687 | |
688 | 688 | |
@@ -701,7 +701,7 @@ discard block |
||
701 | 701 | $values['L_SHIPPINGOPTIONNAME0'] = $orderServiceDeliveryItem->getName(); |
702 | 702 | $values['L_SHIPPINGOPTIONISDEFAULT0'] = 'true'; |
703 | 703 | } |
704 | - catch( \Exception $e ) { ; } // If no delivery service is available |
|
704 | + catch( \Exception $e ) {; } // If no delivery service is available |
|
705 | 705 | |
706 | 706 | |
707 | 707 | $price = $orderBase->getPrice(); |