Merge pull request #66 from LinkNacional/dev

emanuellopess · web-flow · commit 4153574b67c8 · 2024-11-06T09:45:55.000-03:00
3.3.2 Notification fixes
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,3 +1,6 @@
+# 3.3.2 - 06/11/2024
+* Fixed invoice notifications with non existing parameter for asaas url.
+
 # 3.3.1 - 09/08/2024
 * Fixed unsuspended order notification;
 * Fixed ticket open notification;
diff --git a/src/modules/addons/lknhooknotification/composer.json b/src/modules/addons/lknhooknotification/composer.json
@@ -1,6 +1,6 @@
 {
     "name": "linknacional/hooknotification",
-    "version": "3.3.1",
+    "version": "3.3.2",
     "license": "proprietary",
     "autoload": {
         "psr-4": {
diff --git a/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/Invoice15DaysLate/Invoice15DaysLateNotification.php b/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/Invoice15DaysLate/Invoice15DaysLateNotification.php
@@ -102,6 +102,15 @@ private function getAsaasPayUrl()
 
     public function defineParameters(): void
     {
+        $asaasTable = Capsule::schema()->hasTable('mod_cobrancaasaasmpay');
+
+        if ($asaasTable) {
+            $this->parameters = ['invoice_pdf_url_asaas_pay' => [
+                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
+                'parser' => fn () => $this->getAsaasPayUrl()
+            ]];
+        }
+
         $this->parameters = [
             'invoice_id' => [
                 'label' => $this->lang['invoice_id'],
@@ -135,10 +144,6 @@ public function defineParameters(): void
                 'label' => $this->lang['invoice_pdf_url'],
                 'parser' => fn () => self::getInvoicePdfUrlByInvocieId($this->hookParams['invoice_id'])
             ],
-            'invoice_pdf_url_asaas_pay' => [
-                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
-                'parser' => fn () => $this->getAsaasPayUrl()
-            ],
             'client_first_name' => [
                 'label' => $this->lang['client_first_name'],
                 'parser' => fn () => $this->getClientFirstNameByClientId($this->clientId),
diff --git a/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/Invoice6DaysLate/Invoice6DaysLateNotification.php b/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/Invoice6DaysLate/Invoice6DaysLateNotification.php
@@ -102,6 +102,15 @@ private function getAsaasPayUrl()
 
     public function defineParameters(): void
     {
+        $asaasTable = Capsule::schema()->hasTable('mod_cobrancaasaasmpay');
+
+        if ($asaasTable) {
+            $this->parameters = ['invoice_pdf_url_asaas_pay' => [
+                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
+                'parser' => fn () => $this->getAsaasPayUrl()
+            ]];
+        }
+
         $this->parameters = [
             'invoice_id' => [
                 'label' => $this->lang['invoice_id'],
@@ -131,10 +140,6 @@ public function defineParameters(): void
                 'label' => $this->lang['invoice_pdf_url'],
                 'parser' => fn () => self::getInvoicePdfUrlByInvocieId($this->hookParams['invoice_id'])
             ],
-            'invoice_pdf_url_asaas_pay' => [
-                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
-                'parser' => fn () => $this->getAsaasPayUrl()
-            ],
             'client_first_name' => [
                 'label' => $this->lang['client_first_name'],
                 'parser' => fn () => $this->getClientFirstNameByClientId($this->clientId),
diff --git a/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/InvoiceCancelled/InvoiceCancelledNotification.php b/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/InvoiceCancelled/InvoiceCancelledNotification.php
@@ -100,6 +100,15 @@ private function getAsaasPayUrl()
 
     public function defineParameters(): void
     {
+        $asaasTable = Capsule::schema()->hasTable('mod_cobrancaasaasmpay');
+
+        if ($asaasTable) {
+            $this->parameters = ['invoice_pdf_url_asaas_pay' => [
+                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
+                'parser' => fn () => $this->getAsaasPayUrl()
+            ]];
+        }
+
         $this->parameters = [
             'invoice_id' => [
                 'label' => $this->lang['invoice_id'],
@@ -117,10 +126,6 @@ public function defineParameters(): void
                 'label' => $this->lang['invoice_pdf_url'],
                 'parser' => fn (): string => self::getInvoicePdfUrlByInvocieId($this->hookParams['invoiceid'])
             ],
-            'invoice_pdf_url_asaas_pay' => [
-                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
-                'parser' => fn () => $this->getAsaasPayUrl()
-            ],
             'invoice_balance' => [
                 'label' => $this->lang['invoice_balance'],
                 'parser' => fn (): string => self::getInvoiceBalance($this->hookParams['invoiceid'])
diff --git a/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/InvoicePaid/InvoicePaidNotification.php b/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/InvoicePaid/InvoicePaidNotification.php
@@ -65,6 +65,15 @@ private function getAsaasPayUrl()
 
     public function defineParameters(): void
     {
+        $asaasTable = Capsule::schema()->hasTable('mod_cobrancaasaasmpay');
+
+        if ($asaasTable) {
+            $this->parameters = ['invoice_pdf_url_asaas_pay' => [
+                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
+                'parser' => fn () => $this->getAsaasPayUrl()
+            ]];
+        }
+
         $this->parameters = [
             'invoice_id' => [
                 'label' => $this->lang['invoice_id'],
@@ -82,10 +91,6 @@ public function defineParameters(): void
                 'label' => $this->lang['invoice_pdf_url'],
                 'parser' => fn (): string => self::getInvoicePdfUrlByInvocieId($this->hookParams['invoiceid'])
             ],
-            'invoice_pdf_url_asaas_pay' => [
-                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
-                'parser' => fn () => $this->getAsaasPayUrl()
-            ],
             'invoice_balance' => [
                 'label' => $this->lang['invoice_balance'],
                 'parser' => fn (): string => self::getInvoiceBalance($this->hookParams['invoiceid'])
diff --git a/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/InvoiceReminder/InvoiceReminderNotification.php b/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/InvoiceReminder/InvoiceReminderNotification.php
@@ -53,6 +53,15 @@ private function getAsaasPayUrl()
 
     public function defineParameters(): void
     {
+        $asaasTable = Capsule::schema()->hasTable('mod_cobrancaasaasmpay');
+
+        if ($asaasTable) {
+            $this->parameters = ['invoice_pdf_url_asaas_pay' => [
+                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
+                'parser' => fn () => $this->getAsaasPayUrl()
+            ]];
+        }
+
         $this->parameters = [
             'invoice_id' => [
                 'label' => $this->lang['invoice_id'],
@@ -82,10 +91,6 @@ public function defineParameters(): void
                 'label' => $this->lang['invoice_pdf_url'],
                 'parser' => fn () => self::getInvoicePdfUrlByInvocieId($this->hookParams['invoiceId'])
             ],
-            'invoice_pdf_url_asaas_pay' => [
-                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
-                'parser' => fn () => $this->getAsaasPayUrl()
-            ],
             'client_id' => [
                 'label' => $this->lang['client_id'],
                 'parser' => fn () => $this->clientId
diff --git a/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/InvoiceReminderPdf/InvoiceReminderPdfNotification.php b/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/InvoiceReminderPdf/InvoiceReminderPdfNotification.php
@@ -52,6 +52,15 @@ private function getAsaasPayUrl()
 
     public function defineParameters(): void
     {
+        $asaasTable = Capsule::schema()->hasTable('mod_cobrancaasaasmpay');
+
+        if ($asaasTable) {
+            $this->parameters = ['invoice_pdf_url_asaas_pay' => [
+                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
+                'parser' => fn () => $this->getAsaasPayUrl()
+            ]];
+        }
+
         $this->parameters = [
             'invoice_id' => [
                 'label' => $this->lang['invoice_id'],
@@ -69,10 +78,6 @@ public function defineParameters(): void
                 'label' => $this->lang['invoice_pdf_url'],
                 'parser' => fn () => self::getInvoicePdfUrlByInvocieId($this->hookParams['invoiceId'])
             ],
-            'invoice_pdf_url_asaas_pay' => [
-                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
-                'parser' => fn () => $this->getAsaasPayUrl()
-            ],
             'invoice_balance' => [
                 'label' => $this->lang['invoice_balance'],
                 'parser' => fn (): string => self::getInvoiceBalance($this->hookParams['invoiceId'])
diff --git a/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/NewServiceInvoice/NewServiceInvoiceNotification.php b/src/modules/addons/lknhooknotification/src/Notifications/WhatsApp/NewServiceInvoice/NewServiceInvoiceNotification.php
@@ -107,6 +107,15 @@ private function getAsaasPayUrl()
 
     public function defineParameters(): void
     {
+        $asaasTable = Capsule::schema()->hasTable('mod_cobrancaasaasmpay');
+
+        if ($asaasTable) {
+            $this->parameters = ['invoice_pdf_url_asaas_pay' => [
+                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
+                'parser' => fn () => $this->getAsaasPayUrl()
+            ]];
+        }
+
         $this->parameters = [
             'invoice_id' => [
                 'label' => $this->lang['invoice_id'],
@@ -124,10 +133,6 @@ public function defineParameters(): void
                 'label' => $this->lang['invoice_pdf_url'],
                 'parser' => fn (): string => self::getInvoicePdfUrlByInvocieId($this->hookParams['invoiceid'])
             ],
-            'invoice_pdf_url_asaas_pay' => [
-                'label' => $this->lang['invoice_pdf_url_asaas_pay'],
-                'parser' => fn () => $this->getAsaasPayUrl()
-            ],
             'invoice_balance' => [
                 'label' => $this->lang['invoice_balance'],
                 'parser' => fn (): string => self::getInvoiceBalance($this->hookParams['invoiceid'])

Original file line number	Diff line number	Diff line change
`@@ -1,6 +1,6 @@`
`1`	`1`	`{`
`2`	`2`	`"name": "linknacional/hooknotification",`
`3`		`- "version": "3.3.1",`
	`3`	`+ "version": "3.3.2",`
`4`	`4`	`"license": "proprietary",`
`5`	`5`	`"autoload": {`
`6`	`6`	`"psr-4": {`