From 0d5768e16db2aa03111ccef750ff5b2aa04f8c1b Mon Sep 17 00:00:00 2001
From: gquispeg <giangbd5@hotmail.com>
Date: Mon, 24 Feb 2025 12:20:11 -0500
Subject: [PATCH 1/2] qr guia de remision

---
 .../report/src/Report/Render/QrRender.php     | 20 ++++---------------
 .../src/Report/Templates/despatch.html.twig   |  4 ++--
 2 files changed, 6 insertions(+), 18 deletions(-)

diff --git a/packages/report/src/Report/Render/QrRender.php b/packages/report/src/Report/Render/QrRender.php
index ae9161b5..5eb8818b 100644
--- a/packages/report/src/Report/Render/QrRender.php
+++ b/packages/report/src/Report/Render/QrRender.php
@@ -46,25 +46,13 @@ public function getImage($sale)
     }
 
     /**
-     * @param Despatch $despatch
-     *
+     * Summary of getImageDespatch
+     * @param string $qr Link de la guía de remisión encontrada en el CDR
      * @return string
      */
-    public function getImageDespatch($despatch)
+    public function getImageDespatch(string $qr)
     {
-        $destinatario = $despatch->getDestinatario();
-        $params = [
-            $despatch->getCompany()->getRuc(),
-            $despatch->getTipoDoc(),
-            $despatch->getSerie(),
-            $despatch->getCorrelativo(),
-            $despatch->getFechaEmision()->format('Y-m-d'),
-            $destinatario->getTipoDoc(),
-            $destinatario->getNumDoc(),
-        ];
-        $content = implode('|', $params).'|';
-
-        return $this->getQrImage($content);
+        return $this->getQrImage($qr);
     }
 
     private function getQrImage(string $content)
diff --git a/packages/report/src/Report/Templates/despatch.html.twig b/packages/report/src/Report/Templates/despatch.html.twig
index 91dfff27..4f2f035b 100644
--- a/packages/report/src/Report/Templates/despatch.html.twig
+++ b/packages/report/src/Report/Templates/despatch.html.twig
@@ -207,7 +207,7 @@
                         </blockquote>
                     </td>
                     <td width="15%" align="right">
-                        <img src="{{ qrCodeDespatch(doc)|image_b64('svg+xml') }}" alt="Qr Image">
+                        <img src="{{ qrCodeDespatch(params.system.qr)|image_b64('svg+xml') }}" alt="Qr Image">
                     </td>
                 </tr>
                 </tbody></table>
@@ -215,4 +215,4 @@
         </td>
     </tr>
     </tbody></table>
-</body></html>
+</body></html>
\ No newline at end of file

From 369d7f380bad595c6595d4046e727c110ae3a951 Mon Sep 17 00:00:00 2001
From: Giancarlos Salas <me@giansalex.dev>
Date: Thu, 6 Mar 2025 15:44:45 -0500
Subject: [PATCH 2/2] Show qr URL on despatch

---
 .../Report/Extension/ReportTwigExtension.php  |  1 +
 .../report/src/Report/Render/QrRender.php     | 25 ++++++++++++++++---
 .../src/Report/Templates/despatch.html.twig   |  4 ++-
 3 files changed, 25 insertions(+), 5 deletions(-)

diff --git a/packages/report/src/Report/Extension/ReportTwigExtension.php b/packages/report/src/Report/Extension/ReportTwigExtension.php
index 6bf50a2d..7d867742 100644
--- a/packages/report/src/Report/Extension/ReportTwigExtension.php
+++ b/packages/report/src/Report/Extension/ReportTwigExtension.php
@@ -32,6 +32,7 @@ public function getFunctions()
             new TwigFunction('legend', ['Greenter\Report\Filter\ResolveFilter', 'getValueLegend']),
             new TwigFunction('qrCode', ['Greenter\Report\Render\QrRender', 'getImage']),
             new TwigFunction('qrCodeDespatch', ['Greenter\Report\Render\QrRender', 'getImageDespatch']),
+            new TwigFunction('qrUrl', ['Greenter\Report\Render\QrRender', 'getQrUrl']),
         ];
     }
 }
diff --git a/packages/report/src/Report/Render/QrRender.php b/packages/report/src/Report/Render/QrRender.php
index 5eb8818b..812e7917 100644
--- a/packages/report/src/Report/Render/QrRender.php
+++ b/packages/report/src/Report/Render/QrRender.php
@@ -46,13 +46,30 @@ public function getImage($sale)
     }
 
     /**
-     * Summary of getImageDespatch
-     * @param string $qr Link de la guía de remisión encontrada en el CDR
+     * @param Despatch $despatch
+     *
      * @return string
      */
-    public function getImageDespatch(string $qr)
+    public function getImageDespatch($despatch)
+    {
+        $destinatario = $despatch->getDestinatario();
+        $params = [
+            $despatch->getCompany()->getRuc(),
+            $despatch->getTipoDoc(),
+            $despatch->getSerie(),
+            $despatch->getCorrelativo(),
+            $despatch->getFechaEmision()->format('Y-m-d'),
+            $destinatario->getTipoDoc(),
+            $destinatario->getNumDoc(),
+        ];
+        $content = implode('|', $params).'|';
+
+        return $this->getQrImage($content);
+    }
+
+    private function getQrUrl(string $url)
     {
-        return $this->getQrImage($qr);
+        return $this->getQrImage($url);
     }
 
     private function getQrImage(string $content)
diff --git a/packages/report/src/Report/Templates/despatch.html.twig b/packages/report/src/Report/Templates/despatch.html.twig
index 4f2f035b..e17f2782 100644
--- a/packages/report/src/Report/Templates/despatch.html.twig
+++ b/packages/report/src/Report/Templates/despatch.html.twig
@@ -207,7 +207,9 @@
                         </blockquote>
                     </td>
                     <td width="15%" align="right">
-                        <img src="{{ qrCodeDespatch(params.system.qr)|image_b64('svg+xml') }}" alt="Qr Image">
+                        {% if params.system.qr %}
+                            <img src="{{ qrUrl(params.system.qr)|image_b64('svg+xml') }}" alt="Qr Image">
+                        {% endif %}
                     </td>
                 </tr>
                 </tbody></table>