@@ -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 | } |
@@ -644,14 +644,14 @@ discard block |
||
644 | 644 | /* setting up the address details */ |
645 | 645 | $values['NOSHIPPING'] = $this->getConfigValue( array( 'paypalexpress.NoShipping' ), 1 ); |
646 | 646 | $values['ADDROVERRIDE'] = $this->getConfigValue( array( 'paypalexpress.AddrOverride' ), 0 ); |
647 | - $values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName() . ' ' . $orderAddressDelivery->getLastName(); |
|
648 | - $values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1() . ' ' . $orderAddressDelivery->getAddress2() . ' ' . $orderAddressDelivery->getAddress3(); |
|
647 | + $values['PAYMENTREQUEST_0_SHIPTONAME'] = $orderAddressDelivery->getFirstName().' '.$orderAddressDelivery->getLastName(); |
|
648 | + $values['PAYMENTREQUEST_0_SHIPTOSTREET'] = $orderAddressDelivery->getAddress1().' '.$orderAddressDelivery->getAddress2().' '.$orderAddressDelivery->getAddress3(); |
|
649 | 649 | $values['PAYMENTREQUEST_0_SHIPTOCITY'] = $orderAddressDelivery->getCity(); |
650 | 650 | $values['PAYMENTREQUEST_0_SHIPTOSTATE'] = $orderAddressDelivery->getState(); |
651 | 651 | $values['PAYMENTREQUEST_0_SHIPTOCOUNTRYCODE'] = $orderAddressDelivery->getCountryId(); |
652 | 652 | $values['PAYMENTREQUEST_0_SHIPTOZIP'] = $orderAddressDelivery->getPostal(); |
653 | 653 | } |
654 | - catch( \Exception $e ) { ; } // If no address is available |
|
654 | + catch( \Exception $e ) {; } // If no address is available |
|
655 | 655 | |
656 | 656 | |
657 | 657 | $lastPos = 0; |
@@ -663,10 +663,10 @@ discard block |
||
663 | 663 | $deliveryPrice = clone $price; |
664 | 664 | $deliveryPrices = $this->addPrice( $deliveryPrices, $deliveryPrice->setValue( '0.00' ), $product->getQuantity() ); |
665 | 665 | |
666 | - $values['L_PAYMENTREQUEST_0_NUMBER' . $lastPos] = $product->getId(); |
|
667 | - $values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $product->getName(); |
|
668 | - $values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = $product->getQuantity(); |
|
669 | - $values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $this->getAmount( $price, false ); |
|
666 | + $values['L_PAYMENTREQUEST_0_NUMBER'.$lastPos] = $product->getId(); |
|
667 | + $values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $product->getName(); |
|
668 | + $values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = $product->getQuantity(); |
|
669 | + $values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $this->getAmount( $price, false ); |
|
670 | 670 | } |
671 | 671 | |
672 | 672 | |
@@ -674,9 +674,9 @@ discard block |
||
674 | 674 | if( ( $paymentCosts = $this->getAmount( $price ) ) > '0.00' ) |
675 | 675 | { |
676 | 676 | $lastPos++; |
677 | - $values['L_PAYMENTREQUEST_0_NAME' . $lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' ); |
|
678 | - $values['L_PAYMENTREQUEST_0_QTY' . $lastPos] = '1'; |
|
679 | - $values['L_PAYMENTREQUEST_0_AMT' . $lastPos] = $paymentCosts; |
|
677 | + $values['L_PAYMENTREQUEST_0_NAME'.$lastPos] = $this->getContext()->getI18n()->dt( 'mshop', 'Payment costs' ); |
|
678 | + $values['L_PAYMENTREQUEST_0_QTY'.$lastPos] = '1'; |
|
679 | + $values['L_PAYMENTREQUEST_0_AMT'.$lastPos] = $paymentCosts; |
|
680 | 680 | } |
681 | 681 | |
682 | 682 | |
@@ -695,7 +695,7 @@ discard block |
||
695 | 695 | $values['L_SHIPPINGOPTIONNAME0'] = $orderServiceDeliveryItem->getName(); |
696 | 696 | $values['L_SHIPPINGOPTIONISDEFAULT0'] = 'true'; |
697 | 697 | } |
698 | - catch( \Exception $e ) { ; } // If no delivery service is available |
|
698 | + catch( \Exception $e ) {; } // If no delivery service is available |
|
699 | 699 | |
700 | 700 | |
701 | 701 | $price = $orderBase->getPrice(); |