From 763842d58b5afed1a7be9ee5fd4a9b358aeaba87 Mon Sep 17 00:00:00 2001
From: root <root@ec5fb53ef6ca>
Date: Wed, 28 Sep 2022 20:01:09 +0000
Subject: [PATCH 1/2] Redo layout re: source, annual and in-kind fields

---
 cdntaxreceipts.functions.inc | 79 ++++++++++++++++--------------------
 1 file changed, 35 insertions(+), 44 deletions(-)

diff --git a/cdntaxreceipts.functions.inc b/cdntaxreceipts.functions.inc
index bf0c345..69b7e8a 100644
--- a/cdntaxreceipts.functions.inc
+++ b/cdntaxreceipts.functions.inc
@@ -417,7 +417,7 @@ function _cdntaxreceipts_writeReceipt(&$pdf, $pdf_variables) {
   }
 
   // Right section
-  $x_detailscolumn = 120;
+  $x_detailscolumn = 116;
   $y_detailscolumnstart = 22;
   $pdf_template_file = _cdntaxreceipts_get_image_filepath('receipt_pdftemplate');
   if (empty($pdf_template_file)) {
@@ -435,28 +435,53 @@ function _cdntaxreceipts_writeReceipt(&$pdf, $pdf_variables) {
   $pdf->Write(10, ts("Eligible Amount:  $%1", array(1 => number_format($amount, 2), 'domain' => 'org.civicrm.cdntaxreceipts')));
   $pdf->SetXY($mymargin_left + $x_detailscolumn, $mymargin_top + $y_detailscolumnstart + 24);
   $pdf->Write(10, ts("Location Issued: %1", array(1 => $location_issued, 'domain' => 'org.civicrm.cdntaxreceipts')));
-  $pdf->SetXY($mymargin_left + $x_detailscolumn, $mymargin_top + $y_detailscolumnstart + 34);
+  $pdf->SetXY($mymargin_left + $x_detailscolumn, $mymargin_top + $y_detailscolumnstart + 30);
 
   if ($issue_type == 'annual') {
     $pdf->Write(10, ts("Thank you for giving in %1!", array( 1 => $display_year)));
-    // $pdf->Write(10, "Contribution(s): ");
-    // foreach ($receipt_contributions as $key => $value) {
-    //   $test = $receipt_contributions[$key]['contribution_id'];
-    //   $pdf->Write(10, $receipt_contributions[$key]['contribution_id'] . ' ');
-    // }
+  } else if ( !empty($inkind_values) ) {
+    // If this is an in-kind donation
+
+    $inkind_str = ts('Donation in-kind: %1', array(1 => $inkind_values[0], 'domain' => 'org.civicrm.cdntaxreceipts'));
+
+    if (!empty($inkind_values[3])) {
+      if ($inkind_values[3] < $amount) {
+          $inkind_str .= ' - ' . ts('Cost: %1', array(1 => $inkind_values[3], 'domain' => 'org.civicrm.cdntaxreceipts'));
+      }
+    }
+
+    $pdf->SetFont('Helvetica', 'B', 8);
+    $pdf->Write(10, $inkind_str, ' - ', 0, 'L', TRUE, 0, FALSE, FALSE, 0);
+
+    $appraiser = $inkind_values[1] . ' - '. $inkind_values[2];
+    $pdf->SetFont('Helvetica', 'B', 8);
+    $pdf->SetXY($mymargin_left + $x_detailscolumn, $mymargin_top + $y_detailscolumnstart + 36);
+
+    if (strlen($appraiser) < 42) {
+      $pdf->Write(10, ts("Appraiser: %1", array(1 => $appraiser, 'domain' => 'org.civicrm.cdntaxreceipts')));
+    }
+    else {
+      $appraiser_words = explode(" ", substr($appraiser, 0, 42));
+      $appraiser_lastbit = array_pop($appraiser_words);
+      $pdf->Write(10, ts("Appraiser: %1", array(1 => implode(" ", $appraiser_words), 'domain' => 'org.civicrm.cdntaxreceipts')));
+      $appraiser_count = count($appraiser_words);
+      $appraiser_nextline = array_splice(explode(" ", $appraiser), $appraiser_count);
+      $pdf->SetXY($mymargin_left + $x_detailscolumn + 16, $mymargin_top + $mymargin_top + $y_detailscolumnstart + 44);
+      $pdf->Write(10, implode(" ", $appraiser_nextline));
+    }
   }
-  else if (strlen($source_funds) < 36 && strlen($source_funds) > 0) {
+  else if (strlen($source_funds) < 42 && strlen($source_funds) > 0) {
     $pdf->Write(10, $source_funds);
   }
   else if (strlen($source_funds) > 0) {
-    $source_funds_words = explode(" ", substr($source_funds, 0, 36));
+    $source_funds_words = explode(" ", substr($source_funds, 0, 42));
     $source_funds_lastbit = array_pop($source_funds_words);
     $pdf->Write(10, implode(" ", $source_funds_words));
     $source_funds_count = count($source_funds_words);
     // $source_funds_nextline = array_splice(explode(" ", $source_funds), $source_funds_count);
     $exploded = explode(" ", $source_funds);
     $source_funds_nextline = array_splice($exploded, $source_funds_count);
-    $pdf->SetXY($mymargin_left + $x_detailscolumn + 16, $mymargin_top + $y_detailscolumnstart + 38);
+    $pdf->SetXY($mymargin_left + $x_detailscolumn + 16, $mymargin_top + $y_detailscolumnstart + 34);
     $pdf->Write(10, implode(" ", $source_funds_nextline));
   }
 
@@ -492,40 +517,6 @@ function _cdntaxreceipts_writeReceipt(&$pdf, $pdf_variables) {
     $pdf->Write(10, strtoupper($address_line_3), '', 0, 'L', TRUE, 0, FALSE, FALSE, 0);
   }
 
-  // If this is an in-kind donation
-  if ( !empty($inkind_values) ) {
-
-    $inkind_str = ts('Donation in-kind: %1', array(1 => $inkind_values[0], 'domain' => 'org.civicrm.cdntaxreceipts'));
-
-    if (!empty($inkind_values[3])) {
-      if ($inkind_values[3] < $amount) {
-          $inkind_str .= ' - ' . ts('Cost: %1', array(1 => $inkind_values[3], 'domain' => 'org.civicrm.cdntaxreceipts'));
-      }
-    }
-
-    $pdf->SetFont('Helvetica', '', 8);
-    $pdf->SetY($mymargin_top + 68);
-    $pdf->Write(10, $inkind_str, ' - ', 0, 'L', TRUE, 0, FALSE, FALSE, 0);
-
-    $appraiser = $inkind_values[1] . ' - '. $inkind_values[2];
-    $pdf->SetFont('Helvetica', 'B', 8);
-    $pdf->SetXY($mymargin_left + $x_detailscolumn, $mymargin_top + $y_detailscolumnstart + 24);
-
-    if (strlen($appraiser) < 36) {
-      $pdf->Write(10, ts("Appraiser: %1", array(1 => $appraiser, 'domain' => 'org.civicrm.cdntaxreceipts')));
-    }
-    else {
-      $appraiser_words = explode(" ", substr($appraiser, 0, 36));
-      $appraiser_lastbit = array_pop($appraiser_words);
-      $pdf->Write(10, ts("Appraiser: %1", array(1 => implode(" ", $appraiser_words), 'domain' => 'org.civicrm.cdntaxreceipts')));
-      $appraiser_count = count($appraiser_words);
-      $appraiser_nextline = array_splice(explode(" ", $appraiser), $appraiser_count);
-      $pdf->SetXY($mymargin_left + $x_detailscolumn + 16, $mymargin_top + $y_detailscolumnstart + 28);
-      $pdf->Write(10, implode(" ", $appraiser_nextline));
-    }
-
-  }
-
   // Bottom left section
   if (!empty($pdf_template_file)) {
   }
-- 
GitLab


From 14ee2fd943e20c97623999508335c9e530807275 Mon Sep 17 00:00:00 2001
From: demeritcowboy <demeritcowboy@hotmail.com>
Date: Wed, 28 Sep 2022 20:35:51 -0400
Subject: [PATCH 2/2] update fixtures to match

---
 ...k_AggregateTesttestAggregateTaxReceipt.pdf | Bin 23238 -> 23236 bytes
 ...k_CustomTemplateTesttestCustomTemplate.pdf | Bin 45034 -> 45035 bytes
 2 files changed, 0 insertions(+), 0 deletions(-)

diff --git a/tests/phpunit/Mink/fixtures/Civi_Cdntaxreceipts_Tests_Mink_AggregateTesttestAggregateTaxReceipt.pdf b/tests/phpunit/Mink/fixtures/Civi_Cdntaxreceipts_Tests_Mink_AggregateTesttestAggregateTaxReceipt.pdf
index 8e9ae78adf1b430789e538dd17cd5674909e5690..463093dc4f3d9dc2f7a6175aa052d9a68f2dc48e 100644
GIT binary patch
delta 3065
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
TD&oLa$yX4JVq#kNwHf~nACSS;

delta 3024
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
U0#hf+IX~fo@yN-USi^b#1zAq0?f?J)

diff --git a/tests/phpunit/Mink/fixtures/Civi_Cdntaxreceipts_Tests_Mink_CustomTemplateTesttestCustomTemplate.pdf b/tests/phpunit/Mink/fixtures/Civi_Cdntaxreceipts_Tests_Mink_CustomTemplateTesttestCustomTemplate.pdf
index 4c0521273979f3d2e0d807f3b6ec6ca338a4619d..b4bbe657badefdf0926e0460d32f3171aad7f9c3 100644
GIT binary patch
delta 1148
zcmaELpXv2|rVTty^(J<93dJQwsfoE<6?4wc@b<s$AaMNsPm$smjC?%Czwh1A;MC=4
zovtrhz|q;+B;@0qab)}Z8=7J}bcHgLu1`$O&OQI9TyFnX=M3AEY}^VKlm7DQt$%7T
z<!|?!#n+y*l<`YMD2hs}Y`@?ewdGaw{r^=94UV)P+%2ws;Hd9}|8ezx_hs0EZ}|H4
zb6QEx*?KPQdMJ-Jhqg~}-n_q;g74h)b#U9d`9)00vBuAgx~mTePEw4?leM$6TYBN;
z`O9V+L3^CD+P{1=RdLTQc_pDcGvm#rmz7o?$L%jErhK3MC5va)i<6%(WtSVt_2#Q-
zzVY3>{CB1F1L5cA*WX_IDZ}Z>i~8w#{hJ-@?asYh$nkXp@9)1SSJ+qU-OW?DE1^><
zTz9%m@JGAl7o&+AH`ny+5K}#;T)lY9>L~}_>dfA@P^&RBS4zcr61S_^oM|&%-!ki(
zzWF+7z53q#4cA|noY(iO%6I+H=AzN*xh1vofYqt@Q!BS+tTmZ)v!~K%g~fztt15FR
z)Zciva@)_9A5Tfl*tTZNzD<S_f2(RP?GiY#sW-#t#Olort4#W~PF%xU*m$b)yj)4h
zikmLSSrhmxJFoj11+5Y(HJSG+Wr<?D)s6+(sZ00-mnwdGaqXnXTh*2GH2<*otV!E#
z={D<+tAmuA=?M>65jTB?PF|xRFXp}9Q!Cd<CfyROm(q2-&!fDxbJLk4EAAyOnbc~z
z>cp-?C&C}gC#Ymc#w?yJdG(k_*`vGGfw9WUH@z0bOi*3o=jLT}MEmK*wUZ~FiCg95
z`hHe=is|jMhLhGFUcp@0+;e8OL4<zo4F%<yvR2ZkK1CQGnW2;Ay2&8#NX-=qX7)P%
ziBeCkR%$7pe#qoDA+;x*W8=TY9<87Frtx=pht3fZ^55)gHQ8!+Wn0SsEyWDs(cMRx
zo;SBY)J@xb@oJf6dw<QZa4+X=U;oej$X`{*w665w`^{%qHmwLWS1<qpg**i=FvHlw
z!Wdo5z|h#h3{9PZp^2dpnwYVLrG?4l^J}f^jnQNbj7<zM#LUc$EYZ{%TbP@hVu~4J
zsxvb~H_zD6+!QKS5BH9tp#_F!Ln8wtbf+5{T3Vu8VrXQ9=@=tJ6BBd?8d{p5I@;O5
rz}U#d&=6grr4cZs(Zbu(#2DQtCMJev=99hGPv<b>QdM>JcjE#8_#Ctk

delta 1147
zcmaETpXt?orVTty^~QE~3dJQwsfoE<6?4wc@b<s$Akgssr)cpDMm`?n-}mllaO!fj
zPS+PL;OOjZ67q4*II{o!4Nb8fx<V@-mnffJz0ua#x<CJ|K$O2x0wari(Vc@&x6WxR
zs+pL4<=318?--f2mn1n9ao=6yy4vo?-}T~Lt}z;WsxLCd++q3oKDGYWGm{yI@`|c_
zE}VR@rgYn`_|^!=h{TyipWjTkKRWj=i_5CL;(-BL4WAixS050Zq!^PYYiDP-^uo*Y
zm(4VS_Bdy?fB9yr;%+Kc+B40^q%8A`jqH-g@-GE8{Vt6%W%K>=q%w1>wPgP>^T{IL
zmfgJkcMtD}&d<+Zo2|B)C1Ck$Y5mQ|ITz;lZ?4vGvduYMS8w#{{5<c?Uzgub-0<Y=
z`<r@9{|(yX)bifw$Sda^5q>^#Z{V#^uLot*d~XMoHm)?2pW}M6Rf*g0^r=PP8mHO4
z`8sL6`riBv*I$>M*Y~T+pZmbna-oXa#c59&OQ+n|{+e?!D$`=K+}D(VLWQ%TUvDXF
ztUnu^`+4QZQxY?_t=Y0~lcB`lD7(y9j+C2jCTdTvMmmH_9lzyqt!akC(>>|@R$5nb
z7CmO#(7xx$Yb#03&@L+}e_x|Z6P#sZF7z4&wRc<+s4SVCvgF&Okn<w{nBBrQ@3nNB
z^~cpg$}M-oL@SM+I0hl}6CRqpU+ztR8fbiEi?T_5RMS2=w=Ch**`0xV4|}Le7l%wN
zZJoIOiF|@e_RW~ZlSNIBd6XsHwf?xv(QVUIhn))19+P{fq;!OyT6|kYdFI}b)~<WG
z^Cn)+$?uz(BkLyHVSeJo9?s^km)fOMR5m-OJ4ecyI`^Dh6s98mIO>XfuVKN1?*c0W
z*G*m}v`Iv~!Br=Dk5k82`MDt)?-O=9_^e6_+EFn}_tMNOH_sZY{9ZnndB?3N9We`e
z8=ic_*}dzwoi?p`a(RD{l+mmI){o`?{N%iE^U!_sS(Z&J0?iZ*KtLf+feXwqwy-cp
z7c($4HZVm~XJBYzXox0eY+-3(Jo&;}>v|(J83SVz0}L@UGb0N$b;cIv<|de8hM4Mr
zn$gu6nwvt!>fzooG_=6bY-nU)gzj`hLrY6^OAL*SFdbuLXkv_Ev84&Bqn!;5jEzhT
j4bT-@0&T$%GciW@iHV7!nb~BY_0u^_xl~nM{oS|#E6B0K

-- 
GitLab