add extra spacing between cells for few badge formats CRM-13329

----------------------------------------
* CRM-13329: Add 2 more rows to the Badge Layout form (for a total of 6 rows)
  http://issues.civicrm.org/jira/browse/CRM-13329

diff --git a/CRM/Badge/BAO/Badge.php b/CRM/Badge/BAO/Badge.php
index 4f067382aa154d9e87cc532bbbbbd35496d381e9..18bda0445d98fd0ca94c88a87661a39ea4c664c8 100644 (file)
--- a/CRM/Badge/BAO/Badge.php
+++ b/CRM/Badge/BAO/Badge.php
@@ -141,14 +141,18 @@ class CRM_Badge_BAO_Badge {
 
   public function generateLabel($formattedRow) {
     switch ($formattedRow['labelFormat']) {
+      case 'A6 Badge Portrait 150x106':
+      case 'Hanging Badge 3-3/4" x 4-3"/4':
+        self::labelCreator($formattedRow, 5);
+        break;
       case 'Avery 5395':
       default:
-        self::labelAvery5395($formattedRow);
+        self::labelCreator($formattedRow);
         break;
     }
   }
 
-  public function labelAvery5395(&$formattedRow) {
+  public function labelCreator(&$formattedRow, $cellspacing = 0) {
     $this->lMarginLogo = 18;
     $this->tMarginName = 20;
 
@@ -190,7 +194,7 @@ class CRM_Badge_BAO_Badge {
           $value = $formattedRow['token'][$i]['value'];
         }
 
-        $offset = $this->pdf->getY() + $startOffset;
+        $offset = $this->pdf->getY() + $startOffset + $cellspacing;
 
         $this->pdf->SetFont($formattedRow['token'][$i]['font_name'], $formattedRow['token'][$i]['font_style'],
           $formattedRow['token'][$i]['font_size']);