From 5c10c1ff1cf12266df870cebbe6fce957c724613 Mon Sep 17 00:00:00 2001 From: Samuel Fernandez Date: Tue, 21 Oct 2025 01:17:51 +0000 Subject: [PATCH 1/2] Switch to PNGs for receipt status --- app/assets/images/receipt_status_upload.png | Bin 0 -> 2634 bytes app/assets/images/receipt_status_uploaded.png | Bin 0 -> 2129 bytes app/controllers/hcb_codes_controller.rb | 8 +++++++- .../_attach_receipt.html.erb | 2 +- app/views/hcb_codes/receipt_status.svg.erb | 11 ----------- 5 files changed, 8 insertions(+), 13 deletions(-) create mode 100644 app/assets/images/receipt_status_upload.png create mode 100644 app/assets/images/receipt_status_uploaded.png delete mode 100644 app/views/hcb_codes/receipt_status.svg.erb diff --git a/app/assets/images/receipt_status_upload.png b/app/assets/images/receipt_status_upload.png new file mode 100644 index 0000000000000000000000000000000000000000..c65b98bea9dc2512d27650efc4a86319a83a152e GIT binary patch literal 2634 zcmV-Q3bpl#P)d$ml$5HN)TGQS2 z>b?8!yPx-N&DepYaP_;DZDR{kkwAVF1oBWrWLylx$RrTC(rCy`y&-?u@z3hp8Ew|{ zpFNdIS>!EuWt$j=u@PqKbvc%Fx>EeZt-Y0#gBjlBLy<#9Yw48zEuh8)~JU9Ea&yScY=RjdeN7{$<# z+42_IRU)g2IhtVWveK_O#SdcFY zn;!m_|G9SgUs4qP7{k~&xo0*UVfg6@+4`rK<(}7$%gB*mNNMMe==!Gncgfb*PRPi! zPx{ZBoq>GiZ-17di31(=Kl1ET{(hY9iv%){9yugM!Wg`a^^Cprylgx32XC97C%HNs zPPO%qFUyvvC#5tx;wLxs*!SgLH_<`&Go8ShC;j*XkM0rU%ZazI(dMfY zuw!h7M3E=CZX-vXaAhax;_Ij7_Ulv40mx)7%VG4(@0`Emp4H3m%dLF}Q~N_ny>1n~ zqMb}xQ7w-#dhN4a`yyoQMV=!2=v5bK*Z=?XBVDxzY^J<3-vp4GvmxB(hj)9y)zM(h zoy%6prAhj$-w@- zvV8H9&*c70>Dtf#@o(1JR*Kmfh=oNO}8}R6F?o8=8C5r$kDhY;L`*%}G z7=acJP(F&JZ^qzHAI4t#byQ$TldqJBa`DKg*>li2+|pmq`+m7L>I^h1qb6lwi{oVo zg9DDnyy{n1l+&rfnAbC%^4O3=mTCj$Iai~?PbiJpzkbQ5}1&MHmnbG;l+C$TZ5?1l^3$6UB?EJ*WGp=X-TGv^FUonyd7ca1;_5r1g1X>3I1T1w} zahW-(6O6dkHtddZoWX1M%z`zW{poYjPKB(*dv*fMg}HO~$8njzUROC(HZtg{d#^z! zd7b;SDzj<*(H=e4PcQgBRj+x`_tJkmG+WfK-H5*X?+<=_M>`x1h&;6}QhYhg9Bd;L zjqc?Z*`X8S5s;{jVdLn@1=n%n(Vt*|vuRM_8b(GXjjW}aKfVLNU^<=qZ5Mcm+&+8l zyx@Oo#v2GTL|h)#NvX?oOI)v6Fs3>hy3lh|vLK(dx`q zPpnnD_IZ$-v(-Z9NLw5tIp43uqI4FWR*ZD9h(JWYZuiuAZ4GiKoEO_>wmLWoj)+lZ zS9IHhzBB;n_N&!7uiwuwS&w+&sIh&E$&h6ix}#cm|Fx#m=W));ll+{`O%CM{9oQ>t zG{?y}a1w1gakf<#Q3riQyDw4}g#aSgLb%0&`4g|YHed6_2@d9+ZgsTJP5yk+lt<4= ztrn-#AfRaWN;{`=E{NKMGHedd7Z?n>!qL#D7L6e8Y{;sSzf+^)42!d|H3YV6UdC{( zxTf1+%^2FZW`fe_sN{+E&-%uTV4CgpXY$NNmd55*!Z{@EqZ_?w-?a|1axdh%ja+QJEj3L19GbT4*4x;0(cej6Rm!8Hnd^&Fr;43fJ8NtXw?n3kDblTP`(}b?rhU z;oL{`V{ur7q0n$qux?40GlBsQ;|n*=spIXF3_BzCg#;%vb6}jbGsChgdJInqYKt!{_-g=w`Od;?w!%K zUvSmktTiPm=v+TLlB{pb7}ym-sdnuyszw5e;()EyB3|XM@9+i`kI=0^akQroep>{k z>33-m%~&x1AU(yASI%9C42cEPgE0n%!!ZU~3;C8awp9ziJry~quX<%v+Hhu-nQ^GX zrnU=Z@KrF^R%JkUnhEDmG{=l8afx#U!7HkIy1;~iuC@8~H{D7?+z698p}(X~7_S~y zG0-b?t~k^zpt<4@ zGJvl_PBon#c>=e~%7ftM-bzCXpcEB4HohSAfdS`nen{&JWs-@y*>0rC!#0*J9wmAf zxSKxP$5oFz2_b4VUT6ZE36m=eIHD8r&qt_Lxw#*$JbTVFEb1keInTLRR zE@)a`x?Ss~k6!z1*S_7DosLKJ=5Yazw%nqE+p9di(yISVbw~ zSPNOlr&J)*9EI}KU;qFB07*qoM6N<$g6|tMXaE2J literal 0 HcmV?d00001 diff --git a/app/assets/images/receipt_status_uploaded.png b/app/assets/images/receipt_status_uploaded.png new file mode 100644 index 0000000000000000000000000000000000000000..dcd45e1764b15865c6bfc9e73e0211697de67237 GIT binary patch literal 2129 zcmV-X2(I^uP)#$G00009a7bBm000XU z000XU0RWnu7ytkO0drDELIAGL9O(c600d`2O+f$vv5yP9!)T!1mO z8$T+Ln3yO<7k;I+Dj${*XaQRR3)L1VrJd*b-+5`PU}@?WU?^`izS zFS3^lN=Z?s0SBmFia9NQ(b?WFwZ~iEro6~!Dl}y#U?;R}Yj5qb{ms7XaZq4cR+JPa zKsd_1)3vBM_GgNF! z&QP%_IYY&k1IlO3rn#Vco+!!#v=B0UcErkfgcjl7yd)PxF696 zHeqb2BYyPKA3~H5^?)FP5~1Mx?)x66BF+ae8Hhj#)jN66QVs_UPmCp%H&;Aj%8{3N z%Q5-Jp>E`aQ!zP3t`L!T;QJFS7C0L9(MOc?OV|VD|@+C{SqRWeg@n{6a;}swq}n*Fo0oCf+?a9AptlRf zd(gb^I`@q^e1OB%n~c-aMGAnZ+ki+!5by_VKFHU_w^)D@r2xd_@8fXQMl)V~78@j= zmhvzOTx@bs5E@T^k(k74H_~CCGFXWah;|kEMdq_Ngg@EyapH4TLHwUaNCW_~oo1VR z9O11UTPhYqSOh+SBG5G%$5fx%~pq+VplKpO(u5G3;ATGaQH zK<-63{Oq+MYyuY>5_Eu-EzfQIs~gcy1}DNon9o))UNQFbRyY-kd=nQ2vNfl}FCed7 zScpg+FwPI$NGGX;xpxYOhE%>P&e8`#Keh_(fPn1)fFZi2nemFSvn0-TL-{C!9SPL=PVU$lvF$hiG> zN!0hI8(y(td)?sPlWLomK42441@Wb~KfG7?Z1A&-x8NX&RJ^n?N&z4_g5*vZAaV>i zWXzc`;=na*vyywPD4b8PEm~`?eKK^42FFK}%AYM+V)8WPXGh$V;G;$5$@iD9rLw$2 z`tIsLJd$#mN%r}kdUw05;d+RiINhNfdC-T0CrlftQSGlKRd@rygrp*$v%30FsU5(WAgT~a3GS&#MXKJ5^XJ8ZtTFSfB9U8X%FOEk%WK;$FC7n!-4Zwry1T|Dlmh$r&m(C1EZj?+hq5DL_FA9XCNnG_`mIDmE5YUZT4QY zCaY~kXHkQL-?X=^m82+XV4d{wmf7vtc6-U_XnRNeERe*%ijZZqwP|;Z00000NkvXX Hu0mjf>wfUb literal 0 HcmV?d00001 diff --git a/app/controllers/hcb_codes_controller.rb b/app/controllers/hcb_codes_controller.rb index 2f3858a710..ad45ffa611 100644 --- a/app/controllers/hcb_codes_controller.rb +++ b/app/controllers/hcb_codes_controller.rb @@ -206,7 +206,13 @@ def receipt_status @secret = params[:s] @hcb_code = HcbCode.find_signed(@secret, purpose: :receipt_status) - raise Pundit::NotAuthorizedError if @hcb_code.nil? + if @hcb_code.nil? && HcbCode.find_signed(@secret, purpose: :receipt_status) != @hcb_code + raise Pundit::NotAuthorizedError + end + + file_name = @hcb_code.missing_receipt? ? "receipt_status_upload.png" : "receipt_status_uploaded.png" + + send_file Rails.root.join("app", "assets", "images", file_name), type: "image/png", disposition: "inline" end def toggle_tag diff --git a/app/views/canonical_pending_transaction_mailer/_attach_receipt.html.erb b/app/views/canonical_pending_transaction_mailer/_attach_receipt.html.erb index 31c977c330..7b2a1f00f5 100644 --- a/app/views/canonical_pending_transaction_mailer/_attach_receipt.html.erb +++ b/app/views/canonical_pending_transaction_mailer/_attach_receipt.html.erb @@ -1,7 +1,7 @@ <% if hcb_code.receipt_required? %> <%= link_to upload_url do %> - Click to upload your receipt + Click to upload your receipt <% end %>

This link can be used by anyone for two weeks to upload a receipt for this charge.

diff --git a/app/views/hcb_codes/receipt_status.svg.erb b/app/views/hcb_codes/receipt_status.svg.erb deleted file mode 100644 index fe998b538a..0000000000 --- a/app/views/hcb_codes/receipt_status.svg.erb +++ /dev/null @@ -1,11 +0,0 @@ -<% if @hcb_code.missing_receipt? %> - - - - -<% else %> - - - - -<% end %> \ No newline at end of file From 79ce810d0e765d34ba04b23dbf4ef18a58dfd62e Mon Sep 17 00:00:00 2001 From: Samuel Fernandez Date: Tue, 21 Oct 2025 20:36:20 +0000 Subject: [PATCH 2/2] Remove redundant if condition --- app/controllers/hcb_codes_controller.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/app/controllers/hcb_codes_controller.rb b/app/controllers/hcb_codes_controller.rb index ad45ffa611..6e3e03b6cf 100644 --- a/app/controllers/hcb_codes_controller.rb +++ b/app/controllers/hcb_codes_controller.rb @@ -206,7 +206,7 @@ def receipt_status @secret = params[:s] @hcb_code = HcbCode.find_signed(@secret, purpose: :receipt_status) - if @hcb_code.nil? && HcbCode.find_signed(@secret, purpose: :receipt_status) != @hcb_code + if @hcb_code.nil? raise Pundit::NotAuthorizedError end