Projekt

Allgemein

Profil

GX-Bug #48756 » JanoLawCheckoutFix.patch

Till Tepelmann, 29.09.2016 11:33

Unterschiede anzeigen:

src/system/classes/orders/SendOrderProcess.inc.php (revision )
44 44

  
45 45
	public function proceed()
46 46
	{
47

  
48
		// CREATE CONTENTVIEW
49
		$coo_send_order_content_view = MainFactory::create_object('SendOrderContentView');
50

  
47 51
		//prevent direct execution
48 52
		if (defined('DIR_FS_CATALOG') == false)
49 53
		{
......
199 203
			if(!empty($t_janolaw_info_html))
200 204
			{
201 205
				$t_janolaw_info_html .= '<br/><br/>AGB<br/><br/>';
202
			$t_janolaw_info_html .= $coo_janolaw->get_page_content('terms', true, true);
206
				$t_janolaw_info_html .= $coo_janolaw->get_page_content('terms', true, true);
207
				$coo_send_order_content_view->set_('janolaw_info_html', $t_janolaw_info_html);
203 208
			}
204 209

  
205 210
			$t_janolaw_info_text  = $coo_janolaw->get_page_content('revocation', false, false);
......
207 212
			{
208 213
				$t_janolaw_info_text .= "\n\nAGB\n\n";
209 214
				$t_janolaw_info_text .= $coo_janolaw->get_page_content('terms', false, false);
215
				$coo_send_order_content_view->set_('janolaw_info_text', $t_janolaw_info_text);
210 216
			}
211 217
		}
212 218
		# JANOLAW END
213 219

  
214
		// CREATE CONTENTVIEW
215
		$coo_send_order_content_view = MainFactory::create_object('SendOrderContentView');
216

  
217 220
		// ASSIGN VARIABLES
218 221
		$coo_send_order_content_view->set_('order', $order);
219 222
		$coo_send_order_content_view->set_('order_id', $this->order_id);
......
226 229
		$coo_send_order_content_view->set_('payment_info_html', $t_payment_info_html);
227 230
		$coo_send_order_content_view->set_('payment_info_text', $t_payment_info_text);
228 231
		$coo_send_order_content_view->set_('mail_logo', $t_mail_logo);
229
		$coo_send_order_content_view->set_('janolaw_info_html', $t_janolaw_info_html);
230
		$coo_send_order_content_view->set_('janolaw_info_text', $t_janolaw_info_text);
232

  
233

  
231 234

  
232 235
		// GET MAIL CONTENTS ARRAY
233 236
		$t_mail_content_array = $coo_send_order_content_view->get_mail_content_array();
    (1-1/1)