Merge branch 'test' into prod

include/Product.php

@@ -286,21 +286,45 @@ class Product extends Entity {
     }
 
     private function send_discard_email() {
-        $brand = $this->brand;
+        $product_data = array('Märke' => $this->get_brand(),
-        $name = $this->name;
+                              'Namn' => $this->get_name(),
-        $invoice = $this->invoice;
+                              'Serienummer' => $this->get_serial(),
-        $serial = $this->serial;
+                              'Fakturanummer' => $this->get_invoice(),
-        $discardtime = format_date($this->discardtime);
+        );
+        $createtime = format_date($this->get_createtime());
+        $discardtime = format_date($this->get_discardtime());
 
-        $subject = $this->email_subject_prefix.$brand.' '.$name.' skrotad';
+        $subject = $this->email_subject_prefix;
+        $subject .= $this->get_brand().' '.$this->get_name().' skrotad';
         $message = <<<EOF
 Hej!
 
 Följande artikel har skrotats i Boka:
 
-$brand $name, serienummer: $serial, fakturanummer: $invoice
-
 EOF;
+        foreach($product_data as $key => $value) {
+            $message .= "\n$key: $value";
+        }
+        foreach($this->get_info() as $key => $value) {
+            $uckey = ucfirst($key);
+            $message .= "\n$uckey: $value";
+        }
+        $message .= "\nTaggar: ".join(', ', $this->get_tags());
+
+        $message .= "\n\nHistorik:";
+        $message .= "\nSkrotad $discardtime";
+        foreach($this->get_history() as $item) {
+            $starttime = format_date($item->get_starttime());
+            $endtime = format_date($item->get_returntime());
+            $event = "Service";
+            if($item instanceof Loan) {
+                $user = $item->get_user();
+                $event = "Utlånad till ".$user->get_name();
+            }
+            $message .= "\n$event $starttime - $endtime";
+        }
+        $message .= "\nRegistrerad $createtime";
+
         try {
             mb_send_mail($this->discard_email_address,
                          $subject,

include/ProductPage.php

@@ -114,8 +114,8 @@ class ProductPage extends Page {
                     $end = $event->get_endtime();
                     $extend = format_date(default_loan_end(time()));
                     $note = replace(array('id' => $product->get_id(),
-                                      'end_new' => $extend),
+                                          'end_new' => $extend),
-                                $this->fragments['loan_extend_form']);
+                                    $this->fragments['loan_extend_form']);
                 }
             }
             $rows .= replace(array('status' => $status,