← All changes | includes/order_print.php +19 -19 2.11.32 → 2.12.4 View file →

		@@ -158,9 +158,9 @@
158	158	if ( isset( $cart_row['options'] ) && is_array( $cart_row['options'] ) && count( $cart_row['options'] ) > 0 ) {
159	159	foreach ( $cart_row['options'] as $key => $value ) {
160	160	if ( ! empty( $key ) ) {
161	161	$key = urldecode( $key );
162		- $value = maybe_unserialize( $value );
	162	+ $value = wel_safe_maybe_unserialize( $value );
163	163	if ( is_array( $value ) ) {
164	164	$c = '';
165	165	$optstr .= $key . ' = ';
166	166	foreach ( $value as $v ) {
		@@ -396,9 +396,9 @@
396	396	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( usces_get_pdf_name( $data ) ), 0, 'L' );
397	397	$x = $leftside + $width;
398	398	$y = $pdf->GetY() - $lineheight;
399	399	$pdf->SetXY( $x, $y );
400		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor ) ) );
	400	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'customer' ) ) );
401	401	$y = $pdf->GetY() + $lineheight + $linetop + 1;
402	402	$pdf->SetLineWidth( 0.1 );
403	403	$pdf->Line( $leftside, $y, $leftside + $width + 7, $y );
404	404	} else {
		@@ -405,9 +405,9 @@
405	405	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $company ), 0, 'L' );
406	406	$x = $leftside + $width;
407	407	$y = $pdf->GetY() - $lineheight;
408	408	$pdf->SetXY( $x, $y );
409		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor ) ) );
	409	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor, $type, $data, 'customer' ) ) );
410	410	$y = $pdf->GetY() + $lineheight + $linetop;
411	411	$pdf->SetLineWidth( 0.1 );
412	412	$pdf->Line( $leftside, $y, $leftside + $width + 7, $y );
413	413	$y = $pdf->GetY() + $lineheight + $linetop + 1;
		@@ -413,9 +413,9 @@
413	413	$y = $pdf->GetY() + $lineheight + $linetop + 1;
414	414	list( $fontsize, $lineheight, $linetop ) = usces_set_font_size( $fontsizes['customer_attn'] );
415	415	$pdf->SetFont( $font, '', $fontsize );
416	416	$pdf->SetXY( $leftside, $y );
417		- $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor ), $type, $company, $data->order['ID'] );
	417	+ $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'customer' ), $type, $company, $data->order['ID'] );
418	418	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $person ), 0, 'L' );
419	419	$y = $pdf->GetY() + $linetop + 1;
420	420	}
421	421
		@@ -462,9 +462,9 @@
462	462	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( usces_get_pdf_name( $data ) ), 0, 'L' );
463	463	$x = $leftside + $width;
464	464	$y = $pdf->GetY() - $lineheight;
465	465	$pdf->SetXY( $x, $y );
466		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor ) ) );
	466	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'customer' ) ) );
467	467	$y = $pdf->GetY() + $lineheight + $linetop + 2;
468	468	} else {
469	469	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $company ), 0, 'L' );
470	470	$x = $leftside + $width;
		@@ -469,14 +469,14 @@
469	469	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $company ), 0, 'L' );
470	470	$x = $leftside + $width;
471	471	$y = $pdf->GetY() - $lineheight;
472	472	$pdf->SetXY( $x, $y );
473		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor ) ) );
	473	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor, $type, $data, 'customer' ) ) );
474	474	$y = $pdf->GetY() + $lineheight + $linetop;
475	475	list( $fontsize, $lineheight, $linetop ) = usces_set_font_size( $fontsizes['customer_attn'] );
476	476	$pdf->SetFont( $font, '', $fontsize );
477	477	$pdf->SetXY( $leftside, $y );
478		- $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor ), $type, $company, $data->order['ID'] );
	478	+ $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'customer' ), $type, $company, $data->order['ID'] );
479	479	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $person ), 0, 'L' );
480	480	$y = $pdf->GetY() + $linetop + 2;
481	481	}
482	482
		@@ -505,9 +505,9 @@
505	505	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( usces_get_pdf_shipping_name( $data ) ), 0, 'L' );
506	506	$x = $leftside + $width;
507	507	$y = $pdf->GetY() - $lineheight;
508	508	$pdf->SetXY( $x, $y );
509		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor ) ) );
	509	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'delivery' ) ) );
510	510	$y = $pdf->GetY() + $lineheight + $linetop + 2;
511	511	} else {
512	512	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $delivery_company ), 0, 'L' );
513	513	$x = $leftside + $width;
		@@ -512,14 +512,14 @@
512	512	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $delivery_company ), 0, 'L' );
513	513	$x = $leftside + $width;
514	514	$y = $pdf->GetY() - $lineheight;
515	515	$pdf->SetXY( $x, $y );
516		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor ) ) );
	516	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor, $type, $data, 'delivery' ) ) );
517	517	$y = $pdf->GetY() + $lineheight + $linetop;
518	518	list( $fontsize, $lineheight, $linetop ) = usces_set_font_size( $fontsizes['customer_attn'] );
519	519	$pdf->SetFont( $font, '', $fontsize );
520	520	$pdf->SetXY( $leftside, $y );
521		- $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_shipping_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor ), $type, $delivery_company, $data->order['ID'] );
	521	+ $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_shipping_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'delivery' ), $type, $delivery_company, $data->order['ID'] );
522	522	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $person ), 0, 'L' );
523	523	$y = $pdf->GetY() + $linetop + 2;
524	524	}
525	525
		@@ -553,9 +553,9 @@
553	553	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( usces_get_pdf_name( $data ) ), 0, 'L' );
554	554	$x = $leftside + $width;
555	555	$y = $pdf->GetY() - $lineheight;
556	556	$pdf->SetXY( $x, $y );
557		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor ) ) );
	557	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'customer' ) ) );
558	558	$y = $pdf->GetY() + $lineheight + $linetop + 2;
559	559	} else {
560	560	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $company ), 0, 'L' );
561	561	$x = $leftside + $width;
		@@ -560,14 +560,14 @@
560	560	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $company ), 0, 'L' );
561	561	$x = $leftside + $width;
562	562	$y = $pdf->GetY() - $lineheight;
563	563	$pdf->SetXY( $x, $y );
564		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor ) ) );
	564	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor, $type, $data, 'customer' ) ) );
565	565	$y = $pdf->GetY() + $lineheight + $linetop;
566	566	list( $fontsize, $lineheight, $linetop ) = usces_set_font_size( $fontsizes['customer_attn'] );
567	567	$pdf->SetFont( $font, '', $fontsize );
568	568	$pdf->SetXY( $leftside, $y );
569		- $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor ), $type, $company, $data->order['ID'] );
	569	+ $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'customer' ), $type, $company, $data->order['ID'] );
570	570	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $person ), 0, 'L' );
571	571	$y = $pdf->GetY() + $linetop + 2;
572	572	}
573	573
		@@ -620,9 +620,9 @@
620	620	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( usces_get_pdf_shipping_name( $data ) ), 0, 'L' );
621	621	$x = $leftside + $width;
622	622	$y = $pdf->GetY() - $lineheight - $linetop;
623	623	$pdf->SetXY( $x, $y );
624		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor ) ) ); // 様.
	624	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'delivery' ) ) ); // 様.
625	625	$y = $pdf->GetY() + $lineheight + $linetop;
626	626	} else {
627	627	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $delivery_company ), 0, 'L' );
628	628	$x = $leftside + $width;
		@@ -627,14 +627,14 @@
627	627	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $delivery_company ), 0, 'L' );
628	628	$x = $leftside + $width;
629	629	$y = $pdf->GetY() - $lineheight;
630	630	$pdf->SetXY( $x, $y );
631		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor ) ) ); // 御中.
	631	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor, $type, $data, 'delivery' ) ) ); // 御中.
632	632	$y = $pdf->GetY() + $lineheight + $linetop;
633	633	list( $fontsize, $lineheight, $linetop ) = usces_set_font_size( $fontsizes['delivery_address'] );
634	634	$pdf->SetFont( $font, '', $fontsize );
635	635	$pdf->SetXY( $leftside, $y );
636		- $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_shipping_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor ), $type, $delivery_company, $data->order['ID'] );
	636	+ $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_shipping_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'delivery' ), $type, $delivery_company, $data->order['ID'] );
637	637	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $person ), 0, 'L' );
638	638	$y = $pdf->GetY() + $linetop;
639	639	}
640	640
		@@ -686,9 +686,9 @@
686	686	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( usces_get_pdf_name( $data ) ), 0, 'L' );
687	687	$x = $leftside + $width;
688	688	$y = $pdf->GetY() - $lineheight;
689	689	$pdf->SetXY( $x, $y );
690		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor ) ) );
	690	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'customer' ) ) );
691	691	$y = $pdf->GetY() + $lineheight + $linetop + 2;
692	692	} else {
693	693	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $company ), 0, 'L' );
694	694	$x = $leftside + $width;
		@@ -693,14 +693,14 @@
693	693	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $company ), 0, 'L' );
694	694	$x = $leftside + $width;
695	695	$y = $pdf->GetY() - $lineheight;
696	696	$pdf->SetXY( $x, $y );
697		- $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor ) ) );
	697	+ $pdf->Write( $lineheight, usces_conv_euc( apply_filters( 'usces_filters_pdf_company_honor', $company_honor, $type, $data, 'customer' ) ) );
698	698	$y = $pdf->GetY() + $lineheight + $linetop;
699	699	list( $fontsize, $lineheight, $linetop ) = usces_set_font_size( $fontsizes['customer_attn'] );
700	700	$pdf->SetFont( $font, '', $fontsize );
701	701	$pdf->SetXY( $leftside, $y );
702		- $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor ), $type, $company, $data->order['ID'] );
	702	+ $person = apply_filters( 'usces_filter_pdf_contact_person', __( 'Attn', 'usces' ) . ' : ' . usces_conv_euc( usces_get_pdf_name( $data ) ) . apply_filters( 'usces_filters_pdf_person_honor', $person_honor, $type, $data, 'customer' ), $type, $company, $data->order['ID'] );
703	703	$pdf->MultiCell( $width, $lineheight, usces_conv_euc( $person ), 0, 'L' );
704	704	$y = $pdf->GetY() + $linetop + 2;
705	705	}
706	706