@@ -67,13 +67,13 @@ discard block |
||
| 67 | 67 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 68 | 68 | * @return string HTML code |
| 69 | 69 | */ |
| 70 | - public function getBody( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 70 | + public function getBody($uid = '', array &$tags = array(), &$expire = null) |
|
| 71 | 71 | { |
| 72 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 72 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 73 | 73 | |
| 74 | 74 | $html = ''; |
| 75 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 76 | - $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
|
| 75 | + foreach ($this->getSubClients() as $subclient) { |
|
| 76 | + $html .= $subclient->setView($view)->getBody($uid, $tags, $expire); |
|
| 77 | 77 | } |
| 78 | 78 | $view->retryBody = $html; |
| 79 | 79 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $tplconf = 'client/html/checkout/confirm/retry/standard/template-body'; |
| 101 | 101 | $default = 'checkout/confirm/retry-body-default.php'; |
| 102 | 102 | |
| 103 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 103 | + return $view->render($view->config($tplconf, $default)); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | |
@@ -112,13 +112,13 @@ discard block |
||
| 112 | 112 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 113 | 113 | * @return string|null String including HTML tags for the header on error |
| 114 | 114 | */ |
| 115 | - public function getHeader( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 115 | + public function getHeader($uid = '', array &$tags = array(), &$expire = null) |
|
| 116 | 116 | { |
| 117 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 117 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 118 | 118 | |
| 119 | 119 | $html = ''; |
| 120 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 121 | - $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
|
| 120 | + foreach ($this->getSubClients() as $subclient) { |
|
| 121 | + $html .= $subclient->setView($view)->getHeader($uid, $tags, $expire); |
|
| 122 | 122 | } |
| 123 | 123 | $view->retryHeader = $html; |
| 124 | 124 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $tplconf = 'client/html/checkout/confirm/retry/standard/template-header'; |
| 147 | 147 | $default = 'checkout/confirm/retry-header-default.php'; |
| 148 | 148 | |
| 149 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 149 | + return $view->render($view->config($tplconf, $default)); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * @param string|null $name Name of the sub-client (Default if null) |
| 158 | 158 | * @return \Aimeos\Client\Html\Iface Sub-client object |
| 159 | 159 | */ |
| 160 | - public function getSubClient( $type, $name = null ) |
|
| 160 | + public function getSubClient($type, $name = null) |
|
| 161 | 161 | { |
| 162 | 162 | /** client/html/checkout/confirm/retry/decorators/excludes |
| 163 | 163 | * Excludes decorators added by the "common" option from the checkout confirm retry html client |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * @see client/html/checkout/confirm/retry/decorators/global |
| 234 | 234 | */ |
| 235 | 235 | |
| 236 | - return $this->createSubClient( 'checkout/confirm/retry/' . $type, $name ); |
|
| 236 | + return $this->createSubClient('checkout/confirm/retry/'.$type, $name); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | |
@@ -244,6 +244,6 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | protected function getSubClientNames() |
| 246 | 246 | { |
| 247 | - return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames ); |
|
| 247 | + return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames); |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | 250 | \ No newline at end of file |
@@ -65,13 +65,13 @@ discard block |
||
| 65 | 65 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 66 | 66 | * @return string HTML code |
| 67 | 67 | */ |
| 68 | - public function getBody( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 68 | + public function getBody($uid = '', array &$tags = array(), &$expire = null) |
|
| 69 | 69 | { |
| 70 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 70 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 71 | 71 | |
| 72 | 72 | $html = ''; |
| 73 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 74 | - $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
|
| 73 | + foreach ($this->getSubClients() as $subclient) { |
|
| 74 | + $html .= $subclient->setView($view)->getBody($uid, $tags, $expire); |
|
| 75 | 75 | } |
| 76 | 76 | $view->serviceBody = $html; |
| 77 | 77 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $tplconf = 'client/html/checkout/confirm/order/service/standard/template-body'; |
| 100 | 100 | $default = 'common/summary/service-body-default.php'; |
| 101 | 101 | |
| 102 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 102 | + return $view->render($view->config($tplconf, $default)); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | |
@@ -111,13 +111,13 @@ discard block |
||
| 111 | 111 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 112 | 112 | * @return string|null String including HTML tags for the header on error |
| 113 | 113 | */ |
| 114 | - public function getHeader( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 114 | + public function getHeader($uid = '', array &$tags = array(), &$expire = null) |
|
| 115 | 115 | { |
| 116 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 116 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 117 | 117 | |
| 118 | 118 | $html = ''; |
| 119 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 120 | - $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
|
| 119 | + foreach ($this->getSubClients() as $subclient) { |
|
| 120 | + $html .= $subclient->setView($view)->getHeader($uid, $tags, $expire); |
|
| 121 | 121 | } |
| 122 | 122 | $view->serviceHeader = $html; |
| 123 | 123 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $tplconf = 'client/html/checkout/confirm/order/service/standard/template-header'; |
| 147 | 147 | $default = 'common/summary/service-header-default.php'; |
| 148 | 148 | |
| 149 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 149 | + return $view->render($view->config($tplconf, $default)); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * @param string|null $name Name of the sub-client (Default if null) |
| 158 | 158 | * @return \Aimeos\Client\Html\Iface Sub-client object |
| 159 | 159 | */ |
| 160 | - public function getSubClient( $type, $name = null ) |
|
| 160 | + public function getSubClient($type, $name = null) |
|
| 161 | 161 | { |
| 162 | 162 | /** client/html/checkout/confirm/order/service/decorators/excludes |
| 163 | 163 | * Excludes decorators added by the "common" option from the checkout confirm order service html client |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * @see client/html/checkout/confirm/order/service/decorators/global |
| 234 | 234 | */ |
| 235 | 235 | |
| 236 | - return $this->createSubClient( 'checkout/confirm/order/service/' . $type, $name ); |
|
| 236 | + return $this->createSubClient('checkout/confirm/order/service/'.$type, $name); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | |
@@ -244,6 +244,6 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | protected function getSubClientNames() |
| 246 | 246 | { |
| 247 | - return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames ); |
|
| 247 | + return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames); |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | 250 | \ No newline at end of file |
@@ -65,13 +65,13 @@ discard block |
||
| 65 | 65 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 66 | 66 | * @return string HTML code |
| 67 | 67 | */ |
| 68 | - public function getBody( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 68 | + public function getBody($uid = '', array &$tags = array(), &$expire = null) |
|
| 69 | 69 | { |
| 70 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 70 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 71 | 71 | |
| 72 | 72 | $html = ''; |
| 73 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 74 | - $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
|
| 73 | + foreach ($this->getSubClients() as $subclient) { |
|
| 74 | + $html .= $subclient->setView($view)->getBody($uid, $tags, $expire); |
|
| 75 | 75 | } |
| 76 | 76 | $view->couponBody = $html; |
| 77 | 77 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $tplconf = 'client/html/checkout/confirm/order/coupon/standard/template-body'; |
| 100 | 100 | $default = 'common/summary/coupon-body-default.php'; |
| 101 | 101 | |
| 102 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 102 | + return $view->render($view->config($tplconf, $default)); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | |
@@ -111,13 +111,13 @@ discard block |
||
| 111 | 111 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 112 | 112 | * @return string|null String including HTML tags for the header on error |
| 113 | 113 | */ |
| 114 | - public function getHeader( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 114 | + public function getHeader($uid = '', array &$tags = array(), &$expire = null) |
|
| 115 | 115 | { |
| 116 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 116 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 117 | 117 | |
| 118 | 118 | $html = ''; |
| 119 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 120 | - $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
|
| 119 | + foreach ($this->getSubClients() as $subclient) { |
|
| 120 | + $html .= $subclient->setView($view)->getHeader($uid, $tags, $expire); |
|
| 121 | 121 | } |
| 122 | 122 | $view->couponHeader = $html; |
| 123 | 123 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $tplconf = 'client/html/checkout/confirm/order/coupon/standard/template-header'; |
| 147 | 147 | $default = 'common/summary/coupon-header-default.php'; |
| 148 | 148 | |
| 149 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 149 | + return $view->render($view->config($tplconf, $default)); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * @param string|null $name Name of the sub-client (Default if null) |
| 158 | 158 | * @return \Aimeos\Client\Html\Iface Sub-client object |
| 159 | 159 | */ |
| 160 | - public function getSubClient( $type, $name = null ) |
|
| 160 | + public function getSubClient($type, $name = null) |
|
| 161 | 161 | { |
| 162 | 162 | /** client/html/checkout/confirm/order/coupon/decorators/excludes |
| 163 | 163 | * Excludes decorators added by the "common" option from the checkout confirm order coupon html client |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * @see client/html/checkout/confirm/order/coupon/decorators/global |
| 234 | 234 | */ |
| 235 | 235 | |
| 236 | - return $this->createSubClient( 'checkout/confirm/order/coupon/' . $type, $name ); |
|
| 236 | + return $this->createSubClient('checkout/confirm/order/coupon/'.$type, $name); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | |
@@ -244,6 +244,6 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | protected function getSubClientNames() |
| 246 | 246 | { |
| 247 | - return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames ); |
|
| 247 | + return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames); |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | 250 | \ No newline at end of file |
@@ -66,13 +66,13 @@ discard block |
||
| 66 | 66 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 67 | 67 | * @return string HTML code |
| 68 | 68 | */ |
| 69 | - public function getBody( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 69 | + public function getBody($uid = '', array &$tags = array(), &$expire = null) |
|
| 70 | 70 | { |
| 71 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 71 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 72 | 72 | |
| 73 | 73 | $html = ''; |
| 74 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 75 | - $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
|
| 74 | + foreach ($this->getSubClients() as $subclient) { |
|
| 75 | + $html .= $subclient->setView($view)->getBody($uid, $tags, $expire); |
|
| 76 | 76 | } |
| 77 | 77 | $view->detailBody = $html; |
| 78 | 78 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $tplconf = 'client/html/checkout/confirm/order/detail/standard/template-body'; |
| 101 | 101 | $default = 'common/summary/detail-body-default.php'; |
| 102 | 102 | |
| 103 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 103 | + return $view->render($view->config($tplconf, $default)); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | |
@@ -112,13 +112,13 @@ discard block |
||
| 112 | 112 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 113 | 113 | * @return string|null String including HTML tags for the header on error |
| 114 | 114 | */ |
| 115 | - public function getHeader( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 115 | + public function getHeader($uid = '', array &$tags = array(), &$expire = null) |
|
| 116 | 116 | { |
| 117 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 117 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 118 | 118 | |
| 119 | 119 | $html = ''; |
| 120 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 121 | - $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
|
| 120 | + foreach ($this->getSubClients() as $subclient) { |
|
| 121 | + $html .= $subclient->setView($view)->getHeader($uid, $tags, $expire); |
|
| 122 | 122 | } |
| 123 | 123 | $view->detailHeader = $html; |
| 124 | 124 | |
@@ -147,7 +147,7 @@ discard block |
||
| 147 | 147 | $tplconf = 'client/html/checkout/confirm/order/detail/standard/template-header'; |
| 148 | 148 | $default = 'common/summary/detail-header-default.php'; |
| 149 | 149 | |
| 150 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 150 | + return $view->render($view->config($tplconf, $default)); |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | |
@@ -158,7 +158,7 @@ discard block |
||
| 158 | 158 | * @param string|null $name Name of the sub-client (Default if null) |
| 159 | 159 | * @return \Aimeos\Client\Html\Iface Sub-client object |
| 160 | 160 | */ |
| 161 | - public function getSubClient( $type, $name = null ) |
|
| 161 | + public function getSubClient($type, $name = null) |
|
| 162 | 162 | { |
| 163 | 163 | /** client/html/checkout/confirm/order/detail/decorators/excludes |
| 164 | 164 | * Excludes decorators added by the "common" option from the checkout confirm order detail html client |
@@ -234,7 +234,7 @@ discard block |
||
| 234 | 234 | * @see client/html/checkout/confirm/order/detail/decorators/global |
| 235 | 235 | */ |
| 236 | 236 | |
| 237 | - return $this->createSubClient( 'checkout/confirm/order/detail/' . $type, $name ); |
|
| 237 | + return $this->createSubClient('checkout/confirm/order/detail/'.$type, $name); |
|
| 238 | 238 | } |
| 239 | 239 | |
| 240 | 240 | |
@@ -245,7 +245,7 @@ discard block |
||
| 245 | 245 | */ |
| 246 | 246 | protected function getSubClientNames() |
| 247 | 247 | { |
| 248 | - return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames ); |
|
| 248 | + return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames); |
|
| 249 | 249 | } |
| 250 | 250 | |
| 251 | 251 | |
@@ -257,17 +257,17 @@ discard block |
||
| 257 | 257 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 258 | 258 | * @return \Aimeos\MW\View\Iface Modified view object |
| 259 | 259 | */ |
| 260 | - protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null ) |
|
| 260 | + protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null) |
|
| 261 | 261 | { |
| 262 | - if( !isset( $this->cache ) ) |
|
| 262 | + if (!isset($this->cache)) |
|
| 263 | 263 | { |
| 264 | - $view = parent::setViewParams( $view ); |
|
| 264 | + $view = parent::setViewParams($view); |
|
| 265 | 265 | |
| 266 | - if( $view->confirmOrderItem->getPaymentStatus() >= $this->getDownloadPaymentStatus() ) { |
|
| 266 | + if ($view->confirmOrderItem->getPaymentStatus() >= $this->getDownloadPaymentStatus()) { |
|
| 267 | 267 | $view->summaryShowDownloadAttributes = true; |
| 268 | 268 | } |
| 269 | 269 | |
| 270 | - $view->summaryTaxRates = $this->getTaxRates( $view->summaryBasket ); |
|
| 270 | + $view->summaryTaxRates = $this->getTaxRates($view->summaryBasket); |
|
| 271 | 271 | |
| 272 | 272 | $this->cache = $view; |
| 273 | 273 | } |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | * @since 2015.02 |
| 100 | 100 | * @category Developer |
| 101 | 101 | */ |
| 102 | - private $subPartNames = array( 'address', 'service', 'coupon', 'detail' ); |
|
| 102 | + private $subPartNames = array('address', 'service', 'coupon', 'detail'); |
|
| 103 | 103 | |
| 104 | 104 | private $cache; |
| 105 | 105 | |
@@ -112,14 +112,14 @@ discard block |
||
| 112 | 112 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 113 | 113 | * @return string HTML code |
| 114 | 114 | */ |
| 115 | - public function getBody( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 115 | + public function getBody($uid = '', array &$tags = array(), &$expire = null) |
|
| 116 | 116 | { |
| 117 | 117 | $view = $this->getView(); |
| 118 | - $view = $this->setViewParams( $view, $tags, $expire ); |
|
| 118 | + $view = $this->setViewParams($view, $tags, $expire); |
|
| 119 | 119 | |
| 120 | 120 | $html = ''; |
| 121 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 122 | - $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
|
| 121 | + foreach ($this->getSubClients() as $subclient) { |
|
| 122 | + $html .= $subclient->setView($view)->getBody($uid, $tags, $expire); |
|
| 123 | 123 | } |
| 124 | 124 | $view->orderBody = $html; |
| 125 | 125 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $tplconf = 'client/html/checkout/confirm/order/standard/template-body'; |
| 147 | 147 | $default = 'checkout/confirm/order-body-default.php'; |
| 148 | 148 | |
| 149 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 149 | + return $view->render($view->config($tplconf, $default)); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | |
@@ -158,14 +158,14 @@ discard block |
||
| 158 | 158 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 159 | 159 | * @return string|null String including HTML tags for the header on error |
| 160 | 160 | */ |
| 161 | - public function getHeader( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 161 | + public function getHeader($uid = '', array &$tags = array(), &$expire = null) |
|
| 162 | 162 | { |
| 163 | 163 | $view = $this->getView(); |
| 164 | - $view = $this->setViewParams( $view, $tags, $expire ); |
|
| 164 | + $view = $this->setViewParams($view, $tags, $expire); |
|
| 165 | 165 | |
| 166 | 166 | $html = ''; |
| 167 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 168 | - $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
|
| 167 | + foreach ($this->getSubClients() as $subclient) { |
|
| 168 | + $html .= $subclient->setView($view)->getHeader($uid, $tags, $expire); |
|
| 169 | 169 | } |
| 170 | 170 | $view->orderHeader = $html; |
| 171 | 171 | |
@@ -193,7 +193,7 @@ discard block |
||
| 193 | 193 | $tplconf = 'client/html/checkout/confirm/order/standard/template-header'; |
| 194 | 194 | $default = 'checkout/confirm/order-header-default.php'; |
| 195 | 195 | |
| 196 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 196 | + return $view->render($view->config($tplconf, $default)); |
|
| 197 | 197 | } |
| 198 | 198 | |
| 199 | 199 | |
@@ -204,7 +204,7 @@ discard block |
||
| 204 | 204 | * @param string|null $name Name of the sub-client (Default if null) |
| 205 | 205 | * @return \Aimeos\Client\Html\Iface Sub-client object |
| 206 | 206 | */ |
| 207 | - public function getSubClient( $type, $name = null ) |
|
| 207 | + public function getSubClient($type, $name = null) |
|
| 208 | 208 | { |
| 209 | 209 | /** client/html/checkout/confirm/order/decorators/excludes |
| 210 | 210 | * Excludes decorators added by the "common" option from the checkout confirm order html client |
@@ -280,7 +280,7 @@ discard block |
||
| 280 | 280 | * @see client/html/checkout/confirm/order/decorators/global |
| 281 | 281 | */ |
| 282 | 282 | |
| 283 | - return $this->createSubClient( 'checkout/confirm/order/' . $type, $name ); |
|
| 283 | + return $this->createSubClient('checkout/confirm/order/'.$type, $name); |
|
| 284 | 284 | } |
| 285 | 285 | |
| 286 | 286 | |
@@ -291,7 +291,7 @@ discard block |
||
| 291 | 291 | */ |
| 292 | 292 | protected function getSubClientNames() |
| 293 | 293 | { |
| 294 | - return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames ); |
|
| 294 | + return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames); |
|
| 295 | 295 | } |
| 296 | 296 | |
| 297 | 297 | |
@@ -303,16 +303,16 @@ discard block |
||
| 303 | 303 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 304 | 304 | * @return \Aimeos\MW\View\Iface Modified view object |
| 305 | 305 | */ |
| 306 | - protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null ) |
|
| 306 | + protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null) |
|
| 307 | 307 | { |
| 308 | - if( !isset( $this->cache ) ) |
|
| 308 | + if (!isset($this->cache)) |
|
| 309 | 309 | { |
| 310 | - if( isset( $view->confirmOrderItem ) ) |
|
| 310 | + if (isset($view->confirmOrderItem)) |
|
| 311 | 311 | { |
| 312 | 312 | $context = $this->getContext(); |
| 313 | - $manager = \Aimeos\MShop\Factory::createManager( $context, 'order/base' ); |
|
| 313 | + $manager = \Aimeos\MShop\Factory::createManager($context, 'order/base'); |
|
| 314 | 314 | |
| 315 | - $view->summaryBasket = $manager->load( $view->confirmOrderItem->getBaseId() ); |
|
| 315 | + $view->summaryBasket = $manager->load($view->confirmOrderItem->getBaseId()); |
|
| 316 | 316 | } |
| 317 | 317 | |
| 318 | 318 | $this->cache = $view; |
@@ -65,13 +65,13 @@ discard block |
||
| 65 | 65 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 66 | 66 | * @return string HTML code |
| 67 | 67 | */ |
| 68 | - public function getBody( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 68 | + public function getBody($uid = '', array &$tags = array(), &$expire = null) |
|
| 69 | 69 | { |
| 70 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 70 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 71 | 71 | |
| 72 | 72 | $html = ''; |
| 73 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 74 | - $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
|
| 73 | + foreach ($this->getSubClients() as $subclient) { |
|
| 74 | + $html .= $subclient->setView($view)->getBody($uid, $tags, $expire); |
|
| 75 | 75 | } |
| 76 | 76 | $view->addressBody = $html; |
| 77 | 77 | |
@@ -99,7 +99,7 @@ discard block |
||
| 99 | 99 | $tplconf = 'client/html/checkout/confirm/order/address/standard/template-body'; |
| 100 | 100 | $default = 'common/summary/address-body-default.php'; |
| 101 | 101 | |
| 102 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 102 | + return $view->render($view->config($tplconf, $default)); |
|
| 103 | 103 | } |
| 104 | 104 | |
| 105 | 105 | |
@@ -111,13 +111,13 @@ discard block |
||
| 111 | 111 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 112 | 112 | * @return string|null String including HTML tags for the header on error |
| 113 | 113 | */ |
| 114 | - public function getHeader( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 114 | + public function getHeader($uid = '', array &$tags = array(), &$expire = null) |
|
| 115 | 115 | { |
| 116 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 116 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 117 | 117 | |
| 118 | 118 | $html = ''; |
| 119 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 120 | - $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
|
| 119 | + foreach ($this->getSubClients() as $subclient) { |
|
| 120 | + $html .= $subclient->setView($view)->getHeader($uid, $tags, $expire); |
|
| 121 | 121 | } |
| 122 | 122 | $view->addressHeader = $html; |
| 123 | 123 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $tplconf = 'client/html/checkout/confirm/order/address/standard/template-header'; |
| 147 | 147 | $default = 'common/summary/address-header-default.php'; |
| 148 | 148 | |
| 149 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 149 | + return $view->render($view->config($tplconf, $default)); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * @param string|null $name Name of the sub-client (Default if null) |
| 158 | 158 | * @return \Aimeos\Client\Html\Iface Sub-client object |
| 159 | 159 | */ |
| 160 | - public function getSubClient( $type, $name = null ) |
|
| 160 | + public function getSubClient($type, $name = null) |
|
| 161 | 161 | { |
| 162 | 162 | /** client/html/checkout/confirm/order/address/decorators/excludes |
| 163 | 163 | * Excludes decorators added by the "common" option from the checkout confirm order address html client |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * @see client/html/checkout/confirm/order/address/decorators/global |
| 234 | 234 | */ |
| 235 | 235 | |
| 236 | - return $this->createSubClient( 'checkout/confirm/order/address/' . $type, $name ); |
|
| 236 | + return $this->createSubClient('checkout/confirm/order/address/'.$type, $name); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | |
@@ -244,6 +244,6 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | protected function getSubClientNames() |
| 246 | 246 | { |
| 247 | - return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames ); |
|
| 247 | + return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames); |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | 250 | \ No newline at end of file |
@@ -31,7 +31,7 @@ discard block |
||
| 31 | 31 | * @return \Aimeos\Client\Html\Iface Filter part implementing \Aimeos\Client\Html\Iface |
| 32 | 32 | * @throws \Aimeos\Client\Html\Exception If requested client implementation couldn't be found or initialisation fails |
| 33 | 33 | */ |
| 34 | - public static function createClient( \Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null ) |
|
| 34 | + public static function createClient(\Aimeos\MShop\Context\Item\Iface $context, array $templatePaths, $name = null) |
|
| 35 | 35 | { |
| 36 | 36 | /** client/html/checkout/confirm/name |
| 37 | 37 | * Class name of the used checkout confirm client implementation |
@@ -66,22 +66,22 @@ discard block |
||
| 66 | 66 | * @since 2014.03 |
| 67 | 67 | * @category Developer |
| 68 | 68 | */ |
| 69 | - if( $name === null ) { |
|
| 70 | - $name = $context->getConfig()->get( 'client/html/checkout/confirm/name', 'Standard' ); |
|
| 69 | + if ($name === null) { |
|
| 70 | + $name = $context->getConfig()->get('client/html/checkout/confirm/name', 'Standard'); |
|
| 71 | 71 | } |
| 72 | 72 | |
| 73 | - if( ctype_alnum( $name ) === false ) |
|
| 73 | + if (ctype_alnum($name) === false) |
|
| 74 | 74 | { |
| 75 | - $classname = is_string( $name ) ? '\\Aimeos\\Client\\Html\\Checkout\\Confirm\\' . $name : '<not a string>'; |
|
| 76 | - throw new \Aimeos\Client\Html\Exception( sprintf( 'Invalid characters in class name "%1$s"', $classname ) ); |
|
| 75 | + $classname = is_string($name) ? '\\Aimeos\\Client\\Html\\Checkout\\Confirm\\'.$name : '<not a string>'; |
|
| 76 | + throw new \Aimeos\Client\Html\Exception(sprintf('Invalid characters in class name "%1$s"', $classname)); |
|
| 77 | 77 | } |
| 78 | 78 | |
| 79 | 79 | $iface = '\\Aimeos\\Client\\Html\\Iface'; |
| 80 | - $classname = '\\Aimeos\\Client\\Html\\Checkout\\Confirm\\' . $name; |
|
| 80 | + $classname = '\\Aimeos\\Client\\Html\\Checkout\\Confirm\\'.$name; |
|
| 81 | 81 | |
| 82 | - $client = self::createClientBase( $context, $classname, $iface, $templatePaths ); |
|
| 82 | + $client = self::createClientBase($context, $classname, $iface, $templatePaths); |
|
| 83 | 83 | |
| 84 | - return self::addClientDecorators( $context, $client, $templatePaths, 'checkout/confirm' ); |
|
| 84 | + return self::addClientDecorators($context, $client, $templatePaths, 'checkout/confirm'); |
|
| 85 | 85 | } |
| 86 | 86 | } |
| 87 | 87 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | * @since 2015.02 |
| 101 | 101 | * @category Developer |
| 102 | 102 | */ |
| 103 | - private $subPartNames = array( 'intro', 'basic', 'retry', 'order' ); |
|
| 103 | + private $subPartNames = array('intro', 'basic', 'retry', 'order'); |
|
| 104 | 104 | private $cache; |
| 105 | 105 | |
| 106 | 106 | |
@@ -112,42 +112,42 @@ discard block |
||
| 112 | 112 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 113 | 113 | * @return string HTML code |
| 114 | 114 | */ |
| 115 | - public function getBody( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 115 | + public function getBody($uid = '', array &$tags = array(), &$expire = null) |
|
| 116 | 116 | { |
| 117 | 117 | $context = $this->getContext(); |
| 118 | 118 | $view = $this->getView(); |
| 119 | 119 | |
| 120 | 120 | try |
| 121 | 121 | { |
| 122 | - $view = $this->setViewParams( $view, $tags, $expire ); |
|
| 122 | + $view = $this->setViewParams($view, $tags, $expire); |
|
| 123 | 123 | |
| 124 | 124 | $html = ''; |
| 125 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 126 | - $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
|
| 125 | + foreach ($this->getSubClients() as $subclient) { |
|
| 126 | + $html .= $subclient->setView($view)->getBody($uid, $tags, $expire); |
|
| 127 | 127 | } |
| 128 | 128 | $view->confirmBody = $html; |
| 129 | 129 | } |
| 130 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 130 | + catch (\Aimeos\Client\Html\Exception $e) |
|
| 131 | 131 | { |
| 132 | - $error = array( $this->getContext()->getI18n()->dt( 'client', $e->getMessage() ) ); |
|
| 133 | - $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error; |
|
| 132 | + $error = array($this->getContext()->getI18n()->dt('client', $e->getMessage())); |
|
| 133 | + $view->confirmErrorList = $view->get('confirmErrorList', array()) + $error; |
|
| 134 | 134 | } |
| 135 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 135 | + catch (\Aimeos\Controller\Frontend\Exception $e) |
|
| 136 | 136 | { |
| 137 | - $error = array( $this->getContext()->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
|
| 138 | - $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error; |
|
| 137 | + $error = array($this->getContext()->getI18n()->dt('controller/frontend', $e->getMessage())); |
|
| 138 | + $view->confirmErrorList = $view->get('confirmErrorList', array()) + $error; |
|
| 139 | 139 | } |
| 140 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 140 | + catch (\Aimeos\MShop\Exception $e) |
|
| 141 | 141 | { |
| 142 | - $error = array( $this->getContext()->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
|
| 143 | - $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error; |
|
| 142 | + $error = array($this->getContext()->getI18n()->dt('mshop', $e->getMessage())); |
|
| 143 | + $view->confirmErrorList = $view->get('confirmErrorList', array()) + $error; |
|
| 144 | 144 | } |
| 145 | - catch( \Exception $e ) |
|
| 145 | + catch (\Exception $e) |
|
| 146 | 146 | { |
| 147 | - $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
|
| 147 | + $context->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString()); |
|
| 148 | 148 | |
| 149 | - $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
|
| 150 | - $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error; |
|
| 149 | + $error = array($context->getI18n()->dt('client', 'A non-recoverable error occured')); |
|
| 150 | + $view->confirmErrorList = $view->get('confirmErrorList', array()) + $error; |
|
| 151 | 151 | } |
| 152 | 152 | |
| 153 | 153 | /** client/html/checkout/confirm/standard/template-body |
@@ -173,7 +173,7 @@ discard block |
||
| 173 | 173 | $tplconf = 'client/html/checkout/confirm/standard/template-body'; |
| 174 | 174 | $default = 'checkout/confirm/body-default.php'; |
| 175 | 175 | |
| 176 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 176 | + return $view->render($view->config($tplconf, $default)); |
|
| 177 | 177 | } |
| 178 | 178 | |
| 179 | 179 | |
@@ -185,15 +185,15 @@ discard block |
||
| 185 | 185 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 186 | 186 | * @return string|null String including HTML tags for the header on error |
| 187 | 187 | */ |
| 188 | - public function getHeader( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 188 | + public function getHeader($uid = '', array &$tags = array(), &$expire = null) |
|
| 189 | 189 | { |
| 190 | 190 | try |
| 191 | 191 | { |
| 192 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 192 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 193 | 193 | |
| 194 | 194 | $html = ''; |
| 195 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 196 | - $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
|
| 195 | + foreach ($this->getSubClients() as $subclient) { |
|
| 196 | + $html .= $subclient->setView($view)->getHeader($uid, $tags, $expire); |
|
| 197 | 197 | } |
| 198 | 198 | $view->confirmHeader = $html; |
| 199 | 199 | |
@@ -221,11 +221,11 @@ discard block |
||
| 221 | 221 | $tplconf = 'client/html/checkout/confirm/standard/template-header'; |
| 222 | 222 | $default = 'checkout/confirm/header-default.php'; |
| 223 | 223 | |
| 224 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 224 | + return $view->render($view->config($tplconf, $default)); |
|
| 225 | 225 | } |
| 226 | - catch( \Exception $e ) |
|
| 226 | + catch (\Exception $e) |
|
| 227 | 227 | { |
| 228 | - $this->getContext()->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
|
| 228 | + $this->getContext()->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString()); |
|
| 229 | 229 | } |
| 230 | 230 | } |
| 231 | 231 | |
@@ -237,7 +237,7 @@ discard block |
||
| 237 | 237 | * @param string|null $name Name of the sub-client (Default if null) |
| 238 | 238 | * @return \Aimeos\Client\Html\Iface Sub-client object |
| 239 | 239 | */ |
| 240 | - public function getSubClient( $type, $name = null ) |
|
| 240 | + public function getSubClient($type, $name = null) |
|
| 241 | 241 | { |
| 242 | 242 | /** client/html/checkout/confirm/decorators/excludes |
| 243 | 243 | * Excludes decorators added by the "common" option from the checkout confirm html client |
@@ -313,7 +313,7 @@ discard block |
||
| 313 | 313 | * @see client/html/checkout/confirm/decorators/global |
| 314 | 314 | */ |
| 315 | 315 | |
| 316 | - return $this->createSubClient( 'checkout/confirm/' . $type, $name ); |
|
| 316 | + return $this->createSubClient('checkout/confirm/'.$type, $name); |
|
| 317 | 317 | } |
| 318 | 318 | |
| 319 | 319 | |
@@ -327,14 +327,14 @@ discard block |
||
| 327 | 327 | $view = $this->getView(); |
| 328 | 328 | $context = $this->getContext(); |
| 329 | 329 | $session = $context->getSession(); |
| 330 | - $orderid = $session->get( 'aimeos/orderid' ); |
|
| 330 | + $orderid = $session->get('aimeos/orderid'); |
|
| 331 | 331 | |
| 332 | 332 | try |
| 333 | 333 | { |
| 334 | - if( ( $orderItem = $this->updatePayment( $view, $orderid ) ) === null ) |
|
| 334 | + if (($orderItem = $this->updatePayment($view, $orderid)) === null) |
|
| 335 | 335 | { |
| 336 | - $orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
| 337 | - $orderItem = $orderManager->getItem( $orderid ); |
|
| 336 | + $orderManager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
| 337 | + $orderItem = $orderManager->getItem($orderid); |
|
| 338 | 338 | } |
| 339 | 339 | |
| 340 | 340 | $view->confirmOrderItem = $orderItem; |
@@ -343,39 +343,39 @@ discard block |
||
| 343 | 343 | parent::process(); |
| 344 | 344 | |
| 345 | 345 | |
| 346 | - if( $orderItem->getPaymentStatus() > \Aimeos\MShop\Order\Item\Base::PAY_REFUSED ) |
|
| 346 | + if ($orderItem->getPaymentStatus() > \Aimeos\MShop\Order\Item\Base::PAY_REFUSED) |
|
| 347 | 347 | { |
| 348 | - foreach( $session->get( 'aimeos/basket/cache', array() ) as $key => $value ) { |
|
| 349 | - $session->set( $key, null ); |
|
| 348 | + foreach ($session->get('aimeos/basket/cache', array()) as $key => $value) { |
|
| 349 | + $session->set($key, null); |
|
| 350 | 350 | } |
| 351 | 351 | |
| 352 | - \Aimeos\Controller\Frontend\Factory::createController( $context, 'basket' )->clear(); |
|
| 352 | + \Aimeos\Controller\Frontend\Factory::createController($context, 'basket')->clear(); |
|
| 353 | 353 | } |
| 354 | 354 | |
| 355 | 355 | // Update stock, coupons, etc. |
| 356 | - \Aimeos\Controller\Frontend\Factory::createController( $context, 'order' )->update( $orderItem ); |
|
| 356 | + \Aimeos\Controller\Frontend\Factory::createController($context, 'order')->update($orderItem); |
|
| 357 | 357 | } |
| 358 | - catch( \Aimeos\Client\Html\Exception $e ) |
|
| 358 | + catch (\Aimeos\Client\Html\Exception $e) |
|
| 359 | 359 | { |
| 360 | - $error = array( $context->getI18n()->dt( 'client', $e->getMessage() ) ); |
|
| 361 | - $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error; |
|
| 360 | + $error = array($context->getI18n()->dt('client', $e->getMessage())); |
|
| 361 | + $view->confirmErrorList = $view->get('confirmErrorList', array()) + $error; |
|
| 362 | 362 | } |
| 363 | - catch( \Aimeos\Controller\Frontend\Exception $e ) |
|
| 363 | + catch (\Aimeos\Controller\Frontend\Exception $e) |
|
| 364 | 364 | { |
| 365 | - $error = array( $context->getI18n()->dt( 'controller/frontend', $e->getMessage() ) ); |
|
| 366 | - $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error; |
|
| 365 | + $error = array($context->getI18n()->dt('controller/frontend', $e->getMessage())); |
|
| 366 | + $view->confirmErrorList = $view->get('confirmErrorList', array()) + $error; |
|
| 367 | 367 | } |
| 368 | - catch( \Aimeos\MShop\Exception $e ) |
|
| 368 | + catch (\Aimeos\MShop\Exception $e) |
|
| 369 | 369 | { |
| 370 | - $error = array( $context->getI18n()->dt( 'mshop', $e->getMessage() ) ); |
|
| 371 | - $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error; |
|
| 370 | + $error = array($context->getI18n()->dt('mshop', $e->getMessage())); |
|
| 371 | + $view->confirmErrorList = $view->get('confirmErrorList', array()) + $error; |
|
| 372 | 372 | } |
| 373 | - catch( \Exception $e ) |
|
| 373 | + catch (\Exception $e) |
|
| 374 | 374 | { |
| 375 | - $context->getLogger()->log( $e->getMessage() . PHP_EOL . $e->getTraceAsString() ); |
|
| 375 | + $context->getLogger()->log($e->getMessage().PHP_EOL.$e->getTraceAsString()); |
|
| 376 | 376 | |
| 377 | - $error = array( $context->getI18n()->dt( 'client', 'A non-recoverable error occured' ) ); |
|
| 378 | - $view->confirmErrorList = $view->get( 'confirmErrorList', array() ) + $error; |
|
| 377 | + $error = array($context->getI18n()->dt('client', 'A non-recoverable error occured')); |
|
| 378 | + $view->confirmErrorList = $view->get('confirmErrorList', array()) + $error; |
|
| 379 | 379 | } |
| 380 | 380 | } |
| 381 | 381 | |
@@ -387,26 +387,26 @@ discard block |
||
| 387 | 387 | * @throws \Aimeos\Client\Html\Exception If no payment service item could be found |
| 388 | 388 | * @return \Aimeos\MShop\Service\Provider\Iface Service provider object |
| 389 | 389 | */ |
| 390 | - protected function getServiceProvider( $code ) |
|
| 390 | + protected function getServiceProvider($code) |
|
| 391 | 391 | { |
| 392 | - $serviceManager = \Aimeos\MShop\Factory::createManager( $this->getContext(), 'service' ); |
|
| 392 | + $serviceManager = \Aimeos\MShop\Factory::createManager($this->getContext(), 'service'); |
|
| 393 | 393 | |
| 394 | 394 | $search = $serviceManager->createSearch(); |
| 395 | 395 | $expr = array( |
| 396 | - $search->compare( '==', 'service.code', $code ), |
|
| 397 | - $search->compare( '==', 'service.type.code', 'payment' ), |
|
| 396 | + $search->compare('==', 'service.code', $code), |
|
| 397 | + $search->compare('==', 'service.type.code', 'payment'), |
|
| 398 | 398 | ); |
| 399 | - $search->setConditions( $search->combine( '&&', $expr ) ); |
|
| 399 | + $search->setConditions($search->combine('&&', $expr)); |
|
| 400 | 400 | |
| 401 | - $result = $serviceManager->searchItems( $search ); |
|
| 401 | + $result = $serviceManager->searchItems($search); |
|
| 402 | 402 | |
| 403 | - if( ( $serviceItem = reset( $result ) ) === false ) |
|
| 403 | + if (($serviceItem = reset($result)) === false) |
|
| 404 | 404 | { |
| 405 | - $msg = sprintf( 'No service for code "%1$s" found', $code ); |
|
| 406 | - throw new \Aimeos\Client\Html\Exception( $msg ); |
|
| 405 | + $msg = sprintf('No service for code "%1$s" found', $code); |
|
| 406 | + throw new \Aimeos\Client\Html\Exception($msg); |
|
| 407 | 407 | } |
| 408 | 408 | |
| 409 | - return $serviceManager->getProvider( $serviceItem ); |
|
| 409 | + return $serviceManager->getProvider($serviceItem); |
|
| 410 | 410 | } |
| 411 | 411 | |
| 412 | 412 | |
@@ -417,7 +417,7 @@ discard block |
||
| 417 | 417 | */ |
| 418 | 418 | protected function getSubClientNames() |
| 419 | 419 | { |
| 420 | - return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames ); |
|
| 420 | + return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames); |
|
| 421 | 421 | } |
| 422 | 422 | |
| 423 | 423 | |
@@ -429,14 +429,14 @@ discard block |
||
| 429 | 429 | * @param array $config Default URL configuration |
| 430 | 430 | * @return string URL string |
| 431 | 431 | */ |
| 432 | - protected function getUrlConfirm( \Aimeos\MW\View\Iface $view, array $params, array $config ) |
|
| 432 | + protected function getUrlConfirm(\Aimeos\MW\View\Iface $view, array $params, array $config) |
|
| 433 | 433 | { |
| 434 | - $target = $view->config( 'client/html/checkout/confirm/url/target' ); |
|
| 435 | - $cntl = $view->config( 'client/html/checkout/confirm/url/controller', 'checkout' ); |
|
| 436 | - $action = $view->config( 'client/html/checkout/confirm/url/action', 'confirm' ); |
|
| 437 | - $config = $view->config( 'client/html/checkout/confirm/url/config', $config ); |
|
| 434 | + $target = $view->config('client/html/checkout/confirm/url/target'); |
|
| 435 | + $cntl = $view->config('client/html/checkout/confirm/url/controller', 'checkout'); |
|
| 436 | + $action = $view->config('client/html/checkout/confirm/url/action', 'confirm'); |
|
| 437 | + $config = $view->config('client/html/checkout/confirm/url/config', $config); |
|
| 438 | 438 | |
| 439 | - return $view->url( $target, $cntl, $action, $params, array(), $config ); |
|
| 439 | + return $view->url($target, $cntl, $action, $params, array(), $config); |
|
| 440 | 440 | } |
| 441 | 441 | |
| 442 | 442 | |
@@ -448,14 +448,14 @@ discard block |
||
| 448 | 448 | * @param array $config Default URL configuration |
| 449 | 449 | * @return string URL string |
| 450 | 450 | */ |
| 451 | - protected function getUrlUpdate( \Aimeos\MW\View\Iface $view, array $params, array $config ) |
|
| 451 | + protected function getUrlUpdate(\Aimeos\MW\View\Iface $view, array $params, array $config) |
|
| 452 | 452 | { |
| 453 | - $target = $view->config( 'client/html/checkout/update/url/target' ); |
|
| 454 | - $cntl = $view->config( 'client/html/checkout/update/url/controller', 'checkout' ); |
|
| 455 | - $action = $view->config( 'client/html/checkout/update/url/action', 'update' ); |
|
| 456 | - $config = $view->config( 'client/html/checkout/update/url/config', $config ); |
|
| 453 | + $target = $view->config('client/html/checkout/update/url/target'); |
|
| 454 | + $cntl = $view->config('client/html/checkout/update/url/controller', 'checkout'); |
|
| 455 | + $action = $view->config('client/html/checkout/update/url/action', 'update'); |
|
| 456 | + $config = $view->config('client/html/checkout/update/url/config', $config); |
|
| 457 | 457 | |
| 458 | - return $view->url( $target, $cntl, $action, $params, array(), $config ); |
|
| 458 | + return $view->url($target, $cntl, $action, $params, array(), $config); |
|
| 459 | 459 | } |
| 460 | 460 | |
| 461 | 461 | |
@@ -467,17 +467,17 @@ discard block |
||
| 467 | 467 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 468 | 468 | * @return \Aimeos\MW\View\Iface Modified view object |
| 469 | 469 | */ |
| 470 | - protected function setViewParams( \Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null ) |
|
| 470 | + protected function setViewParams(\Aimeos\MW\View\Iface $view, array &$tags = array(), &$expire = null) |
|
| 471 | 471 | { |
| 472 | - if( !isset( $this->cache ) ) |
|
| 472 | + if (!isset($this->cache)) |
|
| 473 | 473 | { |
| 474 | - if( !isset( $view->confirmOrderItem ) ) |
|
| 474 | + if (!isset($view->confirmOrderItem)) |
|
| 475 | 475 | { |
| 476 | 476 | $context = $this->getContext(); |
| 477 | - $orderid = $context->getSession()->get( 'aimeos/orderid' ); |
|
| 478 | - $orderManager = \Aimeos\MShop\Factory::createManager( $context, 'order' ); |
|
| 477 | + $orderid = $context->getSession()->get('aimeos/orderid'); |
|
| 478 | + $orderManager = \Aimeos\MShop\Factory::createManager($context, 'order'); |
|
| 479 | 479 | |
| 480 | - $view->confirmOrderItem = $orderManager->getItem( $orderid ); |
|
| 480 | + $view->confirmOrderItem = $orderManager->getItem($orderid); |
|
| 481 | 481 | } |
| 482 | 482 | |
| 483 | 483 | $this->cache = $view; |
@@ -494,32 +494,32 @@ discard block |
||
| 494 | 494 | * @param string $orderid ID of the order whose payment status should be updated |
| 495 | 495 | * @return void|\Aimeos\MShop\Order\Item\Iface Order item that has been updated |
| 496 | 496 | */ |
| 497 | - protected function updatePayment( \Aimeos\MW\View\Iface $view, $orderid ) |
|
| 497 | + protected function updatePayment(\Aimeos\MW\View\Iface $view, $orderid) |
|
| 498 | 498 | { |
| 499 | - if( ( $code = $view->param( 'code' ) ) === null ) { |
|
| 499 | + if (($code = $view->param('code')) === null) { |
|
| 500 | 500 | return; |
| 501 | 501 | } |
| 502 | 502 | |
| 503 | - $provider = $this->getServiceProvider( $code ); |
|
| 503 | + $provider = $this->getServiceProvider($code); |
|
| 504 | 504 | |
| 505 | - $config = array( 'absoluteUri' => true, 'namespace' => false ); |
|
| 506 | - $params = array( 'code' => $code, 'orderid' => $orderid ); |
|
| 505 | + $config = array('absoluteUri' => true, 'namespace' => false); |
|
| 506 | + $params = array('code' => $code, 'orderid' => $orderid); |
|
| 507 | 507 | $urls = array( |
| 508 | - 'payment.url-success' => $this->getUrlConfirm( $view, $params, $config ), |
|
| 509 | - 'payment.url-update' => $this->getUrlUpdate( $view, $params, $config ), |
|
| 508 | + 'payment.url-success' => $this->getUrlConfirm($view, $params, $config), |
|
| 509 | + 'payment.url-update' => $this->getUrlUpdate($view, $params, $config), |
|
| 510 | 510 | 'client.ipaddress' => $view->request()->getClientAddress(), |
| 511 | 511 | ); |
| 512 | 512 | $urls['payment.url-self'] = $urls['payment.url-success']; |
| 513 | - $provider->injectGlobalConfigBE( $urls ); |
|
| 513 | + $provider->injectGlobalConfigBE($urls); |
|
| 514 | 514 | |
| 515 | 515 | $reqParams = $view->param(); |
| 516 | 516 | $reqParams['orderid'] = $orderid; |
| 517 | 517 | |
| 518 | - if( ( $orderItem = $provider->updateSync( $reqParams, $view->request()->getBody() ) ) !== null |
|
| 518 | + if (($orderItem = $provider->updateSync($reqParams, $view->request()->getBody())) !== null |
|
| 519 | 519 | && $orderItem->getPaymentStatus() === \Aimeos\MShop\Order\Item\Base::PAY_UNFINISHED |
| 520 | - && $provider->isImplemented( \Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY ) |
|
| 520 | + && $provider->isImplemented(\Aimeos\MShop\Service\Provider\Payment\Base::FEAT_QUERY) |
|
| 521 | 521 | ) { |
| 522 | - $provider->query( $orderItem ); |
|
| 522 | + $provider->query($orderItem); |
|
| 523 | 523 | } |
| 524 | 524 | |
| 525 | 525 | return $orderItem; |
@@ -67,13 +67,13 @@ discard block |
||
| 67 | 67 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 68 | 68 | * @return string HTML code |
| 69 | 69 | */ |
| 70 | - public function getBody( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 70 | + public function getBody($uid = '', array &$tags = array(), &$expire = null) |
|
| 71 | 71 | { |
| 72 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 72 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 73 | 73 | |
| 74 | 74 | $html = ''; |
| 75 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 76 | - $html .= $subclient->setView( $view )->getBody( $uid, $tags, $expire ); |
|
| 75 | + foreach ($this->getSubClients() as $subclient) { |
|
| 76 | + $html .= $subclient->setView($view)->getBody($uid, $tags, $expire); |
|
| 77 | 77 | } |
| 78 | 78 | $view->basicBody = $html; |
| 79 | 79 | |
@@ -100,7 +100,7 @@ discard block |
||
| 100 | 100 | $tplconf = 'client/html/checkout/confirm/basic/standard/template-body'; |
| 101 | 101 | $default = 'checkout/confirm/basic-body-default.php'; |
| 102 | 102 | |
| 103 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 103 | + return $view->render($view->config($tplconf, $default)); |
|
| 104 | 104 | } |
| 105 | 105 | |
| 106 | 106 | |
@@ -112,13 +112,13 @@ discard block |
||
| 112 | 112 | * @param string|null &$expire Result variable for the expiration date of the output (null for no expiry) |
| 113 | 113 | * @return string|null String including HTML tags for the header on error |
| 114 | 114 | */ |
| 115 | - public function getHeader( $uid = '', array &$tags = array(), &$expire = null ) |
|
| 115 | + public function getHeader($uid = '', array &$tags = array(), &$expire = null) |
|
| 116 | 116 | { |
| 117 | - $view = $this->setViewParams( $this->getView(), $tags, $expire ); |
|
| 117 | + $view = $this->setViewParams($this->getView(), $tags, $expire); |
|
| 118 | 118 | |
| 119 | 119 | $html = ''; |
| 120 | - foreach( $this->getSubClients() as $subclient ) { |
|
| 121 | - $html .= $subclient->setView( $view )->getHeader( $uid, $tags, $expire ); |
|
| 120 | + foreach ($this->getSubClients() as $subclient) { |
|
| 121 | + $html .= $subclient->setView($view)->getHeader($uid, $tags, $expire); |
|
| 122 | 122 | } |
| 123 | 123 | $view->basicHeader = $html; |
| 124 | 124 | |
@@ -146,7 +146,7 @@ discard block |
||
| 146 | 146 | $tplconf = 'client/html/checkout/confirm/basic/standard/template-header'; |
| 147 | 147 | $default = 'checkout/confirm/basic-header-default.php'; |
| 148 | 148 | |
| 149 | - return $view->render( $view->config( $tplconf, $default ) ); |
|
| 149 | + return $view->render($view->config($tplconf, $default)); |
|
| 150 | 150 | } |
| 151 | 151 | |
| 152 | 152 | |
@@ -157,7 +157,7 @@ discard block |
||
| 157 | 157 | * @param string|null $name Name of the sub-client (Default if null) |
| 158 | 158 | * @return \Aimeos\Client\Html\Iface Sub-client object |
| 159 | 159 | */ |
| 160 | - public function getSubClient( $type, $name = null ) |
|
| 160 | + public function getSubClient($type, $name = null) |
|
| 161 | 161 | { |
| 162 | 162 | /** client/html/checkout/confirm/basic/decorators/excludes |
| 163 | 163 | * Excludes decorators added by the "common" option from the checkout confirm basic html client |
@@ -233,7 +233,7 @@ discard block |
||
| 233 | 233 | * @see client/html/checkout/confirm/basic/decorators/global |
| 234 | 234 | */ |
| 235 | 235 | |
| 236 | - return $this->createSubClient( 'checkout/confirm/basic/' . $type, $name ); |
|
| 236 | + return $this->createSubClient('checkout/confirm/basic/'.$type, $name); |
|
| 237 | 237 | } |
| 238 | 238 | |
| 239 | 239 | |
@@ -244,6 +244,6 @@ discard block |
||
| 244 | 244 | */ |
| 245 | 245 | protected function getSubClientNames() |
| 246 | 246 | { |
| 247 | - return $this->getContext()->getConfig()->get( $this->subPartPath, $this->subPartNames ); |
|
| 247 | + return $this->getContext()->getConfig()->get($this->subPartPath, $this->subPartNames); |
|
| 248 | 248 | } |
| 249 | 249 | } |
| 250 | 250 | \ No newline at end of file |