up

Actions/ApplyModelAttrsToThemeAction.php

@@ -66,7 +66,7 @@ public function execute(Model $model, string $name, array $extra, ?Collection $o
         $html = $theme->body_html;
         $html = $this->replacer($model, $extra, $html);
 
-        $theme->mail_body = $html;
+        $theme->body_html = $html;
 
         return $theme;
     }

Models/Panels/NotificationPanel.php

@@ -45,7 +45,7 @@ public function search(): array {
      * quando aggiungi un campo select, è il numero della chiave
      * che viene messo come valore su value="id"
      *
-     * @param Modules\Notify\Models\Notification $row
+     * @param \Modules\Notify\Models\Notification $row
      *
      * @return int|string|null
      */
@@ -128,4 +128,4 @@ public function lenses(Request $request): array {
     public function actions(): array {
         return [];
     }
-}
+}

Models/Panels/NotifyThemeablePanel.php

@@ -46,7 +46,11 @@ public function search(): array {
      * quando aggiungi un campo select, è il numero della chiave
      * che viene messo come valore su value="id"
      *
+<<<<<<< Updated upstream
      * @param NotifyThemeable $row
+=======
+     * @param \Modules\Notify\Models\NotifyThemeable $row
+>>>>>>> Stashed changes
      *
      * @return int|string|null
      */
@@ -56,9 +60,12 @@ public function optionId($row) {
 
     /**
      * on select the option label.
+     *
+     * @param \Modules\Notify\Models\NotifyThemeable $row
+     * 
      */
     public function optionLabel($row): string {
-        return (string) $row->title;
+        return '';
     }
 
     /**
@@ -157,4 +164,4 @@ public function lenses(Request $request): array {
     public function actions(): array {
         return [];
     }
-}
+}

Notifications/RowAttributeNotification.php

@@ -31,10 +31,6 @@ public function __construct(Model $row) {
      * @return array
      */
     public function via($notifiable) {
-        /*
-        dddx(['via'=>$this->row->getNotifyVia(),'notifiable'=>$notifiable,'row'=>$this->row]);
-        return ['mail'];
-        */
         return $this->row->getNotifyVia();
     }
 
@@ -51,16 +47,7 @@ public function toMail($notifiable) {
             ->line('---')
             // non so se posso modificare questa riga senza creare errori in altre parti
             ->view('notify::emails.templates.ark.mail', ['html' => $this->row->mail_body]);
-        // ->view('notify::emails.templates.'.$this->row->mail_theme, ['html' => $this->row->mail_body]);
-
-        /*
-        $up=[
-            'mail_sent_at' => now(),
-            'mail_count' => (int) $this->row->email_count + 1,
-        ];
-
-        $this->row->update($up);
-        */
+
         $this->row->sendEmailCallback();
 
         return $message;