master to develop

ChurchCRM · Nov 10, 2016 · ee706cb · ee706cb
2 parents 71cb4c9 + 64eaaf6
commit ee706cb
Show file tree

Hide file tree

Showing 4 changed files with 8 additions and 14 deletions.
diff --git a/src/FamilyView.php b/src/FamilyView.php
@@ -626,15 +626,9 @@ class="fa fa-cart-plus"></i> <?= gettext("Add All Family Members to Cart") ?></a
                          value="1" <?php if ($_SESSION['sshowPledges']) echo " checked"; ?>><?= gettext("Show Pledges") ?>
                   <input type="checkbox" name="ShowPayments"
                          value="1" <?php if ($_SESSION['sshowPayments']) echo " checked"; ?>><?= gettext("Show Payments") ?>
-                  <?= gettext(" Since:") ?>
-                  <?php
-                        $showSince = "";
-                        if ($_SESSION['sshowSince'] != null) {
-                          $showSince = $_SESSION['sshowSince']->format('Y-m-d');
-                        }
-                  ?>
+                  <label for="ShowSinceDate"><?= gettext("Since") ?>:</label>
                   <input type="text" class="date-picker" Name="ShowSinceDate"
-                         value="<?= $showSince ?>" maxlength="10" id="ShowSinceDate" size="15">
+                         value="<?= date_create($_SESSION['sshowSince'])->format('Y-m-d') ?>" maxlength="10" id="ShowSinceDate" size="15">
                   <input type="submit" class="btn" <?= 'value="' . gettext("Update") . '"' ?> name="UpdatePledgeTable"
                          style="font-size: 8pt;">
                 </form>

diff --git a/src/composer.json b/src/composer.json
@@ -52,9 +52,9 @@
     }
   },
   "repositories": {
-      "packagist": { 
-        "url": "https://packagist.org", 
-        "type": "composer" 
+      "packagist": {
+        "url": "https://packagist.org",
+        "type": "composer"
       }
   }
 

diff --git a/src/email/Dashboard.php b/src/email/Dashboard.php
@@ -77,11 +77,11 @@
     <div class="col-lg-4 col-md-2 col-sm-2">
       <div class="box">
         <div class="box-header">
-          <h3 class="box-title">><?= gettext("MailChimp") ?></h3>
+          <h3 class="box-title">MailChimp</h3>
         </div>
         <div class="box-body">
           <ul>
-            <li><a href="MailChimpMissingReport.php">><?= gettext("Missing emails report") ?> </a> (slow)</li>
+            <li><a href="MailChimpMissingReport.php"><?= gettext("Missing emails report") ?> </a> (slow)</li>
           </ul>
         </div>
       </div>

diff --git a/src/email/MailChimpMissingReport.php b/src/email/MailChimpMissingReport.php
@@ -52,7 +52,7 @@
             if ($mailchimpList == "") { ?>
               <tr>
                 <td><img class="contacts-list-img" src="<?=$sRootPath?>/api/persons/<?= $per_id ?>/photo"></td>
-                <td><a href=' "<?=$sRootPath?>/PersonView.php?PersonID="<?= $per_id ?>'><?= $per_FirstName . " " . $per_LastName ?></a></td>
+                <td><a href='<?=$sRootPath?>/PersonView.php?PersonID=<?= $per_id ?>'><?= $per_FirstName . " " . $per_LastName ?></a></td>
                 <td><?= $per_Email ?></td>
               </tr>
             <?php }